diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue index 0b1d75c..bec7ddd 100644 --- a/src/components/Tinymce/components/EditorImage.vue +++ b/src/components/Tinymce/components/EditorImage.vue @@ -7,7 +7,7 @@ + :action="action" :data="otherData" list-type="picture-card" accept="png,jpg,gif,jpeg"> 选择图片 @@ -37,6 +37,7 @@ }, data() { return { + action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, dialogVisible: false, listObj: {}, fileList: [], @@ -46,7 +47,8 @@ } }, methods: { - checkAllSuccess() { + checkAllSuccess() { + console.log(Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)) return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess) }, handleSubmit() { diff --git a/src/views/accident/index.vue b/src/views/accident/index.vue index 6587623..24c88e1 100644 --- a/src/views/accident/index.vue +++ b/src/views/accident/index.vue @@ -8,16 +8,10 @@
- - @@ -87,14 +81,14 @@ - + - + @@ -103,8 +97,8 @@ - + @@ -115,7 +109,7 @@ - + @@ -168,9 +162,9 @@ - + 点击上传 @@ -180,9 +174,9 @@ - + 点击上传 @@ -192,9 +186,9 @@ - + 点击上传 @@ -203,9 +197,9 @@ - + 点击上传 @@ -213,9 +207,9 @@ - + 点击上传 @@ -261,6 +255,8 @@ }, data() { return { + + action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, touploadType: "", checkAll: false, isIndeterminate: true, @@ -331,7 +327,7 @@ tableHeight: 900, searchFields: { KeyWord: "", - dateRange:['',''] + dateRange: ['', ''] }, columns: [{ field: "unit", @@ -383,7 +379,7 @@ field: "scene_condition", title: "现场情况", align: "left", - width:240 + width: 240 }, { field: "created_at", @@ -431,8 +427,8 @@ }, methods: { handleOk(val) { - this.searchFields.happen_date_start= val? val[0]:"" - this.searchFields.happen_date_end = val? val[1]:"" + this.searchFields.happen_date_start = val ? val[0] : "" + this.searchFields.happen_date_end = val ? val[1] : "" }, toupload(type) { console.log(type) @@ -493,7 +489,7 @@ listaccident({ page: this.paginations.page, page_size: this.paginations.page_size, - keyword:this.searchFields.KeyWord, + keyword: this.searchFields.KeyWord, happen_date_start: this.searchFields.happen_date_start, happen_date_end: this.searchFields.happen_date_end }).then(res => { @@ -674,14 +670,17 @@ overflow-y: auto; overflow-x: hidden !important; } - .searchdate{ - height: 32px; - vertical-align: middle; + + .searchdate { + height: 32px; + vertical-align: middle; } - .searchdate.el-date-editor .el-range__icon{ + + .searchdate.el-date-editor .el-range__icon { line-height: 25px; } - .searchdate.el-date-editor .el-range-separator{ + + .searchdate.el-date-editor .el-range-separator { line-height: 25px; } - + diff --git a/src/views/daily/deptindex.vue b/src/views/daily/deptindex.vue index 34634b0..6f490db 100644 --- a/src/views/daily/deptindex.vue +++ b/src/views/daily/deptindex.vue @@ -65,7 +65,7 @@ 点击上传 @@ -137,6 +137,7 @@ }, data() { return { + action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, isReportSave: false, checkAll: false, isIndeterminate: true, @@ -172,8 +173,7 @@ columns: [{ field: "title", title: "任务名称", - type: "string", - width: 240 + type: "string" }, { field: "start_date", diff --git a/src/views/daily/index.vue b/src/views/daily/index.vue index 8ab3285..09ff784 100644 --- a/src/views/daily/index.vue +++ b/src/views/daily/index.vue @@ -84,9 +84,8 @@
- + 点击上传 @@ -137,6 +136,7 @@ }, data() { return { + action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, checkAll: false, isIndeterminate: true, paginations: { diff --git a/src/views/improvement/rule.vue b/src/views/improvement/rule.vue index 7e0e7c7..2aa3e91 100644 --- a/src/views/improvement/rule.vue +++ b/src/views/improvement/rule.vue @@ -112,7 +112,7 @@ 点击上传 @@ -123,7 +123,7 @@ 点击上传 @@ -134,7 +134,7 @@ 点击上传 @@ -183,7 +183,8 @@ Tinymce }, data() { - return { + return { + action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, touploadType: "", checkAll: false, isIndeterminate: true, diff --git a/src/views/improvement/score.vue b/src/views/improvement/score.vue index f432c46..a1ea5ee 100644 --- a/src/views/improvement/score.vue +++ b/src/views/improvement/score.vue @@ -79,7 +79,7 @@ 点击上传 @@ -90,7 +90,7 @@ 点击上传 @@ -101,7 +101,7 @@ 点击上传 @@ -113,7 +113,7 @@ 点击上传 @@ -125,7 +125,7 @@ 点击上传 @@ -137,7 +137,7 @@ 点击上传 @@ -149,7 +149,7 @@ 点击上传 @@ -161,7 +161,7 @@ 点击上传 @@ -173,7 +173,7 @@ 点击上传 @@ -221,7 +221,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, touploadType: "", checkAll: false, isIndeterminate: true, diff --git a/src/views/objective/meet.vue b/src/views/objective/meet.vue index 2661001..0edacea 100644 --- a/src/views/objective/meet.vue +++ b/src/views/objective/meet.vue @@ -109,7 +109,7 @@ 点击上传 @@ -212,7 +212,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, diff --git a/src/views/objective/standbook.vue b/src/views/objective/standbook.vue index f0e19a4..bd7bb06 100644 --- a/src/views/objective/standbook.vue +++ b/src/views/objective/standbook.vue @@ -78,7 +78,7 @@ 点击上传 @@ -118,7 +118,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, paginations: { page: 1, page_size: 15, diff --git a/src/views/objective/targetindex.vue b/src/views/objective/targetindex.vue index 6407307..574500b 100644 --- a/src/views/objective/targetindex.vue +++ b/src/views/objective/targetindex.vue @@ -89,7 +89,7 @@ 点击上传 @@ -162,7 +162,7 @@ 点击上传 @@ -242,7 +242,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible: false, diff --git a/src/views/practise/deal.vue b/src/views/practise/deal.vue index c25184e..4d26ebb 100644 --- a/src/views/practise/deal.vue +++ b/src/views/practise/deal.vue @@ -125,7 +125,7 @@ 点击上传 @@ -175,7 +175,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, parameters: { practiseLevel: [], }, diff --git a/src/views/practise/index.vue b/src/views/practise/index.vue index d38a7cb..35d82a0 100644 --- a/src/views/practise/index.vue +++ b/src/views/practise/index.vue @@ -124,7 +124,7 @@ 点击上传 @@ -251,7 +251,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, parameters: { practiseLevel: [], }, diff --git a/src/views/practise/plan.vue b/src/views/practise/plan.vue index 560946e..f0c1370 100644 --- a/src/views/practise/plan.vue +++ b/src/views/practise/plan.vue @@ -100,7 +100,7 @@ 点击上传 @@ -150,7 +150,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, parameters: { practiseLevel: [], }, diff --git a/src/views/risk/hazardindex.vue b/src/views/risk/hazardindex.vue index 6ffe5ab..28cbf47 100644 --- a/src/views/risk/hazardindex.vue +++ b/src/views/risk/hazardindex.vue @@ -97,7 +97,7 @@ 点击上传 @@ -141,7 +141,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, parameters: { hazardLevel: [] }, diff --git a/src/views/risk/hiddendangerindex.vue b/src/views/risk/hiddendangerindex.vue index 636a814..d3bc372 100644 --- a/src/views/risk/hiddendangerindex.vue +++ b/src/views/risk/hiddendangerindex.vue @@ -137,7 +137,7 @@ 点击上传 @@ -183,7 +183,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, parameters: { hiddenLevel: [], hiddenType: [] diff --git a/src/views/risk/riskindex.vue b/src/views/risk/riskindex.vue index 51c8335..04cf230 100644 --- a/src/views/risk/riskindex.vue +++ b/src/views/risk/riskindex.vue @@ -101,7 +101,7 @@ 点击上传 @@ -182,7 +182,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, diff --git a/src/views/site/equipment.vue b/src/views/site/equipment.vue index 19d8c0c..ce6b597 100644 --- a/src/views/site/equipment.vue +++ b/src/views/site/equipment.vue @@ -109,7 +109,7 @@ 点击上传 @@ -177,7 +177,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, parameters: { defectType: [], equipmentStatus:[] diff --git a/src/views/site/health.vue b/src/views/site/health.vue index e45527c..6790b69 100644 --- a/src/views/site/health.vue +++ b/src/views/site/health.vue @@ -143,7 +143,7 @@ 点击上传 @@ -190,7 +190,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, diff --git a/src/views/site/safetyitem.vue b/src/views/site/safetyitem.vue index 1484510..40931df 100644 --- a/src/views/site/safetyitem.vue +++ b/src/views/site/safetyitem.vue @@ -84,7 +84,7 @@ 点击上传 @@ -169,7 +169,7 @@ Tinymce }, data() { - return { + return { action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, checkAll: false, isIndeterminate: true, infoFormVisible:false, diff --git a/src/views/training/event.vue b/src/views/training/event.vue index b3d24ca..361fb73 100644 --- a/src/views/training/event.vue +++ b/src/views/training/event.vue @@ -177,7 +177,7 @@ 点击上传 @@ -242,7 +242,8 @@ LxHeader }, data() { - return { + return { + action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`, paginations: { page: 1, page_size: 15, diff --git a/src/views/training/record.vue b/src/views/training/record.vue index 5b06a36..f9bf4e4 100644 --- a/src/views/training/record.vue +++ b/src/views/training/record.vue @@ -15,7 +15,7 @@
- + @@ -113,9 +113,9 @@ - + 点击上传 @@ -180,6 +180,7 @@ }, data() { return { + action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`, evaluateOptions: [{ id: 1, name: "考试" @@ -263,7 +264,7 @@ field: "name", title: "培训名称", type: "string", - width:240, + width: 240, }, { field: "time", @@ -313,7 +314,7 @@ title: "操作", width: 220, type: "opt", - fixed:"right" + fixed: "right" } ], uploadOther: { @@ -386,7 +387,7 @@ listtrainlog({ page: this.paginations.page, page_size: this.paginations.page_size, - keyword:this.searchFields.KeyWord + keyword: this.searchFields.KeyWord }).then(response => { this.tableData = response.data; this.paginations.total = response.total; @@ -539,4 +540,4 @@ .form-sub-title { padding: 20px 0px; } - +