修改测报灯

src/assets/icon/iconfont.json

@@ -1,212 +1,170 @@
 {
-  "id": "1738837",
-  "name": "农业大数据",
+  "id": "2453932",
+  "name": "高标2.0",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
     {
-      "icon_id": "17654821",
-      "name": "录像",
-      "font_class": "luxiang",
-      "unicode": "e637",
-      "unicode_decimal": 58935
+      "icon_id": "19135742",
+      "name": "inbox-1",
+      "font_class": "inbox-1",
+      "unicode": "e752",
+      "unicode_decimal": 59218
     },
     {
-      "icon_id": "774444",
-      "name": "扳手",
-      "font_class": "banshou",
-      "unicode": "e65c",
-      "unicode_decimal": 58972
+      "icon_id": "19135794",
+      "name": "pin-2",
+      "font_class": "pin-2",
+      "unicode": "e75a",
+      "unicode_decimal": 59226
     },
     {
-      "icon_id": "7335485",
-      "name": "地块",
-      "font_class": "chandi",
-      "unicode": "eb24",
-      "unicode_decimal": 60196
+      "icon_id": "19135903",
+      "name": "yen-2",
+      "font_class": "yen-2",
+      "unicode": "e772",
+      "unicode_decimal": 59250
     },
     {
-      "icon_id": "7335489",
-      "name": "基础",
-      "font_class": "jichu",
-      "unicode": "eb25",
-      "unicode_decimal": 60197
+      "icon_id": "19135904",
+      "name": "wallet",
+      "font_class": "1",
+      "unicode": "e773",
+      "unicode_decimal": 59251
     },
     {
-      "icon_id": "7335622",
-      "name": "迟到",
-      "font_class": "chidao",
-      "unicode": "eb44",
-      "unicode_decimal": 60228
+      "icon_id": "19250008",
+      "name": "退出",
+      "font_class": "exit",
+      "unicode": "e624",
+      "unicode_decimal": 58916
     },
     {
-      "icon_id": "1391282",
-      "name": "日历",
-      "font_class": "rili",
-      "unicode": "e609",
-      "unicode_decimal": 58889
+      "icon_id": "2512619",
+      "name": "BAI-屋子",
+      "font_class": "BAI-wuzi",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
     },
     {
-      "icon_id": "5204808",
-      "name": "分类",
-      "font_class": "fenlei",
-      "unicode": "e616",
-      "unicode_decimal": 58902
+      "icon_id": "5387843",
+      "name": "主题_调色盘_o",
+      "font_class": "zhuti_tiaosepan_o",
+      "unicode": "eb6e",
+      "unicode_decimal": 60270
     },
     {
-      "icon_id": "2678622",
-      "name": "全屏",
-      "font_class": "quanping",
-      "unicode": "e656",
-      "unicode_decimal": 58966
+      "icon_id": "12685010",
+      "name": "铃",
+      "font_class": "icon_huabanfuben",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
     },
     {
-      "icon_id": "772252",
-      "name": "扫描 识别 380%",
-      "font_class": "saomiaoshibie380",
-      "unicode": "e686",
-      "unicode_decimal": 59014
+      "icon_id": "4641118",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e625",
+      "unicode_decimal": 58917
     },
     {
-      "icon_id": "11893490",
-      "name": "添加",
-      "font_class": "tianjia",
-      "unicode": "e615",
-      "unicode_decimal": 58901
+      "icon_id": "9783463",
+      "name": "文档",
+      "font_class": "wendang",
+      "unicode": "e613",
+      "unicode_decimal": 58899
     },
     {
-      "icon_id": "16364328",
-      "name": "统计",
-      "font_class": "tongji",
-      "unicode": "e636",
-      "unicode_decimal": 58934
+      "icon_id": "813727",
+      "name": "充值",
+      "font_class": "chongzhi",
+      "unicode": "e633",
+      "unicode_decimal": 58931
     },
     {
-      "icon_id": "17709313",
-      "name": "未命名 -34",
-      "font_class": "weimingming-34",
-      "unicode": "e60b",
-      "unicode_decimal": 58891
+      "icon_id": "1761485",
+      "name": "禁用",
+      "font_class": "jinyong",
+      "unicode": "e641",
+      "unicode_decimal": 58945
     },
     {
-      "icon_id": "5327411",
-      "name": "臭虫bug",
-      "font_class": "chouchongbug",
-      "unicode": "e6e1",
-      "unicode_decimal": 59105
+      "icon_id": "11391516",
+      "name": "密码",
+      "font_class": "mima",
+      "unicode": "e638",
+      "unicode_decimal": 58936
     },
     {
-      "icon_id": "802969",
-      "name": "楼房",
-      "font_class": "loufang",
-      "unicode": "e64f",
-      "unicode_decimal": 58959
+      "icon_id": "354570",
+      "name": "编辑",
+      "font_class": "iconfontedit",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
     },
     {
-      "icon_id": "4348068",
+      "icon_id": "715831",
       "name": "电脑",
-      "font_class": "diannao1",
-      "unicode": "e623",
-      "unicode_decimal": 58915
-    },
-    {
-      "icon_id": "8835594",
-      "name": "图片",
-      "font_class": "tupian-xianxing",
-      "unicode": "e635",
-      "unicode_decimal": 58933
-    },
-    {
-      "icon_id": "10392628",
-      "name": "详情-",
-      "font_class": "xiangqing-",
-      "unicode": "e608",
-      "unicode_decimal": 58888
+      "font_class": "diannao",
+      "unicode": "e605",
+      "unicode_decimal": 58885
     },
     {
-      "icon_id": "36107",
-      "name": "面积",
-      "font_class": "mianji",
-      "unicode": "e602",
-      "unicode_decimal": 58882
+      "icon_id": "4186778",
+      "name": "标签",
+      "font_class": "biaoqian",
+      "unicode": "e634",
+      "unicode_decimal": 58932
     },
     {
-      "icon_id": "883904",
-      "name": "电话 (2)",
-      "font_class": "dianhua2",
-      "unicode": "e611",
-      "unicode_decimal": 58897
+      "icon_id": "6682541",
+      "name": "地址",
+      "font_class": "dizhi",
+      "unicode": "e606",
+      "unicode_decimal": 58886
     },
     {
-      "icon_id": "1183130",
-      "name": "定位",
-      "font_class": "dingwei",
-      "unicode": "e675",
-      "unicode_decimal": 58997
+      "icon_id": "7404314",
+      "name": "时间",
+      "font_class": "shijian",
+      "unicode": "e77c",
+      "unicode_decimal": 59260
     },
     {
-      "icon_id": "6129144",
-      "name": "102绑定",
-      "font_class": "bangding",
-      "unicode": "e784",
-      "unicode_decimal": 59268
+      "icon_id": "8094230",
+      "name": "页面操作",
+      "font_class": "yemiancaozuo",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
     },
     {
-      "icon_id": "6970030",
+      "icon_id": "10995780",
       "name": "用户",
-      "font_class": "yonghu11",
-      "unicode": "e705",
-      "unicode_decimal": 59141
-    },
-    {
-      "icon_id": "1106935",
-      "name": "雨",
-      "font_class": "yu",
-      "unicode": "e63a",
-      "unicode_decimal": 58938
-    },
-    {
-      "icon_id": "2155826",
-      "name": "温度",
-      "font_class": "thermometer_icon",
-      "unicode": "e67a",
-      "unicode_decimal": 59002
-    },
-    {
-      "icon_id": "4236632",
-      "name": "湿度",
-      "font_class": "shidu",
-      "unicode": "e60a",
-      "unicode_decimal": 58890
-    },
-    {
-      "icon_id": "7983631",
-      "name": "摄像头",
-      "font_class": "xingzhuang",
-      "unicode": "e614",
-      "unicode_decimal": 58900
+      "font_class": "yonghu",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
     },
     {
-      "icon_id": "13638685",
-      "name": "电",
-      "font_class": "dian",
-      "unicode": "e655",
-      "unicode_decimal": 58965
+      "icon_id": "1135940",
+      "name": "用户",
+      "font_class": "yonghu1",
+      "unicode": "e612",
+      "unicode_decimal": 58898
     },
     {
-      "icon_id": "13638743",
-      "name": "温度",
-      "font_class": "wendu",
-      "unicode": "e660",
-      "unicode_decimal": 58976
+      "icon_id": "7501066",
+      "name": "密码",
+      "font_class": "mima1",
+      "unicode": "e620",
+      "unicode_decimal": 58912
     },
     {
-      "icon_id": "14095260",
-      "name": "定时",
-      "font_class": "dingshi",
-      "unicode": "e77e",
-      "unicode_decimal": 59262
+      "icon_id": "992522",
+      "name": "信息",
+      "font_class": "xinxi1",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
     },
     {
       "icon_id": "397065",
@@ -307,130 +265,291 @@
       "unicode_decimal": 58921
     },
     {
-      "icon_id": "992522",
-      "name": "信息",
-      "font_class": "xinxi1",
-      "unicode": "e64b",
-      "unicode_decimal": 58955
+      "icon_id": "1106935",
+      "name": "雨",
+      "font_class": "yu",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
     },
     {
-      "icon_id": "1135940",
-      "name": "用户",
-      "font_class": "yonghu1",
-      "unicode": "e612",
-      "unicode_decimal": 58898
+      "icon_id": "2155826",
+      "name": "温度",
+      "font_class": "thermometer_icon",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
     },
     {
-      "icon_id": "7501066",
-      "name": "密码",
-      "font_class": "mima1",
-      "unicode": "e620",
-      "unicode_decimal": 58912
+      "icon_id": "4236632",
+      "name": "湿度",
+      "font_class": "shidu",
+      "unicode": "e60a",
+      "unicode_decimal": 58890
     },
     {
-      "icon_id": "715831",
-      "name": "电脑",
-      "font_class": "diannao",
-      "unicode": "e605",
-      "unicode_decimal": 58885
+      "icon_id": "7983631",
+      "name": "摄像头",
+      "font_class": "xingzhuang",
+      "unicode": "e614",
+      "unicode_decimal": 58900
     },
     {
-      "icon_id": "4186778",
-      "name": "标签",
-      "font_class": "biaoqian",
-      "unicode": "e634",
-      "unicode_decimal": 58932
+      "icon_id": "13638685",
+      "name": "电",
+      "font_class": "dian",
+      "unicode": "e655",
+      "unicode_decimal": 58965
     },
     {
-      "icon_id": "6682541",
-      "name": "地址",
-      "font_class": "dizhi",
-      "unicode": "e606",
-      "unicode_decimal": 58886
+      "icon_id": "13638743",
+      "name": "温度",
+      "font_class": "wendu",
+      "unicode": "e660",
+      "unicode_decimal": 58976
     },
     {
-      "icon_id": "7404314",
-      "name": "时间",
-      "font_class": "shijian",
-      "unicode": "e77c",
-      "unicode_decimal": 59260
+      "icon_id": "14095260",
+      "name": "定时",
+      "font_class": "dingshi",
+      "unicode": "e77e",
+      "unicode_decimal": 59262
     },
     {
-      "icon_id": "8094230",
-      "name": "页面操作",
-      "font_class": "yemiancaozuo",
-      "unicode": "e64e",
-      "unicode_decimal": 58958
+      "icon_id": "36107",
+      "name": "面积",
+      "font_class": "mianji",
+      "unicode": "e602",
+      "unicode_decimal": 58882
     },
     {
-      "icon_id": "10995780",
+      "icon_id": "883904",
+      "name": "电话 (2)",
+      "font_class": "dianhua2",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
+    {
+      "icon_id": "1183130",
+      "name": "定位",
+      "font_class": "dingwei",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "6129144",
+      "name": "102绑定",
+      "font_class": "bangding",
+      "unicode": "e784",
+      "unicode_decimal": 59268
+    },
+    {
+      "icon_id": "6970030",
       "name": "用户",
-      "font_class": "yonghu",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
+      "font_class": "yonghu11",
+      "unicode": "e705",
+      "unicode_decimal": 59141
     },
     {
-      "icon_id": "354570",
-      "name": "编辑",
-      "font_class": "iconfontedit",
-      "unicode": "e61f",
-      "unicode_decimal": 58911
+      "icon_id": "10392628",
+      "name": "详情-",
+      "font_class": "xiangqing-",
+      "unicode": "e608",
+      "unicode_decimal": 58888
     },
     {
-      "icon_id": "813727",
-      "name": "充值",
-      "font_class": "chongzhi",
-      "unicode": "e633",
-      "unicode_decimal": 58931
+      "icon_id": "802969",
+      "name": "楼房",
+      "font_class": "loufang",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
     },
     {
-      "icon_id": "1761485",
-      "name": "禁用",
-      "font_class": "jinyong",
-      "unicode": "e641",
-      "unicode_decimal": 58945
+      "icon_id": "4348068",
+      "name": "电脑",
+      "font_class": "diannao1",
+      "unicode": "e623",
+      "unicode_decimal": 58915
     },
     {
-      "icon_id": "11391516",
-      "name": "密码",
-      "font_class": "mima",
-      "unicode": "e638",
-      "unicode_decimal": 58936
+      "icon_id": "8835594",
+      "name": "图片",
+      "font_class": "tupian-xianxing",
+      "unicode": "e635",
+      "unicode_decimal": 58933
     },
     {
-      "icon_id": "9783463",
-      "name": "文档",
-      "font_class": "wendang",
-      "unicode": "e613",
-      "unicode_decimal": 58899
+      "icon_id": "5327411",
+      "name": "臭虫bug",
+      "font_class": "chouchongbug",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
     },
     {
-      "icon_id": "4641118",
-      "name": "删除",
-      "font_class": "shanchu",
-      "unicode": "e625",
-      "unicode_decimal": 58917
+      "icon_id": "17709313",
+      "name": "未命名 -34",
+      "font_class": "weimingming-34",
+      "unicode": "e60b",
+      "unicode_decimal": 58891
     },
     {
-      "icon_id": "12685010",
-      "name": "铃",
-      "font_class": "icon_huabanfuben",
-      "unicode": "e62b",
-      "unicode_decimal": 58923
+      "icon_id": "772252",
+      "name": "扫描 识别 380%",
+      "font_class": "saomiaoshibie380",
+      "unicode": "e686",
+      "unicode_decimal": 59014
     },
     {
-      "icon_id": "2512619",
-      "name": "BAI-屋子",
-      "font_class": "BAI-wuzi",
-      "unicode": "e69c",
-      "unicode_decimal": 59036
+      "icon_id": "11893490",
+      "name": "添加",
+      "font_class": "tianjia",
+      "unicode": "e615",
+      "unicode_decimal": 58901
     },
     {
-      "icon_id": "5387843",
-      "name": "主题_调色盘_o",
-      "font_class": "zhuti_tiaosepan_o",
-      "unicode": "eb6e",
-      "unicode_decimal": 60270
+      "icon_id": "16364328",
+      "name": "统计",
+      "font_class": "tongji",
+      "unicode": "e636",
+      "unicode_decimal": 58934
+    },
+    {
+      "icon_id": "2678622",
+      "name": "全屏",
+      "font_class": "quanping",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "5204808",
+      "name": "分类",
+      "font_class": "fenlei",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "1391282",
+      "name": "日历",
+      "font_class": "rili",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "7335485",
+      "name": "地块",
+      "font_class": "chandi",
+      "unicode": "eb24",
+      "unicode_decimal": 60196
+    },
+    {
+      "icon_id": "7335489",
+      "name": "基础",
+      "font_class": "jichu",
+      "unicode": "eb25",
+      "unicode_decimal": 60197
+    },
+    {
+      "icon_id": "7335622",
+      "name": "迟到",
+      "font_class": "chidao",
+      "unicode": "eb44",
+      "unicode_decimal": 60228
+    },
+    {
+      "icon_id": "774444",
+      "name": "扳手",
+      "font_class": "banshou",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "17654821",
+      "name": "录像",
+      "font_class": "luxiang",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "19798140",
+      "name": "建立时间",
+      "font_class": "jianlishijian",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "19798145",
+      "name": "基地面积",
+      "font_class": "jidimianji",
+      "unicode": "e617",
+      "unicode_decimal": 58903
+    },
+    {
+      "icon_id": "19798147",
+      "name": "基地管理",
+      "font_class": "jidiguanli",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "19799572",
+      "name": "定位",
+      "font_class": "dingwei1",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
+      "icon_id": "20081037",
+      "name": "图标任务",
+      "font_class": "tubiaorenwu",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
+      "icon_id": "20082258",
+      "name": "照片查看",
+      "font_class": "zhaopianchakan",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
+    {
+      "icon_id": "20082758",
+      "name": "可视化大屏",
+      "font_class": "keshihuadaping",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "20082759",
+      "name": "退出关闭",
+      "font_class": "tuichuguanbi",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "13173807",
+      "name": "识别",
+      "font_class": "shibie",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "15726936",
+      "name": "统计",
+      "font_class": "tongji1",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "9241144",
+      "name": "手写签批",
+      "font_class": "iconzhengli_shouxieqianpi",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "5064096",
+      "name": "统计",
+      "font_class": "tongji2",
+      "unicode": "e646",
+      "unicode_decimal": 58950
     }
   ]
 }

src/components/index.vue

@@ -5,10 +5,13 @@
       <div class="headMenu">
         <!-- logo -->
         <div class="logoinfo">
-          <img :src="$imghost + logoIcon" width="40" alt v-if="loginInfo.role_logo" />
-          <img :src="loginInfo.role_logo" v-else />
-          <!-- <span>{{ loginInfo.role_header || "河南省高标准农田管理系统" }}</span> -->
-          <span>河南省高标准农田管理系统</span>
+          <div>
+            <img :src="$imghost + logoIcon" width="40" alt v-if="loginInfo.role_logo" />
+            <img :src="loginInfo.role_logo" v-else />
+            <!-- <span>{{ loginInfo.role_header || "河南省高标准农田管理系统" }}</span> -->
+            <span>河南省高标准农田管理系统</span>
+          </div>
+          
         </div>
         <!-- 菜单 -->
         <ul class="topMenu">
@@ -48,7 +51,7 @@
           </li> -->
         </ul>
         <div class="userInfo">
-          欢迎您！ {{username}}　
+          欢迎您！{{username}}　
           <!-- <el-dropdown >
             <span class="el-dropdown-link">
               {{username}}
@@ -59,8 +62,8 @@
               <el-dropdown-item>修改密码</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown> -->
-          <div class="exit">
-            <i class="el-icon-edit"></i>
+          <div class="exit" @click="outSys()">
+            <i class="iconfont icon-exit"></i>
           </div>
           <!-- <div> -->
           <!-- <button></button> -->
@@ -78,7 +81,7 @@
             :class="{'active':item.name==currLeftMenuId}"
             @click="leftMenuClick(item,index)"
           >
-            <img v-if="item.id" :src="iconimgs[item.id]" alt />
+            <i :class="['iconfont', iconimgs[item.id]]"></i>
             <div>{{item.name}}</div>
           </li>
         </ul>
@@ -218,25 +221,28 @@ export default {
       currTopMenuId: '数据监测',
       currLeftMenuId: '设备列表',
       iconimgs: {
-        "1": require("@/assets/images/home/home02/scd.png"),
-        "2": require("@/assets/images/home/home02/scd.png"),
-        "3": require("@/assets/images/home/home02/scd.png"),
-        "4": require("@/assets/images/home/home02/scd.png"),
-        "5": require("@/assets/images/home/home02/scd.png"),
-        "6": require("@/assets/images/home/home02/scd.png"),
-        "7": require("@/assets/images/home/home02/scd.png"),
-        "8": require("@/assets/images/home/home02/scd.png"),
-        "9": require("@/assets/images/home/home02/scd.png"),
-        "10": require("@/assets/images/home/home02/scd.png"),
-        "11": require("@/assets/images/home/home02/scd.png"),
-        "12": require("@/assets/images/home/home02/scd.png"),
-        "13": require("@/assets/images/home/home02/scd.png"),
-        "14": require("@/assets/images/home/home02/scd.png"),
-        "15": require("@/assets/images/home/home02/scd.png"),
-        "16": require("@/assets/images/home/home02/scd.png"),
-        "17": require("@/assets/images/home/home02/scd.png"),
-        "18": require("@/assets/images/home/home02/scd.png"),
-        "19": require("@/assets/images/home/home02/scd.png"),
+        "1": '',
+        "2": 'icon-inbox-1',
+        "3": 'icon-inbox-1',
+        "4": 'icon-inbox-1',
+        "5": 'icon-inbox-1',
+        "6": 'icon-inbox-1',
+        "7": 'icon-inbox-1',
+        "8": 'icon-inbox-1',
+        "9": 'icon-inbox-1',
+        "10": 'icon-inbox-1',
+        "11": 'icon-inbox-1',
+        "12": 'icon-inbox-1',
+        "13": 'icon-inbox-1',
+        "14": 'icon-inbox-1',
+        "15": 'icon-inbox-1',
+        "16": 'icon-inbox-1',
+        "17": 'icon-inbox-1',
+        "18": 'icon-inbox-1',
+        "19": 'icon-inbox-1',
+        "20": 'icon-pin-2',
+        "21": 'icon-1',
+        "22": 'icon-chongzhi',
       },
       //动态标签
       // menuTabs:[{ "path": "/plantGuard/page1", "name": "设备列表", "par": "数据监测", "order": 0 } ],
@@ -519,16 +525,20 @@ export default {
         }
       });
     },
-    beforeunloadHandler (e) {
-      //  alert(1)
-       console.log(e);
-       
-      // e = e || window.event
-      // if (e) {
-      //   e.returnValue = '关闭提示'
-      // }
-      // return '关闭提示'
-    }
+    outSys() {
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=user.login.logout_user",
+      }).then((res) => {
+        if (res.data.message == "") {
+          window.localStorage.removeItem("isLogin");
+          window.localStorage.removeItem("session");
+          window.sessionStorage.removeItem("menuTabs");
+          window.sessionStorage.removeItem("menuTabsValue");
+          this.$router.push("/login");
+        }
+      });
+    },
 
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -573,6 +583,12 @@ export default {
     justify-content: space-between;
     align-items: center;
     .logoinfo {
+      >div{
+        // min-width: 200px;
+        // overflow: hidden;
+        // white-space: nowrap;
+        // text-overflow: ellipsis;
+      }
       img {
         vertical-align: top;
       }
@@ -661,6 +677,12 @@ export default {
         border-left: 1px solid #727272;
         padding-left: 15px;
         cursor: pointer;
+        i{
+          font-size: 20px;
+        }
+        i:hover{
+          color: #0195ff;
+        }
       }
     }
   }
@@ -675,6 +697,9 @@ export default {
       padding: 10px 0;
       cursor: pointer;
       line-height: 22px;
+      i{
+        font-size: 26px;
+      }
     }
     li:hover {
       background: #000;

src/pages/plantGuard/cbdPhoto/cbdPhoto.vue

@@ -190,7 +190,7 @@
       <!-- 识别结果弹框 -->
     <transition
         enter-active-class="animate__animated animate__zoomIn" 
-        leave-active-class="animate__animated animate__rotateOut"
+        leave-active-class="animate__animated  animate__zoomOut"
     >
       <dialog-box v-if="discernShow" width='1000'>
           <template v-slot:header>

src/pages/plantGuard/cbdTabPestStat.vue

@@ -202,9 +202,15 @@ export default {
     this.getPests();
   },
   mounted() {
-    // this.switchChu() //switch轮播
     this.refreshData(); //设置hightcharts配置
-    // console.log(this.$route.name)
+    // 判断是自动统计还是手动统计
+    if (this.viewSwitch == true) {
+      //自动统计
+      this.getPestAllData();
+    } else if (this.viewSwitch == false) {
+      //手动统计
+      this.manualStatistics(); //手动统计折线图请求
+    }
   },
   methods: {
     // 设置hightcharts配置
@@ -244,7 +250,7 @@ export default {
       });
     },
     // 获取折线和饼状图和数据列表
-    getPestAllData(list) {
+     getPestAllData(list) {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=forecast.worm_lamp.pest_statistics",
@@ -296,7 +302,6 @@ export default {
             this.options = {
               chart: {
                 zoomType: "x",
-                // zoomType: 'y'
               },
               title: {
                 text: "害虫变化趋势",
@@ -340,14 +345,17 @@ export default {
               },
               series: [
                 {
+                  type: 'column',
                   name: ChartData[0].name,
                   data: ChartData[0].dat,
                 },
                 {
+                  type: 'column',
                   name: ChartData[1].name,
                   data: ChartData[1].dat,
                 },
                 {
+                  type: 'spline',
                   name: ChartData[2].name,
                   data: ChartData[2].dat,
                 },
@@ -384,6 +392,25 @@ export default {
             this.viewSwitch2 = "";
             this.gainInsect([]); //获取下拉框害虫种类
           }
+          // 饼状和列表
+          if (list != 1) {
+            var percentage = res.data.data.percentage;
+            if (percentage.length > 0) {
+              var arr = [];
+              for (let i in percentage) {
+                let o = {
+                  value: percentage[i].name_num,
+                  label: percentage[i].name_num,
+                };
+                arr.push(o);
+              }
+              this.gainInsect(arr); //获取下拉框害虫种类
+
+            } else {
+              this.options2 = {};
+            }
+            
+          }
         }
       });
     },

src/pages/plantGuard/page1.vue

@@ -128,9 +128,9 @@
                     :label="pages.label"
                     :name="pages.name"
                   > 
-                    <keep-alive>
+                    <!-- <keep-alive> -->
                       <components :is="pages.name" :equipId="queryInfo.equip_id" :d_id="queryInfo.d_id" :equipType='detailsShow' v-if="pages.name == nowPage && hackReset"></components>
-                    </keep-alive>
+                    <!-- </keep-alive> -->
                   </el-tab-pane>
                 </el-tabs>
               </template>
@@ -164,9 +164,9 @@
                     :label="pages.label"
                     :name="pages.name"
                   > 
-                    <keep-alive>
+                    <!-- <keep-alive> -->
                       <components :is="pages.name" :equipId="queryInfo.equip_id" :d_id="queryInfo.d_id" :equipType='detailsShow' v-if="pages.name == nowPage && hackReset"></components>
-                    </keep-alive>
+                    <!-- </keep-alive> -->
                   </el-tab-pane>
                 </el-tabs>
               </template>
@@ -200,9 +200,9 @@
                     :label="pages.label"
                     :name="pages.name"
                   > 
-                    <keep-alive>
+                    <!-- <keep-alive> -->
                       <components :is="pages.name" :equipId="queryInfo.equip_id" :d_id="queryInfo.d_id" :equipType='detailsShow' v-if="pages.name == nowPage && hackReset"></components>
-                    </keep-alive>
+                    <!-- </keep-alive> -->
                   </el-tab-pane>
                 </el-tabs>
               </template>
@@ -216,55 +216,41 @@
         leave-active-class="animate__animated animate__zoomOut"
     >
       <div v-if="detailsShow==6" class="jkDialog">
+        <div class="jkTitle">
+          <div>监控</div>
+          <div @click="jkClose()"><i class="el-icon-close"></i></div>
+        </div>
         <div id="videoCon"></div>
         <div class="direc">
           <div
-            @mousedown="configCamera(id, 'move', 0)"
-            @mouseup="stopConfigCamera(id)"
+            @mousedown="configCamera('move', 0)"
+            @mouseup="stopConfigCamera()"
             class="upCtr"
           >
             <img src="../../../static/images/jkctrl1.png" alt="">
           </div>
           <div
-            @mousedown="configCamera(id, 'move', 1)"
-            @mouseup="stopConfigCamera(id)"
+            @mousedown="configCamera('move', 1)"
+            @mouseup="stopConfigCamera()"
             class="downCtr"
           >
             <img src="../../../static/images/jkctrl2.png" alt="">
           </div>
           <div
-            @mousedown="configCamera(id, 'move', 2)"
-            @mouseup="stopConfigCamera(id)"
+            @mousedown="configCamera('move', 2)"
+            @mouseup="stopConfigCamera()"
             class="leftCtr"
           >
             <img src="../../../static/images/jkctrl3.png" alt="">
           </div>
           <div
-            @mousedown="configCamera(id, 'move', 3)"
-            @mouseup="stopConfigCamera(id)"
+            @mousedown="configCamera('move', 3)"
+            @mouseup="stopConfigCamera()"
             class="rightCtr"
           >
             <img src="../../../static/images/jkctrl4.png" alt="">
           </div>
         </div>
-        <div>
-            <div>
-              <img src="../../../static/images/icon1.png" alt="">
-            </div>
-            <div>
-              <img src="../../../static/images/icon1.png" alt="">
-            </div>
-            <div>
-              <img src="../../../static/images/icon1.png" alt="">
-            </div>
-            <div>
-              <img src="../../../static/images/icon1.png" alt="">
-            </div>
-            <el-button type="blueInfo" size="small" @click="jkClose2()" >
-              <img src="../../../static/images/icon1.png" alt="">
-            </el-button>
-            <el-button type="blueInfo" size="small" @click="jkClose()" >刷新</el-button>
-        </div>
       </div>
     </transition>
     <!-- 孢子仪数据框 -->
@@ -293,9 +279,9 @@
                     :label="pages.label"
                     :name="pages.name"
                   > 
-                    <keep-alive>
+                    <!-- <keep-alive> -->
                       <components :is="pages.name" :equipId="queryInfo.equip_id" :d_id="queryInfo.d_id" :equipType='detailsShow' v-if="pages.name == nowPage && hackReset"></components>
-                    </keep-alive>
+                    <!-- </keep-alive> -->
                   </el-tab-pane>
                 </el-tabs>
               </template>
@@ -599,20 +585,20 @@ export default {
   computed: {},
   //监控data中的数据变化
   watch: {
-    detailsShow(val){
-      if(val != 0){
-        this.activeName = this.pages[val][0].name
-        this.nowPage = this.pages[val][0].name
-      }else{
-        if(val== 5){
-          this.activeName = 'qxzEquipState'
-          this.nowPage = 'qxzEquipState'
-        }else{
-          this.activeName = 'equipState'
-          this.nowPage = 'equipState'
-        }
-      }
-    }
+    // detailsShow(val){
+    //   if(val != 0){
+    //     this.activeName = this.pages[val][0].name
+    //     this.nowPage = this.pages[val][0].name
+    //   }else{
+    //     if(val== 5){
+    //       this.activeName = 'qxzEquipState'
+    //       this.nowPage = 'qxzEquipState'
+    //     }else{
+    //       this.activeName = 'equipState'
+    //       this.nowPage = 'equipState'
+    //     }
+    //   }
+    // }
   },
   //方法集合
   methods: {
@@ -812,7 +798,32 @@ export default {
       this.queryInfo.model = item.device_model
       this.equipListActive = item.index
       this.sidebarComponents = "" //siderbar为空
+
+      if(this.detailsShow== 5){
+        this.activeName = 'qxzEquipState'
+        this.nowPage = 'qxzEquipState'
+      }else{
+        this.activeName = 'equipState'
+        this.nowPage = 'equipState'
+      }
+      // if(this.detailsShow != 0){
+      //   this.activeName = this.pages[this.detailsShow][0].name
+      //   this.nowPage = this.pages[this.detailsShow][0].name
+      // }else{
+      //   if(this.detailsShow== 5){
+      //     this.activeName = 'qxzEquipState'
+      //     this.nowPage = 'qxzEquipState'
+      //   }else{
+      //     this.activeName = 'equipState'
+      //     this.nowPage = 'equipState'
+      //   }
+      // }
+
       if (item.device_type_id == 6) {
+        if(this.player){
+          this.player.stop()
+          this.player = ''
+        }
         //监控
         this.$axios({
           url: "/api/api_gateway?method=camera.camera_manage.addr_camera",
@@ -832,7 +843,6 @@ export default {
             setTimeout(() => {
               console.log(document.getElementById("myPlayer"));
               this.player = new EZUIPlayer("myPlayer");
-              console.log(player);
               this.player.play();
               // let player = videojs('myPlayer')
               // player.src({ src: hlsHd, type: 'application/x-mpegURL' })
@@ -843,58 +853,52 @@ export default {
       }
     },
     //关闭方向
-    stopConfigCamera(id) {
-      if (id != "") {
+    stopConfigCamera() {
+      this.$axios({
+        method: "POST",
+        url: "/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+        data: this.qs.stringify({
+          device_id: this.queryInfo.equip_id,
+          ctrl: "stop",
+        }),
+      });
+    },
+    //上下左右和拍照
+    configCamera(ctrl, movenum) {
+      if (ctrl == "takephoto") {
         this.$axios({
           method: "POST",
-          url: "/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+          url: "/api/api_gateway?method=camera.camera_manage.camera_takephoto",
           data: this.qs.stringify({
-            device_id: id,
-            ctrl: "stop",
+            device_id: this.queryInfo.equip_id,
+            ctrl: ctrl,
           }),
+        }).then((res) => {
+          if (res.data.code == 200) {
+            let data = res.data.data;
+            this.picUrl = data.picUrl;
+            this.takePhotoDialogVisible = true;
+          } else {
+            this.$message.error("设备网络异常!");
+          }
         });
-      }
-    },
-    //上下左右和拍照
-    configCamera(id, ctrl, movenum) {
-      if (id != "") {
-        if (ctrl == "takephoto") {
-          this.$axios({
-            method: "POST",
-            url: "/api/api_gateway?method=camera.camera_manage.camera_takephoto",
-            data: this.qs.stringify({
-              device_id: id,
-              ctrl: ctrl,
-            }),
-          }).then((res) => {
-            if (res.data.code == 200) {
-              let data = res.data.data;
-              this.picUrl = data.picUrl;
-              this.takePhotoDialogVisible = true;
-            } else {
-              this.$message.error("设备网络异常!");
-            }
-          });
-        } else {
-          //上下左右、放大、缩小
-          this.$axios({
-            method: "POST",
-            url: "/api/api_gateway?method=camera.camera_manage.ctrl_camera",
-            data: this.qs.stringify({
-              device_id: id,
-              ctrl: ctrl,
-              movenum: movenum,
-            }),
-          }).then((res) => {
-            if (res.data == 1) {
-              this.$message.success("操作成功");
-            } else {
-              this.$message.error("操作失败");
-            }
-          });
-        }
       } else {
-        this.$message.error("请选中监控");
+        //上下左右、放大、缩小
+        this.$axios({
+          method: "POST",
+          url: "/api/api_gateway?method=camera.camera_manage.ctrl_camera",
+          data: this.qs.stringify({
+            device_id: this.queryInfo.equip_id,
+            ctrl: ctrl,
+            movenum: movenum,
+          }),
+        }).then((res) => {
+          if (res.data) {
+            this.$message.success("操作成功");
+          } else {
+            this.$message.error("操作失败");
+          }
+        });
       }
     },
     jkClose(){
@@ -1129,5 +1133,22 @@ export default {
     }
   }
 }
-
+.jkTitle{
+  display: flex;
+  line-height: 36px;
+  color: #0096ff;
+  justify-content: space-between;
+  padding: 0 10px;
+  i{
+    cursor: pointer;
+  }
+}
+.direc{
+  display: flex;
+  justify-content: flex-end;
+  >div{
+    margin: 0 10px;
+    cursor: pointer;
+  }
+}
 </style>

src/pages/plantGuard/page2.vue

@@ -5,7 +5,7 @@
     <transition
         name="fade"
         enter-active-class="animate__animated animate__zoomIn" 
-        leave-active-class="animate__animated animate__rotateOut"
+        leave-active-class="animate__animated  animate__zoomOut"
     >
     <dialog-box v-if="flag" width='600px'>
         <template v-slot:header>

src/pages/plantGuard/page8.vue

@@ -496,10 +496,10 @@ export default {
     //点击“添加定位”按钮
     addPosition(device_id, lng, lat) {
       this.device_id = device_id;
-      this.point = [lng, lat ];
-      this.center = [lng, lat ];
-      this.locationForm.lng = lng
-      this.locationForm.lat = lat
+      this.locationForm.lng = lng || 0
+      this.locationForm.lat = lat || 0
+      this.point = [this.locationForm.lng, this.locationForm.lat ];
+      this.center = [this.locationForm.lng, this.locationForm.lat ];
       this.addLocationDialogVisible = true;
     },
     // 故障上报

src/pages/plantGuard/page9.vue

@@ -1,4 +1,4 @@
-<!--  -->
+<!-- 水井信息 -->
 <template>
   <div class="inner">
     <div class="mapCover">