From 606aef07c2f0cba00e42f85df663da106409b9d9 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 15:18:47 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=E8=B7=AF=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=BF=94=E5=9B=9E=E7=89=A9=E6=96=99full=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/mgroup_form.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/mtm/mgroup_form.vue b/src/views/mtm/mgroup_form.vue index a05b5ac6..dfc1a420 100644 --- a/src/views/mtm/mgroup_form.vue +++ b/src/views/mtm/mgroup_form.vue @@ -36,17 +36,17 @@ scope.row.material_in_name }} - + From 5ff50b579c90a8c2cf2bb9aeef851785f3f7f54b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 15:20:22 +0800 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=E8=B7=AF=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=BF=94=E5=9B=9E=E7=89=A9=E6=96=99full=5Fname2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/route.vue b/src/views/mtm/route.vue index 7fb2f3b4..870bbcc8 100644 --- a/src/views/mtm/route.vue +++ b/src/views/mtm/route.vue @@ -181,7 +181,7 @@ export default { getProducts() { this.$API.mtm.material.list.req({ page: 0, need_route: true }).then(res => { res.forEach(m => { - m.label = m.name+'—'+m.specification+'/'+m.model; + m.label = m.name+'|'+m.specification+'|'+m.model; }) this.productOptions = res }) From 56e180b46f49f24ab35741a55e12372d14e2ef50 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 15:22:12 +0800 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=E5=8A=A0=E5=B7=A5=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E6=96=B0=E5=BB=BA=E8=A1=A8=E5=8D=95=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=89=A9=E6=96=99full=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/route.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/mtm/route.vue b/src/views/mtm/route.vue index 870bbcc8..10b20ec8 100644 --- a/src/views/mtm/route.vue +++ b/src/views/mtm/route.vue @@ -50,7 +50,7 @@ @@ -103,8 +103,8 @@ - - {{ item.name }} + + {{ item.full_name }} {{ item.process_name }}-隐 @@ -112,8 +112,8 @@ - - {{ item.name }} + + {{ item.full_name }} {{ item.process_name }}-隐 From 5f2ab70e8ced3cff118f91e5c86e5cd397ec440b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 15:27:29 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=E8=BD=A6=E9=97=B4=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=A4=84=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=88=B0=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/mlog_dept10.vue | 5 +++++ src/views/wpm/mlog_dept6.vue | 5 +++++ src/views/wpm/mlog_dept7.vue | 5 +++++ src/views/wpm/mlog_tui.vue | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue index f0ecfb7a..97e7696a 100644 --- a/src/views/wpm/mlog_dept10.vue +++ b/src/views/wpm/mlog_dept10.vue @@ -242,6 +242,11 @@ scope.row.material_.model }} + + + diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue index 337473b9..92a652a0 100644 --- a/src/views/wpm/mlog_dept6.vue +++ b/src/views/wpm/mlog_dept6.vue @@ -161,6 +161,11 @@ {{ scope.row.material_.model }} + + + diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue index 146dafb4..84044029 100644 --- a/src/views/wpm/mlog_dept7.vue +++ b/src/views/wpm/mlog_dept7.vue @@ -241,6 +241,11 @@ scope.row.material_.model }} + + + diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue index f723c509..ca8d5d39 100644 --- a/src/views/wpm/mlog_tui.vue +++ b/src/views/wpm/mlog_tui.vue @@ -129,6 +129,11 @@ scope.row.material_.model }} + + + From 82f11fe20570978fba34a317f9e1c2e151a8a0d4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 20:53:11 +0800 Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=E8=BE=93=E5=85=A5/=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/mgroup_form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/mgroup_form.vue b/src/views/mtm/mgroup_form.vue index dfc1a420..00082938 100644 --- a/src/views/mtm/mgroup_form.vue +++ b/src/views/mtm/mgroup_form.vue @@ -35,7 +35,7 @@ {{ scope.row.material_in_name }} - + From 27282570e92408927259c501b6e4817006982efd Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 21:05:59 +0800 Subject: [PATCH 06/10] =?UTF-8?q?feat:=20=E8=B7=AF=E7=BA=BF=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=8F=AF=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pm/utask_form.vue | 4 ++-- src/views/pm/utask_form_2.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/pm/utask_form.vue b/src/views/pm/utask_form.vue index 73e96d45..04e11d1d 100644 --- a/src/views/pm/utask_form.vue +++ b/src/views/pm/utask_form.vue @@ -7,13 +7,13 @@ - + - {{ form.mgroup_name }}---{{ form.material_.name }} + {{ form.material_in_name}}->{{ form.material_out_name }} - - + + - {{ form.material_.name }} + {{ form.material_.full_name }} Date: Wed, 20 Dec 2023 21:56:44 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20sysconfig=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/system.js | 18 ++++++++---------- src/layout/index.vue | 6 +++--- src/views/login/index.vue | 4 ++-- src/views/ops/setting.vue | 15 +++++++-------- src/views/ops/settings/androisAPK.vue | 15 ++++++--------- src/views/ops/settings/smsSet.vue | 16 ++++++---------- src/views/ops/settings/sysSet.vue | 14 ++++++-------- 7 files changed, 38 insertions(+), 50 deletions(-) diff --git a/src/api/model/system.js b/src/api/model/system.js index 6e10c6df..d444c81d 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -4,15 +4,6 @@ import data from './../../../src/utils/baseJson'; const baseInFo = data[data.current]; export default { - config:{ - base: { - url: `${config.API_URL}/system/base_config/`, - name: "账户信息", - req: async function(){ - return await http.get(this.url); - } - }, - }, // config:{ // base: { // url: `${config.API_URL}/system/base_config/`, @@ -413,7 +404,14 @@ export default { } } }, - baseInfo: { + config: { + base: { + url: `${config.API_URL}/system/base_config/`, + name: "账户信息", + req: async function(){ + return await http.get(this.url); + } + }, getInfo: { url: `${config.API_URL}/system/config/`, name: "获取系统信息", diff --git a/src/layout/index.vue b/src/layout/index.vue index bba289a5..05a158a7 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -235,9 +235,9 @@ return baseName; }, baseLogo(){ - let baseInFo = data[data.current]; - // let base_logo = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_logo:'img/logo.png'; - let base_logo = baseInFo!==null?baseInFo.base.base_logo:'img/logo.png'; + // let baseInFo = data[data.current]; + let base_logo = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_logo:'img/logo.png'; + // let base_logo = baseInFo!==null?baseInFo.base.base_logo:'img/logo.png'; return base_logo }, ismobile(){ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 74aefc4d..f598ff94 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -46,9 +46,9 @@ H5访问 监控视频 - diff --git a/src/views/ops/setting.vue b/src/views/ops/setting.vue index 6ddc7ec0..bc540ca1 100644 --- a/src/views/ops/setting.vue +++ b/src/views/ops/setting.vue @@ -7,10 +7,10 @@ @@ -63,6 +63,7 @@ export default { }, data() { return { + form: {}, menu: [ { groupName: "系统配置", @@ -106,18 +107,16 @@ export default { }); }, mounted() { - this.getBaseInfo(); + this.getSysConfig(); }, methods: { openPage(item) { this.page = item.index; }, - getBaseInfo() { - this.$API.system.baseInfo.getInfo.req().then((res) => { - debugger; - console.log(res) - this.$TOOL.data.set("BASE_INFO", res) + getSysConfig() { + this.$API.system.config.getInfo.req().then(res=>{ + this.form = res.base }) }, }, diff --git a/src/views/ops/settings/androisAPK.vue b/src/views/ops/settings/androisAPK.vue index 48aa8aa6..d3219848 100644 --- a/src/views/ops/settings/androisAPK.vue +++ b/src/views/ops/settings/androisAPK.vue @@ -36,25 +36,22 @@ export default { apk_file:'', apk_remark:'', }, - configInfo:null, }; }, mounted(){ - this.getBaseInfo() + this.getSysConfig(); }, methods:{ - getBaseInfo() { - this.configInfo = this.$TOOL.data.get("BASE_INFO"); - this.form = this.$TOOL.data.get("BASE_INFO").apk + getSysConfig() { + this.$API.system.config.getInfo.req().then(res=>{ + this.form = res.apk + }) }, submitForm(){ this.saveLoading = true; let obj = {} - this.configInfo.apk = this.form; obj.apk = this.form; - this.$API.system.baseInfo.updateInfo.req(obj).then((res) => { - this.$message.success("保存成功") - this.$TOOL.data.set("BASE_INFO", this.configInfo) + this.$API.system.config.updateInfo.req(obj).then((res) => { this.saveLoading = false; }).catch(res=>{ this.saveLoading = false; diff --git a/src/views/ops/settings/smsSet.vue b/src/views/ops/settings/smsSet.vue index 66a9fcde..f7ebafe3 100644 --- a/src/views/ops/settings/smsSet.vue +++ b/src/views/ops/settings/smsSet.vue @@ -32,28 +32,24 @@ export default { xn_secret:'', }, saveLoading:false, - configInfo:null, }; }, mounted() { - this.getBaseInfo(); + this.getSysConfig(); }, methods: { openPage(item) { this.page = item.index; }, - getBaseInfo() { - this.configInfo = this.$TOOL.data.get("BASE_INFO"); - this.form = this.$TOOL.data.get("BASE_INFO").sms + getSysConfig() { + this.$API.system.config.getInfo.req().then(res=>{ + this.form = res.sms + }) }, submitForm(){ this.saveLoading = true; - let obj = {} - obj.sms = this.form; - this.configInfo.sms = this.form - this.$API.system.baseInfo.updateInfo.req(obj).then((res) => { + this.$API.system.config.updateInfo.req(this.form).then((res) => { this.$message.success("保存成功") - this.$TOOL.data.set("BASE_INFO", this.configInfo) this.saveLoading = false; }).catch(res=>{ this.saveLoading = false; diff --git a/src/views/ops/settings/sysSet.vue b/src/views/ops/settings/sysSet.vue index d543b534..29b18028 100644 --- a/src/views/ops/settings/sysSet.vue +++ b/src/views/ops/settings/sysSet.vue @@ -48,29 +48,27 @@ export default { base_name: "托克逊能源管理平台", base_name_short: "托克逊能管" }, - configInfo:null, }; }, mounted() { - this.getBaseInfo(); + this.getSysConfig(); }, methods: { openPage(item) { this.page = item.index; }, - getBaseInfo() { - this.configInfo = this.$TOOL.data.get("BASE_INFO"); - this.form = this.$TOOL.data.get("BASE_INFO").base + getSysConfig() { + this.$API.system.config.getInfo.req().then(res=>{ + this.form = res.base + }) }, submitForm(){ this.saveLoading = true; let obj = {} - this.configInfo.base = this.form; obj.base = this.form; - this.$API.system.baseInfo.updateInfo.req(obj).then((res) => { + this.$API.system.config.updateInfo.req(obj).then((res) => { this.$message.success("保存成功") - this.$TOOL.data.set("BASE_INFO", this.configInfo) this.saveLoading = false; }).catch(res=>{ this.saveLoading = false; From 4a8bae6c0085b03f4812d081991d66c35d075a15 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Dec 2023 23:51:42 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix:=20=E6=8C=89=E9=92=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/mlog_tui.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wpm/mlog_tui.vue b/src/views/wpm/mlog_tui.vue index ca8d5d39..d9743429 100644 --- a/src/views/wpm/mlog_tui.vue +++ b/src/views/wpm/mlog_tui.vue @@ -34,7 +34,7 @@ 编辑 - + 提交 From 4b822b7b52855e62fe06ea27d58bd966764af2d3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 21 Dec 2023 00:58:25 +0800 Subject: [PATCH 09/10] =?UTF-8?q?fix:=20worktask=5Fform=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7=E9=99=90=E5=88=B6=E5=8F=8A=E5=85=B6=E4=BB=96=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm/mlog_dept10.vue | 4 +- src/views/wpm/mlog_dept7.vue | 2 +- src/views/wpm/worktask_form.vue | 112 ++++++++++++++++++++++---------- 3 files changed, 80 insertions(+), 38 deletions(-) diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue index 97e7696a..0c7f8e3c 100644 --- a/src/views/wpm/mlog_dept10.vue +++ b/src/views/wpm/mlog_dept10.vue @@ -257,7 +257,9 @@ diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue index 84044029..d6a1b92a 100644 --- a/src/views/wpm/mlog_dept7.vue +++ b/src/views/wpm/mlog_dept7.vue @@ -256,7 +256,7 @@ diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue index a4d6f3ab..52206c39 100644 --- a/src/views/wpm/worktask_form.vue +++ b/src/views/wpm/worktask_form.vue @@ -35,21 +35,26 @@ --> - + + + {{ form.material_in_name}}->{{ form.material_out_name }} + - + @@ -165,21 +170,25 @@ --> - + + + {{ form.material_in_name}}->{{ form.material_out_name }} + @@ -208,11 +217,13 @@ - + - + + +