Browse Source

init

newStyle
lancer 3 years ago
parent
commit
b8e3e1829e
5 changed files with 69 additions and 14 deletions
  1. +4
    -4
      src/page/check/chose.vue
  2. +20
    -4
      src/page/check/index.vue
  3. +12
    -0
      src/page/login/userlogin.vue
  4. +29
    -2
      src/views/Equipment/equipmentDetailList.vue
  5. +4
    -4
      src/views/Equipment/state.vue

+ 4
- 4
src/page/check/chose.vue View File

@@ -358,10 +358,10 @@ export default {
this.$message.warning('您已经被禁用') this.$message.warning('您已经被禁用')
return return
} }
if(item.residueTime<=0){
this.$message.warning('您已过期')
return
}
// if(item.residueTime<=0){
// this.$message.warning('您已过期')
// return
// }
if (this.flag == 1) { if (this.flag == 1) {
localStorage.setItem("agentId", item.id); localStorage.setItem("agentId", item.id);
localStorage.setItem("orgCode", ''); localStorage.setItem("orgCode", '');


+ 20
- 4
src/page/check/index.vue View File

@@ -87,7 +87,7 @@ export default {
// 对此进行判断,获取this.$route的参数,如果没有则退出登陆,有的话就返回之前的页面 // 对此进行判断,获取this.$route的参数,如果没有则退出登陆,有的话就返回之前的页面
if (this.backFlag) { if (this.backFlag) {
this.$router.back(); this.$router.back();
localStorage.setItem('allClose',false)
localStorage.setItem("allClose", false);
} else { } else {
this.$confirm("是否退出系统, 是否继续?", "提示", { this.$confirm("是否退出系统, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@@ -118,6 +118,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 1 } }); this.$router.push({ path: "/chose", query: { flag: 1 } });
} else { } else {
if (res.data.records[0].lockFlag != 0) {
this.$message.warning("您已经被禁用");
return;
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].agentName); localStorage.setItem("topName", res.data.records[0].agentName);
localStorage.setItem("agentId", res.data.records[0].id); localStorage.setItem("agentId", res.data.records[0].id);
@@ -145,6 +149,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 2 } }); this.$router.push({ path: "/chose", query: { flag: 2 } });
} else { } else {
if (res.data.records[0].lockFlag != 0) {
this.$message.warning("您已经被禁用");
return;
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].name); localStorage.setItem("topName", res.data.records[0].name);
localStorage.setItem("orgCode", res.data.records[0].orgCode); localStorage.setItem("orgCode", res.data.records[0].orgCode);
@@ -183,6 +191,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 3 } }); this.$router.push({ path: "/chose", query: { flag: 3 } });
} else { } else {
if (res.data.records[0].lockFlag != 0) {
this.$message.warning("您已经被禁用");
return;
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].propertyName); localStorage.setItem("topName", res.data.records[0].propertyName);
localStorage.setItem("orgCode", res.data.records[0].orgCode); localStorage.setItem("orgCode", res.data.records[0].orgCode);
@@ -208,6 +220,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 3 } }); this.$router.push({ path: "/chose", query: { flag: 3 } });
} else { } else {
if (res.data.records[0].lockFlag != 0) {
this.$message.warning("您已经被禁用");
return;
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].propertyName); localStorage.setItem("topName", res.data.records[0].propertyName);
localStorage.setItem("orgCode", res.data.records[0].orgCode); localStorage.setItem("orgCode", res.data.records[0].orgCode);
@@ -221,8 +237,8 @@ export default {
localStorage.setItem("orgType", idx); localStorage.setItem("orgType", idx);
if (idx == 0) { if (idx == 0) {
localStorage.setItem("topName", ""); localStorage.setItem("topName", "");
localStorage.setItem("orgCode", '');
localStorage.setItem("houseId", '');
localStorage.setItem("orgCode", "");
localStorage.setItem("houseId", "");
localStorage.setItem("agentId", ""); localStorage.setItem("agentId", "");
// 质控管家后台 // 质控管家后台
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
@@ -241,7 +257,7 @@ export default {
// 楼盘后台 // 楼盘后台
// this.$router.push({ path: "/chose", query: { flag: 3 } }); // this.$router.push({ path: "/chose", query: { flag: 3 } });
} }
localStorage.setItem('allClose',true)
localStorage.setItem("allClose", true);
// this.$router.push({ path: "/chose" }); // this.$router.push({ path: "/chose" });
}, },
}, },


+ 12
- 0
src/page/login/userlogin.vue View File

@@ -215,6 +215,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 2 } }); this.$router.push({ path: "/chose", query: { flag: 2 } });
} else { } else {
if(res.data.records[0].lockFlag!=0){
this.$message.warning("您已经被禁用");
return
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].name); localStorage.setItem("topName", res.data.records[0].name);
localStorage.setItem("orgCode", res.data.records[0].orgCode); localStorage.setItem("orgCode", res.data.records[0].orgCode);
@@ -253,6 +257,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 3 } }); this.$router.push({ path: "/chose", query: { flag: 3 } });
} else { } else {
if(res.data.records[0].lockFlag!=0){
this.$message.warning("您已经被禁用");
return
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].propertyName); localStorage.setItem("topName", res.data.records[0].propertyName);
localStorage.setItem("orgCode", res.data.records[0].orgCode); localStorage.setItem("orgCode", res.data.records[0].orgCode);
@@ -278,6 +286,10 @@ export default {
// 公司后台 // 公司后台
this.$router.push({ path: "/chose", query: { flag: 3 } }); this.$router.push({ path: "/chose", query: { flag: 3 } });
} else { } else {
if(res.data.records[0].lockFlag!=0){
this.$message.warning("您已经被禁用");
return
}
this.$router.push({ path: "/wel" }); this.$router.push({ path: "/wel" });
localStorage.setItem("topName", res.data.records[0].propertyName); localStorage.setItem("topName", res.data.records[0].propertyName);
localStorage.setItem("orgCode", res.data.records[0].orgCode); localStorage.setItem("orgCode", res.data.records[0].orgCode);


+ 29
- 2
src/views/Equipment/equipmentDetailList.vue View File

@@ -813,6 +813,31 @@ export default {
// this.getTableList() // this.getTableList()
}, },
methods: { methods: {
// 没有对比时的折线图
getNoCompare(){
this.compareFlag = 0;
let obj = {
// current: this.pageNum,
// pageSize: this.pageNum,
startDate: this.page.openTime,
endDate: this.page.closeTime,
houseId: this.houseId,
timeType: this.timeType,
contrastStartDate: this.selectTime,
contrastEndDate: this.selectTime1,
orgType: localStorage.getItem("orgType"),
};
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType);
obj.timeType == -1 ? (obj.timeType = "") : (obj.timeType = obj.timeType);
axios({
url: `autoSR/zk/equipment/detail/usageTrendContrast`,
method: "get",
params: obj,
})
.then(res=>{
console.log(res);
})
},
radioChange() { radioChange() {
this.selectTime = ""; this.selectTime = "";
this.selectTime1 = ""; this.selectTime1 = "";
@@ -832,7 +857,7 @@ export default {
}); });
}, },
compareChange(idx) { compareChange(idx) {
if (!this.selectTime1) return;
// if (!this.selectTime1) return;
this.compareFlag = idx; this.compareFlag = idx;
this.tabChange(idx); this.tabChange(idx);
}, },
@@ -928,6 +953,7 @@ export default {
this.$set(this, "time", null); this.$set(this, "time", null);
this.getTableList(); this.getTableList();
this.getdetail(); this.getdetail();
this.getcompare()
}, },
screening() { screening() {
this.page.pageNum = 1; this.page.pageNum = 1;
@@ -961,6 +987,7 @@ export default {
this.page.closeTime = this.customtime[1]; this.page.closeTime = this.customtime[1];
this.getTableList(); this.getTableList();
this.getdetail(); this.getdetail();
this.getcompare()
}, },
//获取楼盘数据 //获取楼盘数据
getHouseList() { getHouseList() {
@@ -1026,7 +1053,7 @@ export default {
params: obj, params: obj,
}) })
.then((res) => { .then((res) => {
// console.log(res)
console.log(res,'获取数据')
this.allCompare = res; this.allCompare = res;
this.total = res.data.first.totalRecord; this.total = res.data.first.totalRecord;
// 数据处理 // 数据处理


+ 4
- 4
src/views/Equipment/state.vue View File

@@ -919,9 +919,9 @@ export default {
// orgCode: localStorage.getItem("orgCode"), // orgCode: localStorage.getItem("orgCode"),
// agentId: localStorage.getItem("agentId"), // agentId: localStorage.getItem("agentId"),
// houseId: localStorage.getItem("houseId"), // houseId: localStorage.getItem("houseId"),
agentId: this.selValue == 0 ? this.choicValue : null,
orgCode: this.selValue == 1 ? this.choicValue : null,
houseId: this.selValue == 2 ? this.choicValue : null,
agentId: this.selValue == 0 ? this.choicValue : 'null',
orgCode: this.selValue == 1 ? this.choicValue : 'null',
houseId: this.selValue == 2 ? this.choicValue : 'null',
orgType: localStorage.getItem("orgType"), orgType: localStorage.getItem("orgType"),
...this.searchForm, ...this.searchForm,
}) })
@@ -1299,7 +1299,7 @@ export default {
this.searchForm.orgName = ""; this.searchForm.orgName = "";
this.searchForm.houseName = ""; this.searchForm.houseName = "";
this.searchForm.userName='' this.searchForm.userName=''
if (!e) retun;
if (!e) return;
if (this.selflag == 1) { if (this.selflag == 1) {
// 设备编号 // 设备编号
this.searchForm.imei = e; this.searchForm.imei = e;


Loading…
Cancel
Save