From c127500c5925ca9ef7265e29aedad9ab25eedd22 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 23 八月 2024 17:43:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/system/point/index.vue | 36 ++++++++++++++++++++++++++++++------ src/api/platform/report.js | 4 ++-- src/views/system/report/index.vue | 4 ++-- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/api/platform/report.js b/src/api/platform/report.js index 32f3558..bb6b536 100644 --- a/src/api/platform/report.js +++ b/src/api/platform/report.js @@ -58,8 +58,8 @@ // 瀹℃牳 export function audit(data) { return request({ - url: '/report/auditing/', - method: 'get', + url: '/report/auditing', + method: 'post', data: data }) } diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue index 60480ac..bfd3e73 100644 --- a/src/views/system/point/index.vue +++ b/src/views/system/point/index.vue @@ -121,22 +121,46 @@ <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" /> </el-form-item> <el-form-item label="閲嶇偣鏍囩" prop="importantTag"> - <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable> + <el-switch + style="display: block" + v-model="form.importantTag" + active-color="#13ce66" + inactive-color="#409EFF" + active-text="閲嶇偣鐐逛綅" + inactive-text="鏅�氱偣浣�"> + </el-switch> + <!-- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable> <el-option label="閲嶇偣鐐逛綅" :value="true" /> <el-option label="鏅�氱偣浣�" :value="false" /> - </el-select> + </el-select> --> </el-form-item> <el-form-item label="鐪佸巺鏍囩" prop="provinceTag"> - <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable> + <el-switch + style="display: block" + v-model="form.provinceTag" + active-color="#13ce66" + inactive-color="#409EFF" + active-text="鐪佸巺鐐逛綅" + inactive-text="鏅�氱偣浣�"> + </el-switch> + <!-- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable> <el-option label="鐪佸巺鐐逛綅" :value="true" /> <el-option label="鏅�氱偣浣�" :value="false" /> - </el-select> + </el-select> --> </el-form-item> <el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag"> - <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable> + <el-switch + style="display: block" + v-model="form.importantCommandImageTag" + active-color="#13ce66" + inactive-color="#409EFF" + active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" + inactive-text="鏅�氱偣浣�"> + </el-switch> + <!-- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable> <el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" /> <el-option label="鏅�氱偣浣�" :value="false" /> - </el-select> + </el-select> --> </el-form-item> <!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">--> <!-- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>--> diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue index 159d856..23cd7f8 100644 --- a/src/views/system/report/index.vue +++ b/src/views/system/report/index.vue @@ -237,7 +237,7 @@ </template> <script> -import { listReport, getReport, delReport, addReport, updateReport, auditing, importReport } from "@/api/platform/report"; +import { listReport, getReport, delReport, addReport, updateReport, auditing, audit, importReport } from "@/api/platform/report"; import { pointSelectData } from "@/api/platform/point"; export default { @@ -485,7 +485,7 @@ auditOpinion: this.auditingForm.auditOpinion, auditingResult: this.auditingForm.auditingResult } - auditing(this.auditingForm).then(response => { + audit(this.auditingForm).then(response => { this.$modal.msgSuccess("瀹℃牳鎴愬姛"); this.auditingOpen = false this.getList(); -- Gitblit v1.8.0