diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 10091458..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/views/home/login_v1.vue b/src/views/home/login_v1.vue index 0b2eb085..b3ed33de 100644 --- a/src/views/home/login_v1.vue +++ b/src/views/home/login_v1.vue @@ -542,6 +542,7 @@ export default { }, parseLoginData(data) { console.log("登录进来的data", data); + 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 4abff9db..3dfc9c93 100644 --- a/src/views/projectAdmin/fourEngin/command/center.vue +++ b/src/views/projectAdmin/fourEngin/command/center.vue @@ -33,6 +33,7 @@ export default { components: { LeftThree }, data() { return { + projectSn:"", // 信息窗体开关 open: true, // 信息窗体表单 @@ -40,7 +41,7 @@ export default { projectName: { label: '项目名称:', value: '' }, bulidStatus: { label: '项目状态:', value: '' }, constructionStage: { label: '形象进度:', value: '' }, - households:{label: '项目造价:', value: ''}, + households:{label: '户数:', value: ''}, // val2:{label: '已完成投资:', value: ''}, projectAcreage: { label: '工程面积:', value: '', unit: '' }, constructionUnit: { label: '建设单位:', value: ''}, @@ -75,12 +76,15 @@ export default { } }, created() { + this.projectSn=localStorage.getItem('sn') + }, + mounted(){ this.getList() }, methods: { /** 查询数据 */ getList() { - listProjectInfo({ projectSn: this.$store.state.projectSn }).then(res => { + listProjectInfo({ projectSn: this.projectSn }).then(res => { console.log('项目信息: ', res) const informationForm = this.informationForm Object.keys(informationForm).forEach(key => { diff --git a/src/views/projectAdmin/fourEngin/command/leftFour.vue b/src/views/projectAdmin/fourEngin/command/leftFour.vue index 2ab6eaab..b5cfd157 100644 --- a/src/views/projectAdmin/fourEngin/command/leftFour.vue +++ b/src/views/projectAdmin/fourEngin/command/leftFour.vue @@ -17,16 +17,18 @@ export default { components: { Card }, data() { return { + projectSn:"", towerNumber:"", lifterNumber:"", } }, mounted() { + this.projectSn=localStorage.getItem('sn') this.getData() }, methods: { getData(){ - getDevNumberApi({ projectSn: this.$store.state.projectSn }).then((res)=>{ + getDevNumberApi({ projectSn: this.projectSn }).then((res)=>{ if(res.code == 200){ this.towerNumber = res.result.towerNumber this.lifterNumber = res.result.lifterNumber diff --git a/src/views/projectAdmin/fourEngin/command/leftOne.vue b/src/views/projectAdmin/fourEngin/command/leftOne.vue index 2f8ca05b..e0bd3e3f 100644 --- a/src/views/projectAdmin/fourEngin/command/leftOne.vue +++ b/src/views/projectAdmin/fourEngin/command/leftOne.vue @@ -41,11 +41,14 @@ export default { }, }), created() { + this.projectSn=localStorage.getItem('sn') + }, + mounted(){ this.getList() }, - computed: { - ...mapState(['projectSn']), - }, + // computed: { + // ...mapState(['projectSn']), + // }, methods: { /** 查询列表 */ getList() { diff --git a/src/views/projectAdmin/fourEngin/command/leftThree.vue b/src/views/projectAdmin/fourEngin/command/leftThree.vue index 4258434d..887ccd9b 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree.vue @@ -45,6 +45,7 @@ export default { components: { Card }, data() { return { + projectSn:"", // 左边的列表 leftList: { a: { label: 'PM2.5', value: 68, unit: 'μg/m³', image: require('../assets/images/command-center/icon-pm25.png') }, @@ -74,13 +75,14 @@ export default { } }, created() { + this.projectSn=localStorage.getItem('sn') this.selectDustNoisePageList() }, methods: { selectDustNoisePageList(){ let data = { // deviceId: this.devSn, - projectSn: this.$store.state.projectSn, + projectSn: this.projectSn, } getDustNoiseDataApi(data).then(res=>{ console.log('环境监测',res) diff --git a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue index ac4d81f2..ed318e61 100644 --- a/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue +++ b/src/views/projectAdmin/fourEngin/command/leftThree/Process.vue @@ -21,6 +21,7 @@ export default { }, data(){ return{ + projectSn:"", projectData: { constructionStage: 10, }, @@ -32,6 +33,7 @@ export default { } }, created(){ + this.projectSn=localStorage.getItem('sn') console.log('this.list',this.list) this.getDataDateils() }, @@ -40,7 +42,7 @@ export default { }, methods:{ getDataDateils() { - let data = { projectSn: this.$store.state.projectSn } + let data = { projectSn: this.projectSn } getProjectDetail(data).then((res) => { if (res.code == 200) { console.log('查询进度',res) diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue index 86dd7f53..4aaecf14 100644 --- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue @@ -46,6 +46,7 @@ export default { components: { Card }, data(){ return{ + projectSn:"", statisticsCount: { currentMonthEducationPerson: 0, projectcount: { @@ -120,13 +121,14 @@ export default { } }, created(){ + this.projectSn=localStorage.getItem('sn') this.getWorkerStatisticsCount() }, methods:{ //统计企业下项目各人员统计 getWorkerStatisticsCount() { console.log('执行'); - getWorkerStatisticsCountApi({ sn: this.$store.state.userInfo.sn }).then((res) => { + getWorkerStatisticsCountApi({ sn: this.projectSn }).then((res) => { console.log('老区啊拉垃圾啊哈哈',res); this.statisticsCount = res.result; }); diff --git a/src/views/projectAdmin/fourEngin/command/rightFour.vue b/src/views/projectAdmin/fourEngin/command/rightFour.vue index 129aed40..c8738b78 100644 --- a/src/views/projectAdmin/fourEngin/command/rightFour.vue +++ b/src/views/projectAdmin/fourEngin/command/rightFour.vue @@ -76,6 +76,7 @@ export default { }; }, created() { + this.projectSn=localStorage.getItem('sn') this.getData(); }, watch: { @@ -102,7 +103,7 @@ export default { }, getData() { windowDisplayApi({ - projectSn: this.$store.state.projectSn, + projectSn: this.projectSn, typeId: this.typeId, }).then((res) => { if(res.code == 200){ diff --git a/src/views/projectAdmin/fourEngin/command/rightOne.vue b/src/views/projectAdmin/fourEngin/command/rightOne.vue index 3de74e67..c4ec6e05 100644 --- a/src/views/projectAdmin/fourEngin/command/rightOne.vue +++ b/src/views/projectAdmin/fourEngin/command/rightOne.vue @@ -77,10 +77,11 @@ export default { } }, created() { + this.projectSn=localStorage.getItem('sn') this.getList() }, computed: { - ...mapState(['projectSn']), + // ...mapState(['projectSn']), }, methods: { /** 查询列表 */ diff --git a/src/views/projectAdmin/fourEngin/command/rightTwo.vue b/src/views/projectAdmin/fourEngin/command/rightTwo.vue index a05b86a2..243b78d8 100644 --- a/src/views/projectAdmin/fourEngin/command/rightTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/rightTwo.vue @@ -67,6 +67,7 @@ export default { components: { Card, JNestedRingChart }, data() { return { + projectSn:"", tab : 2, show:true, recordStatus: 2, // 整改状态 2已整改（已闭合） 5待整改 @@ -117,10 +118,12 @@ export default { ], }; }, - created() {}, - computed: { - ...mapState(["projectSn"]), + created() { + this.projectSn=localStorage.getItem('sn') }, + // computed: { + // ...mapState(["projectSn"]), + // }, mounted() { this.getQualityProblem(); this.getQuality(); diff --git a/src/views/projectAdmin/fourEngin/govComp/leftTop.vue b/src/views/projectAdmin/fourEngin/govComp/leftTop.vue index 942dc782..101755ac 100644 --- a/src/views/projectAdmin/fourEngin/govComp/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/govComp/leftTop.vue @@ -31,7 +31,6 @@ diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue index 684dfd1d..2e8ed6f7 100644 --- a/src/views/projectAdmin/projectIndex.vue +++ b/src/views/projectAdmin/projectIndex.vue @@ -122,6 +122,7 @@ export default { components: { vhead }, data() { return { + projectSn:"", baseURL:"", projectNumber:'', projectName: "", @@ -132,7 +133,8 @@ export default { }; }, created(){ - this.baseURL = this.$http.defaults.baseURL + this.projectSn = localStorage.getItem('sn') + this.baseURL = this.$http.defaults.baseURL }, mounted() { if(localStorage.getItem('systemInfo')){ @@ -151,7 +153,7 @@ export default { methods: { getSafeyHatSession(){ let data = {} - data.projectSn = this.$store.state.projectSn + data.projectSn = this.projectSn getSafeyHatSessionApi(data).then(res=>{ console.log('安全帽跳转',res) // { @@ -177,7 +179,7 @@ export default { }, getProjectNumber(){ let data = { - projectSn: this.$store.state.projectSn, + projectSn: this.projectSn, }; getProjectInfoBySn(data).then((res)=>{ console.log('------------',res.result.projectNumber) @@ -286,7 +288,7 @@ export default { //获取详情 getDataDateils() { let data = { - projectSn: this.$store.state.projectSn, + projectSn: this.projectSn, }; getProjectDetail(data).then((res) => { // console.log(res); diff --git a/src/views/projectAdmin/zjsj/command/LeftThree/index.vue b/src/views/projectAdmin/zjsj/command/LeftThree/index.vue index fe6bc85a..a3043c5b 100644 --- a/src/views/projectAdmin/zjsj/command/LeftThree/index.vue +++ b/src/views/projectAdmin/zjsj/command/LeftThree/index.vue @@ -15,6 +15,7 @@ export default { components: { Card, Process }, data() { return { + projectSn:"", list: [ { endTime: '2022-01-01', subitemProjectName: '基础工程', state: true ,}, // { endTime: '2022-02-14', subitemProjectName: '主题结构施工', state: true, }, @@ -25,6 +26,9 @@ export default { index: 0 } }, + created(){ + this.projectSn=localStorage.getItem('sn') + }, mounted() { const progress = this.$refs.Process; progress.scrollLeft = 48; @@ -32,7 +36,7 @@ export default { }, methods:{ getData(){ - listProgressOfTheTask({ projectSn: this.$store.state.projectSn ,isNoStart: false}).then(res => { + listProgressOfTheTask({ projectSn: this.projectSn ,isNoStart: false}).then(res => { // state 0未开始, 1进行中, 2已完成 res.result.forEach((item)=>{ if(item.state == 2){ diff --git a/src/views/projectFront/scheduleManage/projectNodeManage2.vue b/src/views/projectFront/scheduleManage/projectNodeManage2.vue index 1afbb653..a4f2fc1e 100644 --- a/src/views/projectFront/scheduleManage/projectNodeManage2.vue +++ b/src/views/projectFront/scheduleManage/projectNodeManage2.vue @@ -167,6 +167,8 @@ { + let nowData = this.times + nowData = new Date(nowData.setDate(nowData.getDate() - 1)) + return time > nowData + // return time.getTime() < Date.now()- 1 * 24 * 3600 * 1000; + } + }, }; }, + computed: { + dateAfter() { + // 动态起始时间 + const startTimestamp = Date.now() * 1 - 24 * 60 * 60 * 1000; + const endTimestamp = + Date.parse(this.workerInfo.finishDate) * 1 - 24 * 60 * 60 * 1000; + return { + disabledDate(time) { + const timestamp = time.getTime(); + if (endTimestamp) { + if (timestamp >= startTimestamp && timestamp <= endTimestamp) { + return false; + } else { + return true; + } + } else { + return timestamp <= startTimestamp; + } + } + }; + }, + dateBefore() { + // 动态起始时间 + const startTimestamp = Date.parse(this.workerInfo.startDate) * 1; + return { + disabledDate(time) { + const timestamp = time.getTime(); + if (timestamp >= startTimestamp) { + return false; + } + return true; + } + }; + } + }, created() { this.projectSn = this.$store.state.projectSn; this.createUserId = this.$store.state.userInfo.userId; @@ -398,6 +446,7 @@ export default { methods: { time1(val){ console.log('开始时间',val) + this.times = val }, time2(val){ console.log('结束时间',val)