From 0651a77dabb7e198a31705950ddfb8cbb4becbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Tue, 8 Nov 2022 10:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/doc/ExtGantt/Ext甘特图.html | 19 +++++++++++-------- public/js/config.js | 2 +- src/assets/js/http.js | 4 ++-- src/views/home/login_v1.vue | 6 ++++-- .../projectAdmin/fourEngin/command/center.vue | 2 +- .../fourEngin/command/leftFour.vue | 4 +++- .../fourEngin/command/leftOne.vue | 6 ++---- .../fourEngin/command/leftThree.vue | 2 +- .../fourEngin/command/leftThree/Process.vue | 2 +- .../fourEngin/command/leftTwo.vue | 3 +-- .../fourEngin/command/rightOne.vue | 5 +---- .../fourEngin/command/rightTwo.vue | 5 +---- src/views/projectAdmin/projectIndex.vue | 2 +- 13 files changed, 30 insertions(+), 32 deletions(-) diff --git a/public/doc/ExtGantt/Ext甘特图.html b/public/doc/ExtGantt/Ext甘特图.html index 2d84cf26..5e463a74 100644 --- a/public/doc/ExtGantt/Ext甘特图.html +++ b/public/doc/ExtGantt/Ext甘特图.html @@ -229,13 +229,13 @@ children: [], //子级 remark: threeData[j].children[k].remark, //备注 // "PredecessorLink":threeData[j].children[k].predecessorIds, - // PredecessorLink: [ - // //前置任务字段 - // { - // Type: 1, - // PredecessorUID:number-1 - // }, - // ], + PredecessorLink: [ + //前置任务字段 + { + Type: 1, + PredecessorUID:number-1 + }, + ], }; data.children[0].children.push(children2); } @@ -334,6 +334,9 @@ editor: { type: "textbox", }, + style:{ + display:'hidden' + } }; columns.push(idColumn); var stringColumn = { @@ -476,7 +479,7 @@ }, 3000); var cellCommitEdit = (e) => { - console.log("eeeeeeee", e); + console.log("eeeeeeee编辑行的信息", e); var data = { taskName: e.task.taskName, Start: e.task.Start, diff --git a/public/js/config.js b/public/js/config.js index 93f5448a..9210af6b 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -18,7 +18,7 @@ var PROJECT = { } -var PROJECT_TYPE = PROJECT.online_zjsj +var PROJECT_TYPE = PROJECT.local_test var headerShow = true; // 是否显示头部 var tabsShow = true; // 是否显示tabs diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 672b7333..c06e5588 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,11 +40,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index b3ed33de..c784ed35 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -541,8 +541,10 @@ export default { }); }, parseLoginData(data) { - console.log("登录进来的data", data); - localStorage.setItem('sn',data.sn) + // console.log("登录进来的data", data); + // if( this.projectType == "zjsj"){ + // localStorage.setItem('sn',data.sn) + // } window._paq.push(["trackEvent", "点击", "登录", "登录账号"]); this.$message.success(this.$t("message.login.login_success_msg")); //登录成功！ this.$http.defaults.headers.common["Authorization"] = diff --git a/src/views/projectAdmin/fourEngin/command/center.vue b/src/views/projectAdmin/fourEngin/command/center.vue index 3dfc9c93..e79a5066 100644 --- a/src/views/projectAdmin/fourEngin/command/center.vue +++ b/src/views/projectAdmin/fourEngin/command/center.vue @@ -76,7 +76,7 @@ export default { } }, created() { - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn }, mounted(){ this.getList() diff --git a/src/views/projectAdmin/fourEngin/command/leftFour.vue b/src/views/projectAdmin/fourEngin/command/leftFour.vue index b5cfd157..70bd3c03 100644 --- a/src/views/projectAdmin/fourEngin/command/leftFour.vue +++ b/src/views/projectAdmin/fourEngin/command/leftFour.vue @@ -22,8 +22,10 @@ export default { lifterNumber:"", } }, + created(){ + this.projectSn = this.$store.state.projectSn + }, mounted() { - this.projectSn=localStorage.getItem('sn') this.getData() }, methods: { diff --git a/src/views/projectAdmin/fourEngin/command/leftOne.vue b/src/views/projectAdmin/fourEngin/command/leftOne.vue index e0bd3e3f..8c00bbc0 100644 --- a/src/views/projectAdmin/fourEngin/command/leftOne.vue +++ b/src/views/projectAdmin/fourEngin/command/leftOne.vue @@ -41,14 +41,12 @@ export default { }, }), created() { - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn + // this.projectSn=localStorage.getItem('sn') }, mounted(){ this.getList() }, - // computed: { - // ...mapState(['projectSn']), - // }, methods: { /** 查询列表 */ getList() { diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue index 887ccd9b..30ceca76 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue @@ -75,7 +75,7 @@ export default { } }, created() { - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn this.selectDustNoisePageList() }, methods: { diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue index ed318e61..a657ddb6 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue @@ -33,7 +33,7 @@ export default { } }, created(){ - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn console.log('this.list',this.list) this.getDataDateils() }, diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue index 4aaecf14..cd598bcb 100644 --- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue @@ -121,7 +121,7 @@ export default { } }, created(){ - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn this.getWorkerStatisticsCount() }, methods:{ @@ -129,7 +129,6 @@ export default { getWorkerStatisticsCount() { console.log('执行'); getWorkerStatisticsCountApi({ sn: this.projectSn }).then((res) => { - console.log('老区啊拉垃圾啊哈哈',res); this.statisticsCount = res.result; }); }, diff --git a/src/views/projectAdmin/fourEngin/command/rightOne.vue b/src/views/projectAdmin/fourEngin/command/rightOne.vue index c4ec6e05..c25967bd 100644 --- a/src/views/projectAdmin/fourEngin/command/rightOne.vue +++ b/src/views/projectAdmin/fourEngin/command/rightOne.vue @@ -77,12 +77,9 @@ export default { } }, created() { - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn this.getList() }, - computed: { - // ...mapState(['projectSn']), - }, methods: { /** 查询列表 */ getList() { diff --git a/src/views/projectAdmin/fourEngin/command/rightTwo.vue b/src/views/projectAdmin/fourEngin/command/rightTwo.vue index 243b78d8..859f2ad3 100644 --- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue @@ -119,11 +119,8 @@ export default { }; }, created() { - this.projectSn=localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn }, - // computed: { - // ...mapState(["projectSn"]), - // }, mounted() { this.getQualityProblem(); this.getQuality(); diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue index 2e8ed6f7..2374e5bd 100644 --- a/src/views/projectAdmin/projectIndex.vue +++ b/src/views/projectAdmin/projectIndex.vue @@ -133,7 +133,7 @@ export default { }; }, created(){ - this.projectSn = localStorage.getItem('sn') + this.projectSn = this.$store.state.projectSn this.baseURL = this.$http.defaults.baseURL }, mounted() {