Browse Source

init

newStyle
lancer 3 years ago
parent
commit
c7b2cd694b
3 changed files with 16 additions and 10 deletions
  1. +13
    -7
      src/views/Equipment/equipmentDetailList.vue
  2. +1
    -1
      src/views/Equipment/state.vue
  3. +2
    -2
      vue.config.js

+ 13
- 7
src/views/Equipment/equipmentDetailList.vue View File

@@ -979,13 +979,13 @@ export default {
}, },
screening() { screening() {
this.page.pageNum = 1; this.page.pageNum = 1;
this.page.pageSize = 6;
this.page.pageSize = 10;
this.getTableList(); this.getTableList();
}, },
empty() { empty() {
this.page = { this.page = {
pageNum: 1, pageNum: 1,
pageSize: 6,
pageSize: 10,
openTime: "", openTime: "",
closeTime: "", closeTime: "",
houseName: "", houseName: "",
@@ -1170,12 +1170,18 @@ export default {
item.time = item.first[str]; item.time = item.first[str];
item.time1 = item.second[str]; item.time1 = item.second[str];
item.time2 = item.contrast[str] + ""; item.time2 = item.contrast[str] + "";
if (index > 0) {
timeDate.push(item.name);
arr1.push(item.first[str]);
arr2.push(item.second[str]);
}

// if (index > 0) {
// timeDate.push(item.name);
// arr1.push(item.first[str]);
// arr2.push(item.second[str]);
// }
}); });
this.allCompare.data.first.map((item,idx)=>{
timeDate.push(item.createTime.substring(5)+'VS'+this.allCompare.data.second[idx].createTime.substring(5))
arr1.push(item[str])
arr2.push(this.allCompare.data.second[idx][str])
})
this.compareList = Object.assign([], this.compareList); this.compareList = Object.assign([], this.compareList);
this.$forceUpdate(); this.$forceUpdate();
var chartDom = document.getElementById("compare"); var chartDom = document.getElementById("compare");


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

@@ -1006,7 +1006,7 @@ export default {
.then((res) => { .then((res) => {
this.$message({ this.$message({
type: "success", type: "success",
message: "操作成功!",
message: res.msg,
}); });
this.getTableList(); this.getTableList();
}); });


+ 2
- 2
vue.config.js View File

@@ -3,8 +3,8 @@
* https://cli.vuejs.org/zh/config/ * https://cli.vuejs.org/zh/config/
*/ */
// const url = 'http://pigx-gateway' // const url = 'http://pigx-gateway'
// const url = 'http://39.97.167.65:9999' //测试
const url = 'http://192.168.31.169:9999' //长龙
const url = 'http://39.97.167.65:9999' //测试
// const url = 'http://192.168.31.169:9999' //长龙
// const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.134:9999' //嘉豪
// const url = 'http://192.168.31.100:9999' //王笑 // const url = 'http://192.168.31.100:9999' //王笑
// const url = 'http://nitu5e.natappfree.cc' //王笑 // const url = 'http://nitu5e.natappfree.cc' //王笑


Loading…
Cancel
Save