diff --git a/src/api/index.js b/src/api/index.js
index a2c06df9..dd6d4f1b 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -886,5 +886,8 @@ getIccid(data){
getInsectChartData(data){
return sendPostParamsRequest(`/v1/getInsectChartData`, data)
},
+ getGetDeviceRunParam(data){
+ return sendPostParamsRequest(`/v1/getGetDeviceRunParam`, data)
+ },
};
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index ad4fde75..ee617822 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -1257,7 +1257,6 @@ textarea {
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
- padding: 0 8px;
}
.input-sel-time .el-input__inner {
@@ -1265,11 +1264,12 @@ textarea {
border: 2px solid rgba(0, 186, 255, 0.4);
cursor: pointer;
position: relative;
+ color: #fff;
}
.input-sel-time .el-input__inner .el-range-input {
background: transparent;
- color: #fff;
+ color: #fff !important;
}
.input-btn {
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 2bc9bbcd..4c5a8361 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -1329,7 +1329,6 @@ textarea {
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
- padding: 0 8px;
}
.el-input__inner {
@@ -1337,10 +1336,10 @@ textarea {
border: 2px solid rgba(0, 186, 255, 0.40);
cursor: pointer;
position: relative;
-
+ color: #fff;
.el-range-input {
background: transparent;
- color: #fff;
+ color: #fff!important;
}
}
}
diff --git a/src/assets/img/img-13.jpg b/src/assets/img/img-13.jpg
new file mode 100644
index 00000000..91e41e14
Binary files /dev/null and b/src/assets/img/img-13.jpg differ
diff --git a/src/assets/js/echarts.js b/src/assets/js/echarts.js
index d38d942a..28f09a3a 100644
--- a/src/assets/js/echarts.js
+++ b/src/assets/js/echarts.js
@@ -311,6 +311,151 @@ export function thisWeekTemperature_echart(id, data) {
]
};
+ option && myChart.setOption(option);
+ window.addEventListener("resize", function () {
+ myChart.resize();
+ });
+}
+
+export function pestMonitor_num(id, data) {
+ let chartDom = document.getElementById(id);
+ let myChart = echarts.init(chartDom);
+ var myColor = [
+ "#eb2100",
+ "#eb3600",
+ "#d0570e",
+ "#d0a00e",
+ "#34da62",
+ "#00e9db",
+ "#00c0e9",
+ "#0096f3",
+ "#33CCFF",
+ "#33FFCC",
+ ];
+ var header=data.header
+ var dataList=data.data.list[0]
+ // 排序header
+ var headerNames = Object.keys(header).sort().map(key => header[key]);
+ // 排序数据
+ var objValues = Object.keys(header).sort().map(key => Number(dataList[key]) || 0);
+ const maxValue = Math.max(...objValues);
+ const maxList = new Array(objValues.length).fill(maxValue);
+ const minList = new Array(objValues.length).fill(0);
+ var option = {
+ grid: {
+ left: "11%",
+ top: "3%",
+ right: "0%",
+ bottom: "3%",
+ containLabel: true,
+ },
+ xAxis: [
+ {
+ show: false,
+ },
+ ],
+ yAxis: [
+ {
+ axisTick: "none",
+ axisLine: "none",
+ offset: "27",
+ axisLabel: {
+ textStyle: {
+ color: "#ffffff",
+ fontSize: "12",
+ },
+ },
+ data:headerNames
+ },
+ {
+ axisTick: "none",
+ axisLine: "none",
+ axisLabel: {
+ textStyle: {
+ color: "#ffffff",
+ fontSize: "12",
+ },
+ },
+ data: objValues,
+ },
+ {
+ name: "",
+ nameTextStyle: {
+ color: "#ffffff",
+ fontSize: "16",
+ },
+ axisLine: {
+ lineStyle: {
+ color: "rgba(0,0,0,0)",
+ },
+ },
+ data: [],
+ },
+ ],
+ series: [
+ {
+ name: "条",
+ type: "bar",
+ yAxisIndex: 0,
+ data: objValues,
+ // label: {
+ // normal: {
+ // show: true,
+ // position: "right",
+ // textStyle: {
+ // color: "#ffffff",
+ // fontSize: "16",
+ // },
+ // },
+ // },
+ barWidth: 6,
+ itemStyle: {
+ normal: {
+ color: function (params) {
+ var num = myColor.length;
+ return myColor[params.dataIndex % num];
+ },
+ },
+ },
+ z: 2,
+ },
+ {
+ name: "白框",
+ type: "bar",
+ yAxisIndex: 1,
+ barGap: "-100%",
+ data:maxList,
+ barWidth: 12,
+ itemStyle: {
+ normal: {
+ color: "#0e2147",
+ barBorderRadius: 5,
+ },
+ },
+ z: 1,
+ },
+
+ {
+ name: "外圆",
+ type: "scatter",
+ hoverAnimation: false,
+ data: minList,
+ yAxisIndex: 2,
+ symbolSize: 14,
+ itemStyle: {
+ normal: {
+ color: function (params) {
+ var num = myColor.length;
+ return myColor[params.dataIndex % num];
+ },
+ opacity: 1,
+ },
+ },
+ z: 2,
+ },
+ ],
+ };
+
option && myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();
diff --git a/src/components/large-nav.vue b/src/components/large-nav.vue
index a56ffe3b..f04e6e15 100644
--- a/src/components/large-nav.vue
+++ b/src/components/large-nav.vue
@@ -17,8 +17,13 @@
虫情监测
-