diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 36a1de7..84641c7 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -203,12 +208,27 @@
>
-
+
-
+
- 查询
+ 查询
@@ -288,11 +308,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"
+ }
]
},
//站点表格相关
@@ -305,17 +359,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"
+ }
]
}
},
@@ -427,7 +498,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -444,7 +515,12 @@
initCurpage: 1,
fieldList: [
{ label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
- { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+ {
+ label: "设备厂家",
+ value: "equipFactory",
+ minWidth: 150,
+ tooltip: true
+ }
]
},
//已关联设备表格相关
@@ -517,8 +593,14 @@
}
},
"deviceRelatedQuery.searchStr"(val) {
- 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
+ );
}
},
methods: {
@@ -543,24 +625,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) {
@@ -587,7 +671,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -623,20 +707,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
+ });
+ });
}
});
},
@@ -656,9 +741,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;
}
};
@@ -709,8 +794,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -740,8 +825,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;
@@ -752,43 +843,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":
@@ -896,9 +998,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/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 36a1de7..84641c7 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -203,12 +208,27 @@
>
-
+
-
+
- 查询
+ 查询
@@ -288,11 +308,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"
+ }
]
},
//站点表格相关
@@ -305,17 +359,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"
+ }
]
}
},
@@ -427,7 +498,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -444,7 +515,12 @@
initCurpage: 1,
fieldList: [
{ label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
- { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+ {
+ label: "设备厂家",
+ value: "equipFactory",
+ minWidth: 150,
+ tooltip: true
+ }
]
},
//已关联设备表格相关
@@ -517,8 +593,14 @@
}
},
"deviceRelatedQuery.searchStr"(val) {
- 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
+ );
}
},
methods: {
@@ -543,24 +625,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) {
@@ -587,7 +671,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -623,20 +707,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
+ });
+ });
}
});
},
@@ -656,9 +741,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;
}
};
@@ -709,8 +794,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -740,8 +825,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;
@@ -752,43 +843,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":
@@ -896,9 +998,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 9003c11..89044b3 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
@@ -874,4 +901,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/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 36a1de7..84641c7 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -203,12 +208,27 @@
>
-
+
-
+
- 查询
+ 查询
@@ -288,11 +308,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"
+ }
]
},
//站点表格相关
@@ -305,17 +359,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"
+ }
]
}
},
@@ -427,7 +498,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -444,7 +515,12 @@
initCurpage: 1,
fieldList: [
{ label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
- { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+ {
+ label: "设备厂家",
+ value: "equipFactory",
+ minWidth: 150,
+ tooltip: true
+ }
]
},
//已关联设备表格相关
@@ -517,8 +593,14 @@
}
},
"deviceRelatedQuery.searchStr"(val) {
- 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
+ );
}
},
methods: {
@@ -543,24 +625,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) {
@@ -587,7 +671,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -623,20 +707,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
+ });
+ });
}
});
},
@@ -656,9 +741,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;
}
};
@@ -709,8 +794,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -740,8 +825,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;
@@ -752,43 +843,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":
@@ -896,9 +998,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 9003c11..89044b3 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
@@ -874,4 +901,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/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a81dedf 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -887,7 +887,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +899,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +912,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +929,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +944,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 36a1de7..84641c7 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -203,12 +208,27 @@
>
-
+
-
+
- 查询
+ 查询
@@ -288,11 +308,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"
+ }
]
},
//站点表格相关
@@ -305,17 +359,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"
+ }
]
}
},
@@ -427,7 +498,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -444,7 +515,12 @@
initCurpage: 1,
fieldList: [
{ label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
- { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+ {
+ label: "设备厂家",
+ value: "equipFactory",
+ minWidth: 150,
+ tooltip: true
+ }
]
},
//已关联设备表格相关
@@ -517,8 +593,14 @@
}
},
"deviceRelatedQuery.searchStr"(val) {
- 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
+ );
}
},
methods: {
@@ -543,24 +625,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) {
@@ -587,7 +671,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -623,20 +707,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
+ });
+ });
}
});
},
@@ -656,9 +741,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;
}
};
@@ -709,8 +794,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -740,8 +825,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;
@@ -752,43 +843,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":
@@ -896,9 +998,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 9003c11..89044b3 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
@@ -874,4 +901,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/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a81dedf 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -887,7 +887,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +899,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +912,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +929,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +944,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
diff --git a/static/img/tpxz_icon.png b/static/img/tpxz_icon.png
new file mode 100644
index 0000000..77f2be0
--- /dev/null
+++ b/static/img/tpxz_icon.png
Binary files differ
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 36a1de7..84641c7 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -203,12 +208,27 @@
>
-
+
-
+
- 查询
+ 查询
@@ -288,11 +308,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"
+ }
]
},
//站点表格相关
@@ -305,17 +359,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"
+ }
]
}
},
@@ -427,7 +498,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -444,7 +515,12 @@
initCurpage: 1,
fieldList: [
{ label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
- { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+ {
+ label: "设备厂家",
+ value: "equipFactory",
+ minWidth: 150,
+ tooltip: true
+ }
]
},
//已关联设备表格相关
@@ -517,8 +593,14 @@
}
},
"deviceRelatedQuery.searchStr"(val) {
- 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
+ );
}
},
methods: {
@@ -543,24 +625,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) {
@@ -587,7 +671,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -623,20 +707,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
+ });
+ });
}
});
},
@@ -656,9 +741,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;
}
};
@@ -709,8 +794,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -740,8 +825,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;
@@ -752,43 +843,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":
@@ -896,9 +998,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 9003c11..89044b3 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
@@ -874,4 +901,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/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a81dedf 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -887,7 +887,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +899,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +912,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +929,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +944,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
diff --git a/static/img/tpxz_icon.png b/static/img/tpxz_icon.png
new file mode 100644
index 0000000..77f2be0
--- /dev/null
+++ b/static/img/tpxz_icon.png
Binary files differ
diff --git a/static/img/wjxz_icon.png b/static/img/wjxz_icon.png
new file mode 100644
index 0000000..0d1edd3
--- /dev/null
+++ b/static/img/wjxz_icon.png
Binary files differ
diff --git a/src/components/ConfigManager/SiteManagement.vue b/src/components/ConfigManager/SiteManagement.vue
index 36a1de7..84641c7 100644
--- a/src/components/ConfigManager/SiteManagement.vue
+++ b/src/components/ConfigManager/SiteManagement.vue
@@ -27,7 +27,12 @@
>
- 查看设备
+ 查看设备
@@ -203,12 +208,27 @@
>
-
+
-
+
- 查询
+ 查询
@@ -288,11 +308,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"
+ }
]
},
//站点表格相关
@@ -305,17 +359,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"
+ }
]
}
},
@@ -427,7 +498,7 @@
//弹窗相关
dialogInfo: {
title: {
- look: ''
+ look: ""
},
width: "60%",
visible: false,
@@ -444,7 +515,12 @@
initCurpage: 1,
fieldList: [
{ label: "设备编号", value: "equipNo", minWidth: 100, tooltip: true },
- { label: "设备厂家", value: "equipFactory", minWidth: 150, tooltip: true },
+ {
+ label: "设备厂家",
+ value: "equipFactory",
+ minWidth: 150,
+ tooltip: true
+ }
]
},
//已关联设备表格相关
@@ -517,8 +593,14 @@
}
},
"deviceRelatedQuery.searchStr"(val) {
- 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
+ );
}
},
methods: {
@@ -543,24 +625,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) {
@@ -587,7 +671,7 @@
})
.then(res => {
loadingdelet.close();
- if(res.data.code === 1) {
+ if (res.data.code === 1) {
this.siteTableInfo.refresh = Math.random();
}
this.$message({
@@ -623,20 +707,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
+ });
+ });
}
});
},
@@ -656,9 +741,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;
}
};
@@ -709,8 +794,8 @@
}
},
//点击事件
- handleClick(event, data, index){
- switch(event) {
+ handleClick(event, data, index) {
+ switch (event) {
//站点搜索
case "search":
this.siteTableInfo.initCurpage = Math.random();
@@ -740,8 +825,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;
@@ -752,43 +843,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":
@@ -896,9 +998,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 9003c11..89044b3 100644
--- a/src/components/ServiceWatch/components/monitor.vue
+++ b/src/components/ServiceWatch/components/monitor.vue
@@ -132,20 +132,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+ >
+
+
+
@@ -874,4 +901,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/newFiber/NewFiberSearch.vue b/src/components/newFiber/NewFiberSearch.vue
index 4226c58..a81dedf 100644
--- a/src/components/newFiber/NewFiberSearch.vue
+++ b/src/components/newFiber/NewFiberSearch.vue
@@ -887,7 +887,7 @@
axisPointer: {
type: "cross",
crossStyle: {
- color: "#333"
+ color: "#3398DB"
}
}
},
@@ -899,7 +899,7 @@
legend: {
data: [this.SiteYinziZn, this.SiteYinzi2Zn],
textStyle: {
- color: "#ffffff" //字体颜色
+ color: "#3398DB" //字体颜色
}
},
xAxis: [
@@ -912,12 +912,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
@@ -929,12 +929,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
},
@@ -944,12 +944,12 @@
axisLabel: {
show: true,
textStyle: {
- color: "#999" //这里用参数代替了
+ color: "#3398DB" //这里用参数代替了
}
},
axisLine: {
lineStyle: {
- color: "#333" // 颜色
+ color: "#3398DB" // 颜色
}
}
}
diff --git a/static/img/tpxz_icon.png b/static/img/tpxz_icon.png
new file mode 100644
index 0000000..77f2be0
--- /dev/null
+++ b/static/img/tpxz_icon.png
Binary files differ
diff --git a/static/img/wjxz_icon.png b/static/img/wjxz_icon.png
new file mode 100644
index 0000000..0d1edd3
--- /dev/null
+++ b/static/img/wjxz_icon.png
Binary files differ
diff --git a/static/img/zk_icon.png b/static/img/zk_icon.png
new file mode 100644
index 0000000..6cc4dbf
--- /dev/null
+++ b/static/img/zk_icon.png
Binary files differ