diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/index.html b/index.html
index 0f5a974..d9b3969 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
rel="stylesheet"
href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css"
/>
-
+
diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/index.html b/index.html
index 0f5a974..d9b3969 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
rel="stylesheet"
href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css"
/>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/index.html b/index.html
index 0f5a974..d9b3969 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
rel="stylesheet"
href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css"
/>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+ 
+
+
+
+ 
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/index.html b/index.html
index 0f5a974..d9b3969 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
rel="stylesheet"
href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css"
/>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/src/components/index.vue b/src/components/index.vue
index 2ac1f4a..8395f05 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -41,7 +41,7 @@
-->
- {{LoginName}}
+ {{ LoginName }}
@@ -50,7 +50,7 @@
:key="index"
:command="item.command"
>
- {{item.key}}
+ {{ item.key }}
@@ -162,7 +162,9 @@
服务监控
- 服务器管理
+ 服务器管理
@@ -213,6 +215,7 @@
id="ContentView"
:userId="userId"
:flag="flag"
+ ref="PathView"
>
@@ -247,38 +250,62 @@
LoginName: "系统管理员", //登录用户名称
userId: "",
flag: true,
- dropdownList:[
- {key:'修改密码',command:'updatePw'}
- ],
+ dropdownList: [{ key: "修改密码", command: "updatePw" }],
//弹窗相关
- dialogInfo:{
+ dialogInfo: {
title: {
- updatePw: '修改密码'
+ updatePw: "修改密码"
},
visible: false,
btLoading: false,
width: "500px",
- type: '',
+ type: "",
btList: [
- {label:'关闭',type:'',icon:'',event:'close',show:true},
- {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+ { label: "关闭", type: "", icon: "", event: "close", show: true },
+ {
+ label: "保存",
+ type: "primary",
+ icon: "",
+ event: "save",
+ show: true,
+ loading: true
+ }
]
},
//表单相关
- formInfo:{
+ formInfo: {
ref: null,
data: {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
},
fieldList: [
- {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
- {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
- {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+ {
+ label: "账户",
+ value: "userNo",
+ disabled: true,
+ type: "input",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "原密码",
+ value: "password",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "新密码",
+ value: "newpassword",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ }
],
rules: {},
- labelWidth: '100px'
+ labelWidth: "100px"
}
};
},
@@ -306,7 +333,11 @@
// console.log(key, keyPath);
},
ChangeBGC() {
- console.log(9999);
+ // 给予gis的方法调用demo A
+ if (this.$refs["PathView"].hasOwnProperty("REFSFunctionToGis"))
+ this.$refs["PathView"].REFSFunctionToGis(this.flag);
+ // 给予gis的方法调用demo E
+
let root = document.querySelector(":root");
if (this.flag) {
root.style.setProperty("--color", "rgb(253, 44, 79)");
@@ -404,18 +435,18 @@
sessionStorage.clear();
},
// 初始化验证
- initRules(){
+ initRules() {
let formInfo = this.formInfo;
formInfo.rules = this.$initRules(formInfo.fieldList);
},
- handleCommand(command){
- const dialogInfo = this.dialogInfo
- const formInfo = this.formInfo
- switch(command){
+ handleCommand(command) {
+ const dialogInfo = this.dialogInfo;
+ const formInfo = this.formInfo;
+ switch (command) {
//修改密码
- case 'updatePw':
+ case "updatePw":
dialogInfo.type = command;
- dialogInfo.visible = true
+ dialogInfo.visible = true;
this.formInfo.data.userNo = localStorage.getItem("USERNO");
break;
}
@@ -424,30 +455,34 @@
handleClick(event, data) {
const formInfo = this.formInfo;
const dialogInfo = this.dialogInfo;
- switch(event) {
+ switch (event) {
//保存
- case 'save':
+ case "save":
formInfo.ref.validate(valid => {
- if(valid){
- let api; let params = formInfo.data;
+ if (valid) {
+ let api;
+ let params = formInfo.data;
dialogInfo.btLoading = true;
- this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
- dialogInfo.btLoading = false;
- if(res.data.code === 1) {
- dialogInfo.visible = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.updateUserPwd, { data: params })
+ .then(res => {
+ dialogInfo.btLoading = false;
+ if (res.data.code === 1) {
+ dialogInfo.visible = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ dialogInfo.btLoading = false;
+ // console.log(e);
});
- }).catch(e =>{
- dialogInfo.btLoading = false;
- console.log(e);
- })
}
- })
- break
+ });
+ break;
//关闭
case "close":
dialogInfo.visible = false;
@@ -457,9 +492,9 @@
//重置表单
resetForm() {
this.formInfo.data = {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
};
}
},
@@ -489,9 +524,9 @@
/deep/.el-icon-arrow-down el-icon--right {
color: #fff !important;
}
-.dropdown{
+.dropdown {
float: right;
- @include sc(16px,#fff);
+ @include sc(16px, #fff);
cursor: pointer;
}
diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/index.html b/index.html
index 0f5a974..d9b3969 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
rel="stylesheet"
href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css"
/>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/src/components/index.vue b/src/components/index.vue
index 2ac1f4a..8395f05 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -41,7 +41,7 @@
-->
- {{LoginName}}
+ {{ LoginName }}
@@ -50,7 +50,7 @@
:key="index"
:command="item.command"
>
- {{item.key}}
+ {{ item.key }}
@@ -162,7 +162,9 @@
服务监控
- 服务器管理
+ 服务器管理
@@ -213,6 +215,7 @@
id="ContentView"
:userId="userId"
:flag="flag"
+ ref="PathView"
>
@@ -247,38 +250,62 @@
LoginName: "系统管理员", //登录用户名称
userId: "",
flag: true,
- dropdownList:[
- {key:'修改密码',command:'updatePw'}
- ],
+ dropdownList: [{ key: "修改密码", command: "updatePw" }],
//弹窗相关
- dialogInfo:{
+ dialogInfo: {
title: {
- updatePw: '修改密码'
+ updatePw: "修改密码"
},
visible: false,
btLoading: false,
width: "500px",
- type: '',
+ type: "",
btList: [
- {label:'关闭',type:'',icon:'',event:'close',show:true},
- {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+ { label: "关闭", type: "", icon: "", event: "close", show: true },
+ {
+ label: "保存",
+ type: "primary",
+ icon: "",
+ event: "save",
+ show: true,
+ loading: true
+ }
]
},
//表单相关
- formInfo:{
+ formInfo: {
ref: null,
data: {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
},
fieldList: [
- {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
- {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
- {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+ {
+ label: "账户",
+ value: "userNo",
+ disabled: true,
+ type: "input",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "原密码",
+ value: "password",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "新密码",
+ value: "newpassword",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ }
],
rules: {},
- labelWidth: '100px'
+ labelWidth: "100px"
}
};
},
@@ -306,7 +333,11 @@
// console.log(key, keyPath);
},
ChangeBGC() {
- console.log(9999);
+ // 给予gis的方法调用demo A
+ if (this.$refs["PathView"].hasOwnProperty("REFSFunctionToGis"))
+ this.$refs["PathView"].REFSFunctionToGis(this.flag);
+ // 给予gis的方法调用demo E
+
let root = document.querySelector(":root");
if (this.flag) {
root.style.setProperty("--color", "rgb(253, 44, 79)");
@@ -404,18 +435,18 @@
sessionStorage.clear();
},
// 初始化验证
- initRules(){
+ initRules() {
let formInfo = this.formInfo;
formInfo.rules = this.$initRules(formInfo.fieldList);
},
- handleCommand(command){
- const dialogInfo = this.dialogInfo
- const formInfo = this.formInfo
- switch(command){
+ handleCommand(command) {
+ const dialogInfo = this.dialogInfo;
+ const formInfo = this.formInfo;
+ switch (command) {
//修改密码
- case 'updatePw':
+ case "updatePw":
dialogInfo.type = command;
- dialogInfo.visible = true
+ dialogInfo.visible = true;
this.formInfo.data.userNo = localStorage.getItem("USERNO");
break;
}
@@ -424,30 +455,34 @@
handleClick(event, data) {
const formInfo = this.formInfo;
const dialogInfo = this.dialogInfo;
- switch(event) {
+ switch (event) {
//保存
- case 'save':
+ case "save":
formInfo.ref.validate(valid => {
- if(valid){
- let api; let params = formInfo.data;
+ if (valid) {
+ let api;
+ let params = formInfo.data;
dialogInfo.btLoading = true;
- this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
- dialogInfo.btLoading = false;
- if(res.data.code === 1) {
- dialogInfo.visible = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.updateUserPwd, { data: params })
+ .then(res => {
+ dialogInfo.btLoading = false;
+ if (res.data.code === 1) {
+ dialogInfo.visible = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ dialogInfo.btLoading = false;
+ // console.log(e);
});
- }).catch(e =>{
- dialogInfo.btLoading = false;
- console.log(e);
- })
}
- })
- break
+ });
+ break;
//关闭
case "close":
dialogInfo.visible = false;
@@ -457,9 +492,9 @@
//重置表单
resetForm() {
this.formInfo.data = {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
};
}
},
@@ -489,9 +524,9 @@
/deep/.el-icon-arrow-down el-icon--right {
color: #fff !important;
}
-.dropdown{
+.dropdown {
float: right;
- @include sc(16px,#fff);
+ @include sc(16px, #fff);
cursor: pointer;
}
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a1cb086 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -493,7 +493,7 @@
methods: {
// 加载页面分组信息
loadFZData(event) {
- console.log(event);
+ // console.log(event);
this.loading = true;
this.$http
.get(
@@ -624,7 +624,6 @@
this.$http
.get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
.then(response => {
- // console.log(response.data.data);
// 加载表头
this.NFSNowDataTableHead = response.data.data;
// 加载实时数据
@@ -650,8 +649,6 @@
this.NFSNowDataTableData = JSON.parse(
JSON.stringify([response.data])
);
- // console.log(response.data);
- // console.log(this.NFSNowDataTableData);
// 通过state显示图标
if (response.data.state == 1) {
// 异常
@@ -741,7 +738,7 @@
this.loading3 = false;
// console.log(response.data.rows);
this.HistoryTableData = response.data.rows;
- console.log(1111111, this.HistoryTableData);
+ // console.log(1111111, this.HistoryTableData);
this.DatagridDataLength = response.data.total;
})
.catch(response => {
@@ -887,7 +884,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +896,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +909,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +926,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +941,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -1013,10 +1010,10 @@
// },
// 表单提交5
submitForm5(formName) {
- console.log(1, this.$refs[formName]);
+ // console.log(1, this.$refs[formName]);
this.$refs[formName].validate(valid => {
if (valid) {
- console.log(11111);
+ // console.log(11111);
this.$http
.post({
url: this.nozzle.surveyDataExporExcelOfSurverData,
@@ -1050,7 +1047,7 @@
// message(response);
});
} else {
- console.log("error submit!!");
+ // console.log("error submit!!");
return false;
}
});
diff --git a/config/index.js b/config/index.js
index b7287be..7e47eae 100644
--- a/config/index.js
+++ b/config/index.js
@@ -87,8 +87,8 @@
},
// Various Dev Server settings
- host: "localhost", // can be overwritten by process.env.HOST
- port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+ host: "localhost" , // can be overwritten by process.env.HOST
+ port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: true,
diff --git a/index.html b/index.html
index 0f5a974..d9b3969 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
rel="stylesheet"
href="http://223.220.58.86:6081/arcgis_js_v329_api/arcgis_js_api/library/3.29/3.29/esri/css/esri.css"
/>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/src/components/index.vue b/src/components/index.vue
index 2ac1f4a..8395f05 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -41,7 +41,7 @@
-->
- {{LoginName}}
+ {{ LoginName }}
@@ -50,7 +50,7 @@
:key="index"
:command="item.command"
>
- {{item.key}}
+ {{ item.key }}
@@ -162,7 +162,9 @@
服务监控
- 服务器管理
+ 服务器管理
@@ -213,6 +215,7 @@
id="ContentView"
:userId="userId"
:flag="flag"
+ ref="PathView"
>
@@ -247,38 +250,62 @@
LoginName: "系统管理员", //登录用户名称
userId: "",
flag: true,
- dropdownList:[
- {key:'修改密码',command:'updatePw'}
- ],
+ dropdownList: [{ key: "修改密码", command: "updatePw" }],
//弹窗相关
- dialogInfo:{
+ dialogInfo: {
title: {
- updatePw: '修改密码'
+ updatePw: "修改密码"
},
visible: false,
btLoading: false,
width: "500px",
- type: '',
+ type: "",
btList: [
- {label:'关闭',type:'',icon:'',event:'close',show:true},
- {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+ { label: "关闭", type: "", icon: "", event: "close", show: true },
+ {
+ label: "保存",
+ type: "primary",
+ icon: "",
+ event: "save",
+ show: true,
+ loading: true
+ }
]
},
//表单相关
- formInfo:{
+ formInfo: {
ref: null,
data: {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
},
fieldList: [
- {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
- {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
- {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+ {
+ label: "账户",
+ value: "userNo",
+ disabled: true,
+ type: "input",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "原密码",
+ value: "password",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "新密码",
+ value: "newpassword",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ }
],
rules: {},
- labelWidth: '100px'
+ labelWidth: "100px"
}
};
},
@@ -306,7 +333,11 @@
// console.log(key, keyPath);
},
ChangeBGC() {
- console.log(9999);
+ // 给予gis的方法调用demo A
+ if (this.$refs["PathView"].hasOwnProperty("REFSFunctionToGis"))
+ this.$refs["PathView"].REFSFunctionToGis(this.flag);
+ // 给予gis的方法调用demo E
+
let root = document.querySelector(":root");
if (this.flag) {
root.style.setProperty("--color", "rgb(253, 44, 79)");
@@ -404,18 +435,18 @@
sessionStorage.clear();
},
// 初始化验证
- initRules(){
+ initRules() {
let formInfo = this.formInfo;
formInfo.rules = this.$initRules(formInfo.fieldList);
},
- handleCommand(command){
- const dialogInfo = this.dialogInfo
- const formInfo = this.formInfo
- switch(command){
+ handleCommand(command) {
+ const dialogInfo = this.dialogInfo;
+ const formInfo = this.formInfo;
+ switch (command) {
//修改密码
- case 'updatePw':
+ case "updatePw":
dialogInfo.type = command;
- dialogInfo.visible = true
+ dialogInfo.visible = true;
this.formInfo.data.userNo = localStorage.getItem("USERNO");
break;
}
@@ -424,30 +455,34 @@
handleClick(event, data) {
const formInfo = this.formInfo;
const dialogInfo = this.dialogInfo;
- switch(event) {
+ switch (event) {
//保存
- case 'save':
+ case "save":
formInfo.ref.validate(valid => {
- if(valid){
- let api; let params = formInfo.data;
+ if (valid) {
+ let api;
+ let params = formInfo.data;
dialogInfo.btLoading = true;
- this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
- dialogInfo.btLoading = false;
- if(res.data.code === 1) {
- dialogInfo.visible = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.updateUserPwd, { data: params })
+ .then(res => {
+ dialogInfo.btLoading = false;
+ if (res.data.code === 1) {
+ dialogInfo.visible = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ dialogInfo.btLoading = false;
+ // console.log(e);
});
- }).catch(e =>{
- dialogInfo.btLoading = false;
- console.log(e);
- })
}
- })
- break
+ });
+ break;
//关闭
case "close":
dialogInfo.visible = false;
@@ -457,9 +492,9 @@
//重置表单
resetForm() {
this.formInfo.data = {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
};
}
},
@@ -489,9 +524,9 @@
/deep/.el-icon-arrow-down el-icon--right {
color: #fff !important;
}
-.dropdown{
+.dropdown {
float: right;
- @include sc(16px,#fff);
+ @include sc(16px, #fff);
cursor: pointer;
}
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a1cb086 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -493,7 +493,7 @@
methods: {
// 加载页面分组信息
loadFZData(event) {
- console.log(event);
+ // console.log(event);
this.loading = true;
this.$http
.get(
@@ -624,7 +624,6 @@
this.$http
.get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
.then(response => {
- // console.log(response.data.data);
// 加载表头
this.NFSNowDataTableHead = response.data.data;
// 加载实时数据
@@ -650,8 +649,6 @@
this.NFSNowDataTableData = JSON.parse(
JSON.stringify([response.data])
);
- // console.log(response.data);
- // console.log(this.NFSNowDataTableData);
// 通过state显示图标
if (response.data.state == 1) {
// 异常
@@ -741,7 +738,7 @@
this.loading3 = false;
// console.log(response.data.rows);
this.HistoryTableData = response.data.rows;
- console.log(1111111, this.HistoryTableData);
+ // console.log(1111111, this.HistoryTableData);
this.DatagridDataLength = response.data.total;
})
.catch(response => {
@@ -887,7 +884,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +896,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +909,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +926,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +941,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -1013,10 +1010,10 @@
// },
// 表单提交5
submitForm5(formName) {
- console.log(1, this.$refs[formName]);
+ // console.log(1, this.$refs[formName]);
this.$refs[formName].validate(valid => {
if (valid) {
- console.log(11111);
+ // console.log(11111);
this.$http
.post({
url: this.nozzle.surveyDataExporExcelOfSurverData,
@@ -1050,7 +1047,7 @@
// message(response);
});
} else {
- console.log("error submit!!");
+ // console.log("error submit!!");
return false;
}
});
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index b01609f..76b9f0c 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -243,7 +243,7 @@
class="previewOfSiteStatusCentent3Li"
v-for="(item, index) in Region"
:key="index"
- style="cursor: pointer;"
+ style="cursor: pointer"
>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/src/components/index.vue b/src/components/index.vue
index 2ac1f4a..8395f05 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -41,7 +41,7 @@
-->
- {{LoginName}}
+ {{ LoginName }}
@@ -50,7 +50,7 @@
:key="index"
:command="item.command"
>
- {{item.key}}
+ {{ item.key }}
@@ -162,7 +162,9 @@
服务监控
- 服务器管理
+ 服务器管理
@@ -213,6 +215,7 @@
id="ContentView"
:userId="userId"
:flag="flag"
+ ref="PathView"
>
@@ -247,38 +250,62 @@
LoginName: "系统管理员", //登录用户名称
userId: "",
flag: true,
- dropdownList:[
- {key:'修改密码',command:'updatePw'}
- ],
+ dropdownList: [{ key: "修改密码", command: "updatePw" }],
//弹窗相关
- dialogInfo:{
+ dialogInfo: {
title: {
- updatePw: '修改密码'
+ updatePw: "修改密码"
},
visible: false,
btLoading: false,
width: "500px",
- type: '',
+ type: "",
btList: [
- {label:'关闭',type:'',icon:'',event:'close',show:true},
- {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+ { label: "关闭", type: "", icon: "", event: "close", show: true },
+ {
+ label: "保存",
+ type: "primary",
+ icon: "",
+ event: "save",
+ show: true,
+ loading: true
+ }
]
},
//表单相关
- formInfo:{
+ formInfo: {
ref: null,
data: {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
},
fieldList: [
- {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
- {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
- {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+ {
+ label: "账户",
+ value: "userNo",
+ disabled: true,
+ type: "input",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "原密码",
+ value: "password",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "新密码",
+ value: "newpassword",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ }
],
rules: {},
- labelWidth: '100px'
+ labelWidth: "100px"
}
};
},
@@ -306,7 +333,11 @@
// console.log(key, keyPath);
},
ChangeBGC() {
- console.log(9999);
+ // 给予gis的方法调用demo A
+ if (this.$refs["PathView"].hasOwnProperty("REFSFunctionToGis"))
+ this.$refs["PathView"].REFSFunctionToGis(this.flag);
+ // 给予gis的方法调用demo E
+
let root = document.querySelector(":root");
if (this.flag) {
root.style.setProperty("--color", "rgb(253, 44, 79)");
@@ -404,18 +435,18 @@
sessionStorage.clear();
},
// 初始化验证
- initRules(){
+ initRules() {
let formInfo = this.formInfo;
formInfo.rules = this.$initRules(formInfo.fieldList);
},
- handleCommand(command){
- const dialogInfo = this.dialogInfo
- const formInfo = this.formInfo
- switch(command){
+ handleCommand(command) {
+ const dialogInfo = this.dialogInfo;
+ const formInfo = this.formInfo;
+ switch (command) {
//修改密码
- case 'updatePw':
+ case "updatePw":
dialogInfo.type = command;
- dialogInfo.visible = true
+ dialogInfo.visible = true;
this.formInfo.data.userNo = localStorage.getItem("USERNO");
break;
}
@@ -424,30 +455,34 @@
handleClick(event, data) {
const formInfo = this.formInfo;
const dialogInfo = this.dialogInfo;
- switch(event) {
+ switch (event) {
//保存
- case 'save':
+ case "save":
formInfo.ref.validate(valid => {
- if(valid){
- let api; let params = formInfo.data;
+ if (valid) {
+ let api;
+ let params = formInfo.data;
dialogInfo.btLoading = true;
- this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
- dialogInfo.btLoading = false;
- if(res.data.code === 1) {
- dialogInfo.visible = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.updateUserPwd, { data: params })
+ .then(res => {
+ dialogInfo.btLoading = false;
+ if (res.data.code === 1) {
+ dialogInfo.visible = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ dialogInfo.btLoading = false;
+ // console.log(e);
});
- }).catch(e =>{
- dialogInfo.btLoading = false;
- console.log(e);
- })
}
- })
- break
+ });
+ break;
//关闭
case "close":
dialogInfo.visible = false;
@@ -457,9 +492,9 @@
//重置表单
resetForm() {
this.formInfo.data = {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
};
}
},
@@ -489,9 +524,9 @@
/deep/.el-icon-arrow-down el-icon--right {
color: #fff !important;
}
-.dropdown{
+.dropdown {
float: right;
- @include sc(16px,#fff);
+ @include sc(16px, #fff);
cursor: pointer;
}
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a1cb086 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -493,7 +493,7 @@
methods: {
// 加载页面分组信息
loadFZData(event) {
- console.log(event);
+ // console.log(event);
this.loading = true;
this.$http
.get(
@@ -624,7 +624,6 @@
this.$http
.get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
.then(response => {
- // console.log(response.data.data);
// 加载表头
this.NFSNowDataTableHead = response.data.data;
// 加载实时数据
@@ -650,8 +649,6 @@
this.NFSNowDataTableData = JSON.parse(
JSON.stringify([response.data])
);
- // console.log(response.data);
- // console.log(this.NFSNowDataTableData);
// 通过state显示图标
if (response.data.state == 1) {
// 异常
@@ -741,7 +738,7 @@
this.loading3 = false;
// console.log(response.data.rows);
this.HistoryTableData = response.data.rows;
- console.log(1111111, this.HistoryTableData);
+ // console.log(1111111, this.HistoryTableData);
this.DatagridDataLength = response.data.total;
})
.catch(response => {
@@ -887,7 +884,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +896,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +909,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +926,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +941,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -1013,10 +1010,10 @@
// },
// 表单提交5
submitForm5(formName) {
- console.log(1, this.$refs[formName]);
+ // console.log(1, this.$refs[formName]);
this.$refs[formName].validate(valid => {
if (valid) {
- console.log(11111);
+ // console.log(11111);
this.$http
.post({
url: this.nozzle.surveyDataExporExcelOfSurverData,
@@ -1050,7 +1047,7 @@
// message(response);
});
} else {
- console.log("error submit!!");
+ // console.log("error submit!!");
return false;
}
});
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index b01609f..76b9f0c 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -243,7 +243,7 @@
class="previewOfSiteStatusCentent3Li"
v-for="(item, index) in Region"
:key="index"
- style="cursor: pointer;"
+ style="cursor: pointer"
>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/src/components/index.vue b/src/components/index.vue
index 2ac1f4a..8395f05 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -41,7 +41,7 @@
-->
- {{LoginName}}
+ {{ LoginName }}
@@ -50,7 +50,7 @@
:key="index"
:command="item.command"
>
- {{item.key}}
+ {{ item.key }}
@@ -162,7 +162,9 @@
服务监控
- 服务器管理
+ 服务器管理
@@ -213,6 +215,7 @@
id="ContentView"
:userId="userId"
:flag="flag"
+ ref="PathView"
>
@@ -247,38 +250,62 @@
LoginName: "系统管理员", //登录用户名称
userId: "",
flag: true,
- dropdownList:[
- {key:'修改密码',command:'updatePw'}
- ],
+ dropdownList: [{ key: "修改密码", command: "updatePw" }],
//弹窗相关
- dialogInfo:{
+ dialogInfo: {
title: {
- updatePw: '修改密码'
+ updatePw: "修改密码"
},
visible: false,
btLoading: false,
width: "500px",
- type: '',
+ type: "",
btList: [
- {label:'关闭',type:'',icon:'',event:'close',show:true},
- {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+ { label: "关闭", type: "", icon: "", event: "close", show: true },
+ {
+ label: "保存",
+ type: "primary",
+ icon: "",
+ event: "save",
+ show: true,
+ loading: true
+ }
]
},
//表单相关
- formInfo:{
+ formInfo: {
ref: null,
data: {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
},
fieldList: [
- {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
- {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
- {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+ {
+ label: "账户",
+ value: "userNo",
+ disabled: true,
+ type: "input",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "原密码",
+ value: "password",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "新密码",
+ value: "newpassword",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ }
],
rules: {},
- labelWidth: '100px'
+ labelWidth: "100px"
}
};
},
@@ -306,7 +333,11 @@
// console.log(key, keyPath);
},
ChangeBGC() {
- console.log(9999);
+ // 给予gis的方法调用demo A
+ if (this.$refs["PathView"].hasOwnProperty("REFSFunctionToGis"))
+ this.$refs["PathView"].REFSFunctionToGis(this.flag);
+ // 给予gis的方法调用demo E
+
let root = document.querySelector(":root");
if (this.flag) {
root.style.setProperty("--color", "rgb(253, 44, 79)");
@@ -404,18 +435,18 @@
sessionStorage.clear();
},
// 初始化验证
- initRules(){
+ initRules() {
let formInfo = this.formInfo;
formInfo.rules = this.$initRules(formInfo.fieldList);
},
- handleCommand(command){
- const dialogInfo = this.dialogInfo
- const formInfo = this.formInfo
- switch(command){
+ handleCommand(command) {
+ const dialogInfo = this.dialogInfo;
+ const formInfo = this.formInfo;
+ switch (command) {
//修改密码
- case 'updatePw':
+ case "updatePw":
dialogInfo.type = command;
- dialogInfo.visible = true
+ dialogInfo.visible = true;
this.formInfo.data.userNo = localStorage.getItem("USERNO");
break;
}
@@ -424,30 +455,34 @@
handleClick(event, data) {
const formInfo = this.formInfo;
const dialogInfo = this.dialogInfo;
- switch(event) {
+ switch (event) {
//保存
- case 'save':
+ case "save":
formInfo.ref.validate(valid => {
- if(valid){
- let api; let params = formInfo.data;
+ if (valid) {
+ let api;
+ let params = formInfo.data;
dialogInfo.btLoading = true;
- this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
- dialogInfo.btLoading = false;
- if(res.data.code === 1) {
- dialogInfo.visible = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.updateUserPwd, { data: params })
+ .then(res => {
+ dialogInfo.btLoading = false;
+ if (res.data.code === 1) {
+ dialogInfo.visible = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ dialogInfo.btLoading = false;
+ // console.log(e);
});
- }).catch(e =>{
- dialogInfo.btLoading = false;
- console.log(e);
- })
}
- })
- break
+ });
+ break;
//关闭
case "close":
dialogInfo.visible = false;
@@ -457,9 +492,9 @@
//重置表单
resetForm() {
this.formInfo.data = {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
};
}
},
@@ -489,9 +524,9 @@
/deep/.el-icon-arrow-down el-icon--right {
color: #fff !important;
}
-.dropdown{
+.dropdown {
float: right;
- @include sc(16px,#fff);
+ @include sc(16px, #fff);
cursor: pointer;
}
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a1cb086 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -493,7 +493,7 @@
methods: {
// 加载页面分组信息
loadFZData(event) {
- console.log(event);
+ // console.log(event);
this.loading = true;
this.$http
.get(
@@ -624,7 +624,6 @@
this.$http
.get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
.then(response => {
- // console.log(response.data.data);
// 加载表头
this.NFSNowDataTableHead = response.data.data;
// 加载实时数据
@@ -650,8 +649,6 @@
this.NFSNowDataTableData = JSON.parse(
JSON.stringify([response.data])
);
- // console.log(response.data);
- // console.log(this.NFSNowDataTableData);
// 通过state显示图标
if (response.data.state == 1) {
// 异常
@@ -741,7 +738,7 @@
this.loading3 = false;
// console.log(response.data.rows);
this.HistoryTableData = response.data.rows;
- console.log(1111111, this.HistoryTableData);
+ // console.log(1111111, this.HistoryTableData);
this.DatagridDataLength = response.data.total;
})
.catch(response => {
@@ -887,7 +884,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +896,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +909,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +926,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +941,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -1013,10 +1010,10 @@
// },
// 表单提交5
submitForm5(formName) {
- console.log(1, this.$refs[formName]);
+ // console.log(1, this.$refs[formName]);
this.$refs[formName].validate(valid => {
if (valid) {
- console.log(11111);
+ // console.log(11111);
this.$http
.post({
url: this.nozzle.surveyDataExporExcelOfSurverData,
@@ -1050,7 +1047,7 @@
// message(response);
});
} else {
- console.log("error submit!!");
+ // console.log("error submit!!");
return false;
}
});
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index b01609f..76b9f0c 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -243,7 +243,7 @@
class="previewOfSiteStatusCentent3Li"
v-for="(item, index) in Region"
:key="index"
- style="cursor: pointer;"
+ style="cursor: pointer"
>
-
+
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index c2aa7fc..801c3b3 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -205,12 +210,31 @@
>
-
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> ad620ef3af4de08b199e1d1c6c52489a965e9a0a
- 查询
+ 查询
@@ -290,11 +314,45 @@
endDate: ""
},
list: [
- {type: "input", label: "站点名称/编号", value: "searchStr", hideLabel: true },
- {type: "date", label: "开始时间", value: "startDate", dateType: "date", datePickerOptions: "pickerOptionsStart", hideLabel: true},
- {type: "date", label: "结束时间", value: "endDate", dateType: "date", datePickerOptions: "pickerOptionsEnd", hideLabel: true},
- {type: "button", label: "查询", btType: "primary", icon: "el-icon-search", event: "search", show: true},
- {type: "button", label: "添加站点", btType: "primary", icon: "el-icon-circle-plus-outline", event: "create", show: true, has: "m11-2-1"}
+ {
+ type: "input",
+ label: "站点名称/编号",
+ value: "searchStr",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "开始时间",
+ value: "startDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsStart",
+ hideLabel: true
+ },
+ {
+ type: "date",
+ label: "结束时间",
+ value: "endDate",
+ dateType: "date",
+ datePickerOptions: "pickerOptionsEnd",
+ hideLabel: true
+ },
+ {
+ type: "button",
+ label: "查询",
+ btType: "primary",
+ icon: "el-icon-search",
+ event: "search",
+ show: true
+ },
+ {
+ type: "button",
+ label: "添加站点",
+ btType: "primary",
+ icon: "el-icon-circle-plus-outline",
+ event: "create",
+ show: true,
+ has: "m11-2-1"
+ }
]
},
//站点表格相关
@@ -307,17 +365,34 @@
{ label: "站点编号", value: "stCode", minWidth: 120, tooltip: true },
{ label: "站点名称", value: "stName", minWidth: 120, tooltip: true },
{ label: "站点类型", value: "stationTypeName", width: 120 },
- { label: "站点安装时间", value: "createTime", minWidth: 120, tooltip: true },
+ {
+ label: "站点安装时间",
+ value: "createTime",
+ minWidth: 120,
+ tooltip: true
+ },
{ label: "安装人", value: "person", width: 100 },
{ label: "关联设备", value: "equips", width: 100, type: "slot" },
- { label: "首次数据接入时间", value: "tt", minWidth: 150, tooltip: true },
+ {
+ label: "首次数据接入时间",
+ value: "tt",
+ minWidth: 150,
+ tooltip: true
+ }
],
handle: {
fixed: "right",
label: "操作",
width: "80",
btList: [
- { label: "修改", size: "small", type: "text", event: "update", show: true, has: 'm11-2-2' }
+ {
+ label: "修改",
+ size: "small",
+ type: "text",
+ event: "update",
+ show: true,
+ has: "m11-2-2"
+ }
]
}
},
@@ -429,7 +504,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -551,24 +626,26 @@
let config = {
headers: { "Content-Type": "multipart/form-data" }
};
- axios.post(this.nozzle.upload, formdata, config).then(res => {
- if (res.data.code == 1) {
+ axios
+ .post(this.nozzle.upload, formdata, config)
+ .then(res => {
+ if (res.data.code == 1) {
+ this.loading = false;
+ this.$message({
+ message: "上传图片成功！",
+ type: "success"
+ });
+ this.ruleForm.fileList.push(res.data.data[0]);
+ this.siteTableInfo.refresh = Math.random();
+ }
+ })
+ .catch(res => {
this.loading = false;
this.$message({
- message: "上传图片成功！",
- type: "success"
+ message: "服务器问题！请重试！",
+ type: "warning"
});
- this.ruleForm.fileList.push(res.data.data[0]);
- this.siteTableInfo.refresh = Math.random();
- }
- })
- .catch(res => {
- this.loading = false;
- this.$message({
- message: "服务器问题！请重试！",
- type: "warning"
});
- });
},
// 删除图片按钮
deleteImg(fileNo) {
@@ -595,7 +672,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -631,20 +708,21 @@
saveOru(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
- this.$http.post(this.nozzle.saveOrupdate, {
- data: this.ruleForm
- })
- .then(res => {
- if(res.data.code === 1) {
- this.siteTableInfo.refresh = Math.random();
- this.yzaddflag = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? 'success' : 'error',
- showClose: true,
+ this.$http
+ .post(this.nozzle.saveOrupdate, {
+ data: this.ruleForm
})
- });
+ .then(res => {
+ if (res.data.code === 1) {
+ this.siteTableInfo.refresh = Math.random();
+ this.yzaddflag = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ });
}
});
},
@@ -666,9 +744,9 @@
this.previousElementSibling.click();
};
el.ondblclick = function() {
- if(Array.isArray(that.$refs.cascader)) {
+ if (Array.isArray(that.$refs.cascader)) {
that.$refs.cascader[0].dropDownVisible = false;
- }else{
+ } else {
that.$refs.cascader.dropDownVisible = false;
}
};
@@ -720,8 +798,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -754,8 +832,14 @@
this.deviceRelatedQuery.siteCode = data.stCode;
this.dialogInfo.visible = true;
setTimeout(() => {
- Object.assign(this.isRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
- Object.assign(this.unRelatedDeviceTableInfo.query, this.deviceRelatedQuery);
+ Object.assign(
+ this.isRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
+ Object.assign(
+ this.unRelatedDeviceTableInfo.query,
+ this.deviceRelatedQuery
+ );
this.deviceTableInfo.refresh = Math.random();
}, 0);
break;
@@ -766,43 +850,54 @@
break;
//添加设备到站点
case "insert":
- const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map( item => item.equipNo);
+ const insertEquipNoArr = this.unRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const insertData = {
siteCode: this.unRelatedDeviceTableInfo.query.siteCode,
equipNos: insertEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipInsertBatch, { data: insertData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipInsertBatch, { data: insertData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
});
- });
break;
//解绑设备与站点
case "remove":
- const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(item => item.equipNo);
+ const removeEquipNoArr = this.isRelatedDeviceTableInfo.selectList.map(
+ item => item.equipNo
+ );
const removeData = {
siteCode: this.isRelatedDeviceTableInfo.query.siteCode,
equipNos: removeEquipNoArr
};
- this.$http.post(this.nozzle.sysEquipRemoveBatch, { data: removeData }).then(res => {
- if (res.data.code === 1) {
- this.deviceRelatedQuery.searchStr = "";
- this.deviceTableInfo.refresh = Math.random();
- this.deviceTableInfo.initCurpage = Math.random();
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.sysEquipRemoveBatch, { data: removeData })
+ .then(res => {
+ if (res.data.code === 1) {
+ this.deviceRelatedQuery.searchStr = "";
+ this.deviceTableInfo.refresh = Math.random();
+ this.deviceTableInfo.initCurpage = Math.random();
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ console.log(e);
});
- }).catch(e =>{console.log(e)});
break;
//关闭
case "close":
@@ -911,9 +1006,10 @@
width: 200px;
margin: 0 10px;
}
-.title, .table-title{
- @include hl(30px,30px);
- color: #409EFF;
+.title,
+.table-title {
+ @include hl(30px, 30px);
+ color: #409eff;
text-align: center;
font-size: 16px;
margin-bottom: 10px;
diff --git a/src/components/ServiceWatch/components/monitor.vue b/src/components/ServiceWatch/components/monitor.vue
index 622eda4..d57dc9a 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
${axisValue}
${params[0].value}%
`
// var res = params[0].name;
@@ -439,13 +463,9 @@
// 点击导出
downImg(target) {
this.showBigEcharts(target);
- // console.log(this.bigEachartsTest,'myChart')
// this.bigEachartsTest.on('finished', function () {
- // console.log(2222)
// });
setTimeout(() => {
- // console.log(this.bigEachartsTest,'myChart')
-
// var img = new Image();
// img.src = this.bigEacharts.getDataURL({
// pixelRatio: 2,
@@ -493,7 +513,7 @@
});
});
});
- console.log(arr, "arr");
+ // console.log(arr, "arr");
var param = {
regionId: "ap-chengdu",
instanceId: this.$route.query.instanceId,
@@ -876,4 +896,16 @@
.export {
color: var(--yellow);
}
+
+.optionbtn {
+ position: relative;
+ // background-color: rgb(2, 120, 254) !important;
+ // border: 1px solid rgb(2, 120, 254) !important;
+ padding: 12px 20px;
+}
+.optionbtn img {
+ position: absolute;
+ top: calc(50% - 10px);
+ left: calc(50% - 10px);
+}
diff --git a/src/components/index.vue b/src/components/index.vue
index 2ac1f4a..8395f05 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -41,7 +41,7 @@
-->
- {{LoginName}}
+ {{ LoginName }}
@@ -50,7 +50,7 @@
:key="index"
:command="item.command"
>
- {{item.key}}
+ {{ item.key }}
@@ -162,7 +162,9 @@
服务监控
- 服务器管理
+ 服务器管理
@@ -213,6 +215,7 @@
id="ContentView"
:userId="userId"
:flag="flag"
+ ref="PathView"
>
@@ -247,38 +250,62 @@
LoginName: "系统管理员", //登录用户名称
userId: "",
flag: true,
- dropdownList:[
- {key:'修改密码',command:'updatePw'}
- ],
+ dropdownList: [{ key: "修改密码", command: "updatePw" }],
//弹窗相关
- dialogInfo:{
+ dialogInfo: {
title: {
- updatePw: '修改密码'
+ updatePw: "修改密码"
},
visible: false,
btLoading: false,
width: "500px",
- type: '',
+ type: "",
btList: [
- {label:'关闭',type:'',icon:'',event:'close',show:true},
- {label:'保存',type:'primary',icon:'',event:'save',show:true,loading: true}
+ { label: "关闭", type: "", icon: "", event: "close", show: true },
+ {
+ label: "保存",
+ type: "primary",
+ icon: "",
+ event: "save",
+ show: true,
+ loading: true
+ }
]
},
//表单相关
- formInfo:{
+ formInfo: {
ref: null,
data: {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
},
fieldList: [
- {label:'账户',value:'userNo',disabled:true,type:'input',required:true,className:'el-form-block'},
- {label:'原密码',value:'password',type:'password',required:true,className:'el-form-block'},
- {label:'新密码',value:'newpassword',type:'password',required:true,className:'el-form-block'},
+ {
+ label: "账户",
+ value: "userNo",
+ disabled: true,
+ type: "input",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "原密码",
+ value: "password",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ },
+ {
+ label: "新密码",
+ value: "newpassword",
+ type: "password",
+ required: true,
+ className: "el-form-block"
+ }
],
rules: {},
- labelWidth: '100px'
+ labelWidth: "100px"
}
};
},
@@ -306,7 +333,11 @@
// console.log(key, keyPath);
},
ChangeBGC() {
- console.log(9999);
+ // 给予gis的方法调用demo A
+ if (this.$refs["PathView"].hasOwnProperty("REFSFunctionToGis"))
+ this.$refs["PathView"].REFSFunctionToGis(this.flag);
+ // 给予gis的方法调用demo E
+
let root = document.querySelector(":root");
if (this.flag) {
root.style.setProperty("--color", "rgb(253, 44, 79)");
@@ -404,18 +435,18 @@
sessionStorage.clear();
},
// 初始化验证
- initRules(){
+ initRules() {
let formInfo = this.formInfo;
formInfo.rules = this.$initRules(formInfo.fieldList);
},
- handleCommand(command){
- const dialogInfo = this.dialogInfo
- const formInfo = this.formInfo
- switch(command){
+ handleCommand(command) {
+ const dialogInfo = this.dialogInfo;
+ const formInfo = this.formInfo;
+ switch (command) {
//修改密码
- case 'updatePw':
+ case "updatePw":
dialogInfo.type = command;
- dialogInfo.visible = true
+ dialogInfo.visible = true;
this.formInfo.data.userNo = localStorage.getItem("USERNO");
break;
}
@@ -424,30 +455,34 @@
handleClick(event, data) {
const formInfo = this.formInfo;
const dialogInfo = this.dialogInfo;
- switch(event) {
+ switch (event) {
//保存
- case 'save':
+ case "save":
formInfo.ref.validate(valid => {
- if(valid){
- let api; let params = formInfo.data;
+ if (valid) {
+ let api;
+ let params = formInfo.data;
dialogInfo.btLoading = true;
- this.$http.post(this.nozzle.updateUserPwd,{data:params}).then(res =>{
- dialogInfo.btLoading = false;
- if(res.data.code === 1) {
- dialogInfo.visible = false;
- }
- this.$message({
- message: res.data.msg,
- type: res.data.code === 1 ? "success" : "error",
- showClose: true
+ this.$http
+ .post(this.nozzle.updateUserPwd, { data: params })
+ .then(res => {
+ dialogInfo.btLoading = false;
+ if (res.data.code === 1) {
+ dialogInfo.visible = false;
+ }
+ this.$message({
+ message: res.data.msg,
+ type: res.data.code === 1 ? "success" : "error",
+ showClose: true
+ });
+ })
+ .catch(e => {
+ dialogInfo.btLoading = false;
+ // console.log(e);
});
- }).catch(e =>{
- dialogInfo.btLoading = false;
- console.log(e);
- })
}
- })
- break
+ });
+ break;
//关闭
case "close":
dialogInfo.visible = false;
@@ -457,9 +492,9 @@
//重置表单
resetForm() {
this.formInfo.data = {
- userNo:'', //账户
- password:'', //原始密码
- newpassword:'', //新密码
+ userNo: "", //账户
+ password: "", //原始密码
+ newpassword: "" //新密码
};
}
},
@@ -489,9 +524,9 @@
/deep/.el-icon-arrow-down el-icon--right {
color: #fff !important;
}
-.dropdown{
+.dropdown {
float: right;
- @include sc(16px,#fff);
+ @include sc(16px, #fff);
cursor: pointer;
}
diff --git a/src/components/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a1cb086 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -493,7 +493,7 @@
methods: {
// 加载页面分组信息
loadFZData(event) {
- console.log(event);
+ // console.log(event);
this.loading = true;
this.$http
.get(
@@ -624,7 +624,6 @@
this.$http
.get(this.nozzle.siteGetHeads + `?siteNo=${this.currentSiteNo}`)
.then(response => {
- // console.log(response.data.data);
// 加载表头
this.NFSNowDataTableHead = response.data.data;
// 加载实时数据
@@ -650,8 +649,6 @@
this.NFSNowDataTableData = JSON.parse(
JSON.stringify([response.data])
);
- // console.log(response.data);
- // console.log(this.NFSNowDataTableData);
// 通过state显示图标
if (response.data.state == 1) {
// 异常
@@ -741,7 +738,7 @@
this.loading3 = false;
// console.log(response.data.rows);
this.HistoryTableData = response.data.rows;
- console.log(1111111, this.HistoryTableData);
+ // console.log(1111111, this.HistoryTableData);
this.DatagridDataLength = response.data.total;
})
.catch(response => {
@@ -887,7 +884,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +896,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +909,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +926,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +941,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -1013,10 +1010,10 @@
// },
// 表单提交5
submitForm5(formName) {
- console.log(1, this.$refs[formName]);
+ // console.log(1, this.$refs[formName]);
this.$refs[formName].validate(valid => {
if (valid) {
- console.log(11111);
+ // console.log(11111);
this.$http
.post({
url: this.nozzle.surveyDataExporExcelOfSurverData,
@@ -1050,7 +1047,7 @@
// message(response);
});
} else {
- console.log("error submit!!");
+ // console.log("error submit!!");
return false;
}
});
diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index b01609f..76b9f0c 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -243,7 +243,7 @@
class="previewOfSiteStatusCentent3Li"
v-for="(item, index) in Region"
:key="index"
- style="cursor: pointer;"
+ style="cursor: pointer"
>