diff --git a/.env.production b/.env.production index 17eebff3..97d8bce6 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api VUE_APP_NODE_ENV=prod -VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file +VUE_APP_PUBLIC_PATH=epmet-oper diff --git a/src/assets/scss/buttonstyle copy.scss b/src/assets/scss/buttonstyle copy.scss deleted file mode 100644 index d10764f3..00000000 --- a/src/assets/scss/buttonstyle copy.scss +++ /dev/null @@ -1,67 +0,0 @@ -//新增 -.el-button--add { - color: #fff; - background-color: #22c1c3; - border-color: #22c1c3; -} -.el-button--add:hover { - color: #fff; - background-color: #05b1b4; - border-color: #05b1b4; -} -.el-button--add:focus { - color: #fff; - background-color: #22c1c3; - border-color: #22c1c3; -} - -//删除、导入 -.el-button--delete { - color: #fff; - background-color: #fe6252; - border-color: #fe6252; -} -.el-button--delete:hover { - color: #fff; - background-color: #fe6252; - border-color: #fe6252; -} -.el-button--delete:focus { - color: #fff; - background-color: #fe6252; - border-color: #fe6252; -} - -//重置、导出 -.el-button--reset { - color: #fff; - background-color: #feb349; - border-color: #feb349; -} -.el-button--reset:hover { - color: #fff; - background-color: #feb349; - border-color: #feb349; -} -.el-button--reset:focus { - color: #fff; - background-color: #feb349; - border-color: #feb349; -} - -//查询、确定 -.el-button--search:hover { - color: #fff; - background-color: #3e8ef7; - border-color: #3e8ef7; -} -.el-button--search:focus { - color: #fff; - background-color: #3e8ef7; - border-color: #3e8ef7; -} -.el-button--search { - color: #fff; - background-color: #3e8ef7; - border-color: #3e8ef7; -} diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss index 1ca5a43a..ed3aacad 100644 --- a/src/assets/scss/modules/visual/incident-info.scss +++ b/src/assets/scss/modules/visual/incident-info.scss @@ -103,17 +103,7 @@ .info-content { margin: 20px 0; } - .info-pics { - display: flex; - margin: 20px 0; - img { - display: block; - width: 32%; - height: 90px; - margin-right: 9px; - object-fit: cover; - } - } + .info-prop { position: relative; @@ -144,6 +134,18 @@ border-radius: 3px; margin-right: 10px; } + + .info-pics { + display: flex; + margin: 20px 0; + img { + display: block; + width: 32%; + height: 90px; + margin-right: 9px; + object-fit: cover; + } + } } } diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index aeeb69a5..93edef7a 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -1,149 +1,135 @@ @@ -244,7 +209,7 @@ import scoreRecord from "../../../components/scoreRecord.vue"; export default { components: { editForm, scoreRecord }, - data() { + data () { return { openSearch: false, @@ -274,7 +239,7 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeigh : this.clientHeight - 360; @@ -292,11 +257,11 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { - async handleExportModule() { + async handleExportModule () { let url = "/heart/iccommunityselforganization/import-template-download"; let params = {}; @@ -333,18 +298,18 @@ export default { }); }, // 上传大图标成功 - handleExcelSuccess(res, file) { + handleExcelSuccess (res, file) { if (res.code === 0 && res.msg === "success") { console.log("resss---ppp", res); } else { this.$message.error(res.msg); } }, - handleProgress(event, file, fileList) { + handleProgress (event, file, fileList) { console.log("percentage", file.percentage); }, - beforeExcelUpload(file) { + beforeExcelUpload (file) { console.log("file", file); const isType = file.type === "application/vnd.ms-excel"; const isTypeComputer = @@ -361,7 +326,7 @@ export default { } return fileType && isLt1M; }, - async uploadHttpRequest(file) { + async uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; this.$message({ @@ -416,38 +381,38 @@ export default { this.$refs.upload.clearFiles(); }, - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`); this.pageSize = val; window.localStorage.setItem("pageSize", val); this.getTableData(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { console.log(`当前页: ${val}`); this.pageNo = val; this.getTableData(); }, - handleClose() { + handleClose () { this.formShow = false; }, - handleSearch(val) { + handleSearch (val) { console.log(this.fmData); this.pageNo = 1; this.getTableData(); }, - resetForm(formName) { + resetForm (formName) { this.$refs[formName].resetFields(); this.handleSearch(); }, - async handleAdd() { + async handleAdd () { this.formShow = true; await nextTick(); console.log(this.$refs); this.$refs.eleEditForm.initForm("add"); }, - async handleChu() { + async handleChu () { const url = "/heart/iccommunityselforganization/exportcommunityselforganization"; const { pageSize, pageNo, fmData } = this; @@ -483,23 +448,23 @@ export default { }); }, - async handleWatch(rowIndex) { + async handleWatch (rowIndex) { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); }, - async handleEdit(rowIndex) { + async handleEdit (rowIndex) { this.formShow = true; await nextTick(); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleDel(rowData, rowIndex) { + async handleDel (rowData, rowIndex) { console.log(rowData, rowIndex); const url = "/heart/iccommunityselforganization/delcommunityselforganization"; @@ -513,11 +478,12 @@ export default { this.$message.success("删除成功!"); this.getTableData(); } else { - this.$message.success("操作失败!"); + this.$message.error(msg) + // this.$message.success("操作失败!"); } }, - async getTableData() { + async getTableData () { const url = "/heart/iccommunityselforganization/communityselforganizationlist"; const { pageSize, pageNo, fmData } = this; @@ -531,22 +497,23 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { + this.$message.error(msg) } }, //积分记录 - handleScore(row) { + handleScore (row) { this.scoreDiaShow = true; this.$nextTick(() => { this.$refs.ref_score.initForm(row.orgId); }); }, - diaClose() { + diaClose () { this.scoreDiaShow = false; }, }, diff --git a/src/views/modules/shequzhili/event copy/cpts/add.vue b/src/views/modules/shequzhili/event copy/cpts/add.vue deleted file mode 100644 index ffa69e7a..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/add.vue +++ /dev/null @@ -1,757 +0,0 @@ - - - - - - - diff --git a/src/views/modules/shequzhili/event copy/cpts/event-detail.vue b/src/views/modules/shequzhili/event copy/cpts/event-detail.vue deleted file mode 100644 index c24ccba6..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/event-detail.vue +++ /dev/null @@ -1,350 +0,0 @@ - - - - - diff --git a/src/views/modules/shequzhili/event copy/cpts/event-info.vue b/src/views/modules/shequzhili/event copy/cpts/event-info.vue deleted file mode 100644 index 79a35d6a..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/event-info.vue +++ /dev/null @@ -1,624 +0,0 @@ - - - - - diff --git a/src/views/modules/shequzhili/event copy/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event copy/cpts/process-form-demand.vue deleted file mode 100644 index adc0abe1..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/process-form-demand.vue +++ /dev/null @@ -1,665 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/event copy/cpts/process-form-project.vue b/src/views/modules/shequzhili/event copy/cpts/process-form-project.vue deleted file mode 100644 index 8309e930..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/process-form-project.vue +++ /dev/null @@ -1,603 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/event copy/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event copy/cpts/process-form-replay.vue deleted file mode 100644 index d01d4879..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/process-form-replay.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/event copy/cpts/process-form.vue b/src/views/modules/shequzhili/event copy/cpts/process-form.vue deleted file mode 100644 index 754af4c7..00000000 --- a/src/views/modules/shequzhili/event copy/cpts/process-form.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/event copy/eventList.vue b/src/views/modules/shequzhili/event copy/eventList.vue deleted file mode 100644 index 2664af1d..00000000 --- a/src/views/modules/shequzhili/event copy/eventList.vue +++ /dev/null @@ -1,663 +0,0 @@ - - - - - diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 13709ebd..2158a7bd 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -31,9 +31,9 @@ class="info-prop"> 语音: diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 2664af1d..fd1f74c0 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -169,7 +169,7 @@ width="80" label="音频">