admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

空指针修复

Browse Source
This commit is contained in:
骆乐 2022-11-08 10:59:30 +08:00
parent 4079526950
commit 0651a77dab
13 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/doc/ExtGantt/Ext甘特图.html
View File

@ -229,13 +229,13 @@
children: [], //子级 children: [], //子级
remark: threeData[j].children[k].remark, //备注 remark: threeData[j].children[k].remark, //备注
// "PredecessorLink":threeData[j].children[k].predecessorIds, // "PredecessorLink":threeData[j].children[k].predecessorIds,
// PredecessorLink: [ PredecessorLink: [
// //前置任务字段 //前置任务字段
// { {
// Type: 1, Type: 1,
// PredecessorUID:number-1 PredecessorUID:number-1
// }, },
// ], ],
}; };
data.children[0].children.push(children2); data.children[0].children.push(children2);
} }
@ -334,6 +334,9 @@
editor: { editor: {
type: "textbox", type: "textbox",
}, },
style:{
display:'hidden'
}
}; };
columns.push(idColumn); columns.push(idColumn);
var stringColumn = { var stringColumn = {
@ -476,7 +479,7 @@
}, 3000); }, 3000);
var cellCommitEdit = (e) => { var cellCommitEdit = (e) => {
console.log("eeeeeeee", e); console.log("eeeeeeee编辑行的信息", e);
var data = { var data = {
taskName: e.task.taskName, taskName: e.task.taskName,
Start: e.task.Start, Start: e.task.Start,

2
public/js/config.js
View File

@ -18,7 +18,7 @@ var PROJECT = {
} }
var PROJECT_TYPE = PROJECT.online_zjsj var PROJECT_TYPE = PROJECT.local_test
var headerShow = true; // 是否显示头部 var headerShow = true; // 是否显示头部
var tabsShow = true; // 是否显示tabs var tabsShow = true; // 是否显示tabs

4
src/assets/js/http.js
View File

@ -40,11 +40,11 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地 // tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 // 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://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // 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://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地

6
src/views/home/login_v1.vue
View File

@ -541,8 +541,10 @@ export default {
}); });
}, },
parseLoginData(data) { parseLoginData(data) {
console.log("登录进来的data", data); // console.log("登录进来的data", data);
localStorage.setItem('sn',data.sn) // if( this.projectType == "zjsj"){
// localStorage.setItem('sn',data.sn)
// }
window._paq.push(["trackEvent", "点击", "登录", "登录账号"]); window._paq.push(["trackEvent", "点击", "登录", "登录账号"]);
this.$message.success(this.$t("message.login.login_success_msg")); //登录成功！ this.$message.success(this.$t("message.login.login_success_msg")); //登录成功！
this.$http.defaults.headers.common["Authorization"] = this.$http.defaults.headers.common["Authorization"] =

2
src/views/projectAdmin/fourEngin/command/center.vue
View File

@ -76,7 +76,7 @@ export default {
} }
}, },
created() { created() {
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
}, },
mounted(){ mounted(){
this.getList() this.getList()

4
src/views/projectAdmin/fourEngin/command/leftFour.vue
View File

@ -22,8 +22,10 @@ export default {
lifterNumber:"", lifterNumber:"",
} }
}, },
created(){
this.projectSn = this.$store.state.projectSn
},
mounted() { mounted() {
this.projectSn=localStorage.getItem('sn')
this.getData() this.getData()
}, },
methods: { methods: {

6
src/views/projectAdmin/fourEngin/command/leftOne.vue
View File

@ -41,14 +41,12 @@ export default {
}, },
}), }),
created() { created() {
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
// this.projectSn=localStorage.getItem('sn')
}, },
mounted(){ mounted(){
this.getList() this.getList()
}, },
// computed: {
// ...mapState(['projectSn']),
// },
methods: { methods: {
/** 查询列表 */ /** 查询列表 */
getList() { getList() {

2
src/views/projectAdmin/fourEngin/command/leftThree.vue
View File

@ -75,7 +75,7 @@ export default {
} }
}, },
created() { created() {
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
this.selectDustNoisePageList() this.selectDustNoisePageList()
}, },
methods: { methods: {

2
src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
View File

@ -33,7 +33,7 @@ export default {
} }
}, },
created(){ created(){
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
console.log('this.list',this.list) console.log('this.list',this.list)
this.getDataDateils() this.getDataDateils()
}, },

3
src/views/projectAdmin/fourEngin/command/leftTwo.vue
View File

@ -121,7 +121,7 @@ export default {
} }
}, },
created(){ created(){
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
this.getWorkerStatisticsCount() this.getWorkerStatisticsCount()
}, },
methods:{ methods:{
@ -129,7 +129,6 @@ export default {
getWorkerStatisticsCount() { getWorkerStatisticsCount() {
console.log('执行'); console.log('执行');
getWorkerStatisticsCountApi({ sn: this.projectSn }).then((res) => { getWorkerStatisticsCountApi({ sn: this.projectSn }).then((res) => {
console.log('老区啊拉垃圾啊哈哈',res);
this.statisticsCount = res.result; this.statisticsCount = res.result;
}); });
}, },

5
src/views/projectAdmin/fourEngin/command/rightOne.vue
View File

@ -77,12 +77,9 @@ export default {
} }
}, },
created() { created() {
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
this.getList() this.getList()
}, },
computed: {
// ...mapState(['projectSn']),
},
methods: { methods: {
/** 查询列表 */ /** 查询列表 */
getList() { getList() {

5
src/views/projectAdmin/fourEngin/command/rightTwo.vue
View File

@ -119,11 +119,8 @@ export default {
}; };
}, },
created() { created() {
this.projectSn=localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
}, },
// computed: {
// ...mapState(["projectSn"]),
// },
mounted() { mounted() {
this.getQualityProblem(); this.getQualityProblem();
this.getQuality(); this.getQuality();

2
src/views/projectAdmin/projectIndex.vue
View File

@ -133,7 +133,7 @@ export default {
}; };
}, },
created(){ created(){
this.projectSn = localStorage.getItem('sn') this.projectSn = this.$store.state.projectSn
this.baseURL = this.$http.defaults.baseURL this.baseURL = this.$http.defaults.baseURL
}, },
mounted() { mounted() {