From 9f0dade17c69176c2e4f52516dcaa6f9b9833d60 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Mon, 18 Jul 2022 17:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A5=E6=8A=A5=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/api.js | 2 +- src/views/Statistics/index.vue | 1 + src/views/building/sugDetail.vue | 20 +++++++++++--------- src/views/building/sugList.vue | 3 ++- vue.config.js | 4 ++-- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/api/modules/api.js b/src/api/modules/api.js index 1b3fc7c..74570a0 100644 --- a/src/api/modules/api.js +++ b/src/api/modules/api.js @@ -1202,7 +1202,7 @@ export function findWeekMonth(data) { // export function deleteById(data) { return request({ - url: '/autoSR/api/zkMessage/deleteById', + url: '/autoSR/zkhouse/deleteWeek', method: 'get', params: data }) diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue index 1706688..ff349cb 100644 --- a/src/views/Statistics/index.vue +++ b/src/views/Statistics/index.vue @@ -413,6 +413,7 @@ export default { this.namelist = []; this.numlist = []; this.objlist = []; + this.alllist = []; var dateType = ""; if (this.TimetoAhoose == 7) { dateType = ""; diff --git a/src/views/building/sugDetail.vue b/src/views/building/sugDetail.vue index 98fa702..def0864 100644 --- a/src/views/building/sugDetail.vue +++ b/src/views/building/sugDetail.vue @@ -91,25 +91,27 @@ export default { }, async mounted() { if (this.$route.query.id) { - this.getParamsObj.id = this.$route.query.id + this.getParamsObj.id = this.$route.query.id; } if (this.$route.query.week) { - this.getParamsObj.week = this.$route.query.week + this.getParamsObj.week = this.$route.query.week; } if (this.$route.query.pid) { - this.getParamsObj.pid = this.$route.query.pid + this.getParamsObj.pid = this.$route.query.pid; } if (this.$route.query.type) { - this.getParamsObj.type = this.$route.query.type + this.getParamsObj.type = this.$route.query.type; } if (this.getParamsObj.id != "" && this.getParamsObj.id != undefined) { let res = await this.$api.api.weekFindById({ id: this.getParamsObj.id }); - console.log(res, 'sadjkasljdklas') + console.log(res, "sadjkasljdklas"); this.ruleForm.suggest = res.data.suggest; this.id = res.data.id; this.defaultMSG = this.ruleForm.suggest; - this.week = res.data.weekDate; + if (res.data.weekDate) { + this.week = res.data.weekDate; + } this.pid = this.getParamsObj.pid; this.type = this.getParamsObj.type; } else { @@ -117,8 +119,8 @@ export default { weekDate: this.week, projectId: this.getParamsObj.pid, }); - console.log(res, 'sadjkasljdklas') - + console.log(res, "sadjkasljdklas"); + if (res.data != null) { this.ruleForm.suggest = res.data.suggest; this.defaultMSG = this.ruleForm.suggest; @@ -153,7 +155,7 @@ export default { this.$api.api.insertSelective(this.ruleForm).then((res) => { if (res.code == 10000) { this.$message.success("操作成功"); - this.$router.go(-1) + this.$router.go(-1); } }); } else { diff --git a/src/views/building/sugList.vue b/src/views/building/sugList.vue index 52da5a2..b4aefe2 100644 --- a/src/views/building/sugList.vue +++ b/src/views/building/sugList.vue @@ -153,13 +153,14 @@ export default { remove(id) { this.$api.api.deleteById({ id: id }).then((res) => { console.log(res); - if (res.data.code == 10000) { + if (res.code == 10000) { let data = { num: 1, size: this.size, messageType: this.selValue, projectId: this.id, }; + this.tableData = [] this.filefindByPage(data); this.$message.success("删除成功"); } diff --git a/vue.config.js b/vue.config.js index 08f8f8c..3698f20 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,10 +6,10 @@ // const url = 'http://192.168.31.152:9999' // 泽明 // const url = 'http://62.234.122.43:9999' //正式 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP -// const url = 'http://192.168.31.86:9999' // 胜浩 +const url = 'http://192.168.31.101:9999' // 胜浩 // const url = 'https://zanyong.hfju.com' // 正式域名 // const url = 'http://127.0.0.1:9999' // 本地 -const url = 'http://81.70.55.170:9999' // 新测试 +// const url = 'http://81.70.55.170:9999' // 新测试 // const url = 'http://82.156.35.22:9999' // 新正式ip const CompressionWebpackPlugin = require('compression-webpack-plugin') const productionGzipExtensions = ['js', 'css']