Explorar o código

fix:修改字体图标

yf_elsa.cui hai 2 meses
pai
achega
1a70b4961d

+ 4 - 0
src/assets/css/global.css

@@ -392,3 +392,7 @@ ul {
 .custom-ffffff .el-aside {
   background: #fff !important;
 }
+.hoverpopover {
+  min-width: fit-content !important;
+  padding: 8px 12px !important;
+}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 26 - 3
src/assets/icon/demo_index.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 7 - 3
src/assets/icon/iconfont.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
src/assets/icon/iconfont.js


+ 7 - 0
src/assets/icon/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "4942642",
+      "name": "更多",
+      "font_class": "gengduo",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
       "icon_id": "45138879",
       "name": "不显示",
       "font_class": "buxianshi",

BIN=BIN
src/assets/icon/iconfont.ttf


BIN=BIN
src/assets/icon/iconfont.woff


BIN=BIN
src/assets/icon/iconfont.woff2


+ 118 - 116
src/pages/monitor-dgp/monitorSystem/Monitor.vue

@@ -30,7 +30,7 @@
                 a1: divNum == 1,
                 a4: divNum == 4,
                 a9: divNum == 9,
-                selected: count == selected,
+                selected: count == selected
               }"
               v-for="count in divNum"
               :key="divNum + count"
@@ -139,7 +139,7 @@
             </el-pagination>
           </div>
         </div>
-        <div class="view-box">
+        <div class="view-box" v-show="false">
           <div class="camera-control">
             <span class="zoom-in el-icon-minus"></span>
             <div class="control-ring">
@@ -700,11 +700,11 @@ export default {
         time: '',
         start: '',
         end: '',
-        aisle: 1,
+        aisle: 1
       },
       backFormRules: {
         time: [{ required: true, message: '请选择时间范围', trigger: 'change' }],
-        aisle: [{ required: true, message: '请选择通道', trigger: 'change' }],
+        aisle: [{ required: true, message: '请选择通道', trigger: 'change' }]
       },
       accessToken: '',
 
@@ -717,132 +717,132 @@ export default {
       equipmentChannel: [
         {
           value: '0',
-          label: '0',
+          label: '0'
         },
         {
           value: 1,
-          label: 1,
+          label: 1
         },
         {
           value: 2,
-          label: 2,
+          label: 2
         },
         {
           value: 3,
-          label: 3,
+          label: 3
         },
         {
           value: 4,
-          label: 4,
+          label: 4
         },
         {
           value: 5,
-          label: 5,
+          label: 5
         },
         {
           value: 6,
-          label: 6,
+          label: 6
         },
         {
           value: 7,
-          label: 7,
+          label: 7
         },
         {
           value: 8,
-          label: 8,
+          label: 8
         },
         {
           value: 9,
-          label: 9,
+          label: 9
         },
         {
           value: 10,
-          label: 10,
+          label: 10
         },
         {
           value: 11,
-          label: 11,
+          label: 11
         },
         {
           value: 12,
-          label: 12,
+          label: 12
         },
         {
           value: 13,
-          label: 13,
+          label: 13
         },
         {
           value: 14,
-          label: 14,
+          label: 14
         },
         {
           value: 15,
-          label: 15,
+          label: 15
         },
         {
           value: 16,
-          label: 16,
+          label: 16
         },
         {
           value: 17,
-          label: 17,
+          label: 17
         },
         {
           value: 18,
-          label: 18,
+          label: 18
         },
         {
           value: 19,
-          label: 19,
+          label: 19
         },
         {
           value: 20,
-          label: 20,
+          label: 20
         },
         {
           value: 21,
-          label: 21,
+          label: 21
         },
         {
           value: 22,
-          label: 22,
+          label: 22
         },
         {
           value: 23,
-          label: 23,
+          label: 23
         },
         {
           value: 24,
-          label: 24,
+          label: 24
         },
         {
           value: 25,
-          label: 25,
+          label: 25
         },
         {
           value: 26,
-          label: 26,
+          label: 26
         },
         {
           value: 27,
-          label: 27,
+          label: 27
         },
         {
           value: 28,
-          label: 28,
+          label: 28
         },
         {
           value: 29,
-          label: 29,
+          label: 29
         },
         {
           value: 30,
-          label: 30,
+          label: 30
         },
         {
           value: 31,
-          label: 31,
-        },
+          label: 31
+        }
       ],
       equipmentNumber: '', // 设备通道
       playback: false, // 是否添加回放功能
@@ -862,7 +862,7 @@ export default {
         data_plan: 0, // 套餐大小
         data_usage: 0, // 当月用量
         data_balance: 0, // 剩余流量
-        expiry_date: 0, // 到期日期
+        expiry_date: 0 // 到期日期
       },
       simCodeVisible: false,
       input3: '',
@@ -886,23 +886,23 @@ export default {
         task_num: '', // 任务ID
         playback: false, // 是否添加回放功能
         iccid: '', // sim卡
-        gb: '', // 国标ID
+        gb: '' // 国标ID
       },
       salesmanID: [], // 业务员ID集合
       addDeviceRules: {
         FluoriteClouduserID: [{ required: true, message: '请选择萤石云账号id', trigger: 'change' }],
         equipmentID: [{ required: true, message: '请输入设备id', trigger: 'blur' }],
-        equipmentNumber: [{ required: true, message: '请选择设备通道号', trigger: 'change' }],
+        equipmentNumber: [{ required: true, message: '请选择设备通道号', trigger: 'change' }]
       },
       // FluoriteClouduserID: '', // 萤石云账号ID
       stepIndex: 0, // 步骤下标
       tltArray: [
         {
-          name: '添加账号',
+          name: '添加账号'
         },
         {
-          name: '添加监控设备',
-        },
+          name: '添加监控设备'
+        }
       ],
       userNameID: [
         // {
@@ -916,7 +916,7 @@ export default {
       longtimetf: false,
       monthitortime: null,
       radio: '0',
-      optActive: '',
+      optActive: ''
     }
   },
   filters: {
@@ -945,20 +945,20 @@ export default {
         name = value.device_name
       }
       return name
-    },
+    }
   },
   computed: {
     notifyStyle() {
       if (this.$store.state.homeNotify) {
         return {
-          top: '72px',
+          top: '72px'
         }
       } else {
         return {
-          top: '60px',
+          top: '60px'
         }
       }
-    },
+    }
   },
   mounted() {
     if (this.$route.query.id !== undefined) {
@@ -1004,7 +1004,7 @@ export default {
             return '设备名称不能超过16个字符'
           }
         },
-        inputPlaceholder: device_name,
+        inputPlaceholder: device_name
       })
         .then(({ value }) => {
           if (value) {
@@ -1013,28 +1013,28 @@ export default {
               url: '/api/api_gateway?method=forecast.worm_lamp.revise_device',
               data: this.qs.stringify({
                 device_id: id,
-                device_name: value,
-              }),
+                device_name: value
+              })
             }).then((res) => {
               if (res.data.message == '') {
                 this.getJkList()
                 this.$message({
                   type: 'success',
-                  message: '修改成功',
+                  message: '修改成功'
                 })
               }
             })
           } else {
             this.$message({
               type: 'info',
-              message: '内容不能为空',
+              message: '内容不能为空'
             })
           }
         })
         .catch(() => {
           this.$message({
             type: 'info',
-            message: '取消输入',
+            message: '取消输入'
           })
         })
     },
@@ -1055,7 +1055,7 @@ export default {
       }
       console.log(newUrl)
       this.myVideo[`myPlayer${this.selected}`].changePlayUrl({
-        url: newUrl,
+        url: newUrl
       })
     },
     viewPhoto(id, gbId) {
@@ -1069,8 +1069,8 @@ export default {
         data: this.qs.stringify({
           page: this.currPage,
           page_size: 8,
-          device_id: this.idName,
-        }),
+          device_id: this.idName
+        })
       }).then((res) => {
         if (res.data.message == '') {
           this.Idlist = res.data.data.data
@@ -1087,7 +1087,7 @@ export default {
         for (var i = 0; i < this.Idlist.length; i++) {
           var obj = {
             value: i,
-            label: this.Idlist[i].device_id,
+            label: this.Idlist[i].device_id
           }
           this.equipmentOptions.push(obj)
         }
@@ -1119,8 +1119,8 @@ export default {
         url: '/api/api_gateway?method=camera.camera_manage.ctrl_camera',
         data: this.qs.stringify({
           device_id: this.id,
-          ctrl: 'stop',
-        }),
+          ctrl: 'stop'
+        })
       })
     },
     // 上下左右
@@ -1131,8 +1131,8 @@ export default {
           method: 'POST',
           url: '/api/api_gateway?method=camera.camera_manage.camera_takephoto',
           data: this.qs.stringify({
-            device_id: this.id,
-          }),
+            device_id: this.id
+          })
         }).then((res) => {
           let data = JSON.parse(res.data.data)
           if (data.code == 200) {
@@ -1150,8 +1150,8 @@ export default {
           data: this.qs.stringify({
             device_id: this.id,
             ctrl: ctrl,
-            movenum: movenum,
-          }),
+            movenum: movenum
+          })
         }).then((res) => {
           // if (res.data.message == '') {
           // 	this.$message.success('指令下发成功')
@@ -1166,8 +1166,8 @@ export default {
         method: 'POST',
         url: '/api/api_gateway?method=camera.camera_manage.camera_takephoto',
         data: this.qs.stringify({
-          device_id: this.id,
-        }),
+          device_id: this.id
+        })
       })
         .then((res) => {
           if (res.data.message == '') {
@@ -1176,13 +1176,13 @@ export default {
             // this.takePhotoDialogVisible = true;
             this.$message({
               message: '拍照成功',
-              type: 'success',
+              type: 'success'
             })
           } else {
             this.$message({
               message: res.data.message,
               type: 'warning',
-              duration: 1500,
+              duration: 1500
             })
           }
         })
@@ -1198,7 +1198,7 @@ export default {
       this.$axios({
         url: '/api/api_gateway?method=camera.camera_manage.addr_camera',
         method: 'POST',
-        data: this.qs.stringify({ device_id: device_id }),
+        data: this.qs.stringify({ device_id: device_id })
       }).then((res) => {
         if (res.data.message == '') {
           if (typeof res.data.data === 'string') {
@@ -1233,7 +1233,7 @@ export default {
             setTimeout(() => {
               this.myVideo['xPlayer'] = new EZUIKit.EZUIKitPlayer({
                 id: 'player',
-                url: rtmpHdSrc,
+                url: rtmpHdSrc
               })
               // this.myVideo['xPlayer'].play();
             }, 1000)
@@ -1266,9 +1266,9 @@ export default {
                     sources: [
                       {
                         type: 'application/x-mpegURL',
-                        src: hlsHdSrc,
-                      },
-                    ],
+                        src: hlsHdSrc
+                      }
+                    ]
                   },
                   () => {
                     this.myVideo[`myPlayer${this.selected}`].play()
@@ -1306,7 +1306,7 @@ export default {
                   handleError: (err) => {
                     console.log('监控播放失败了!!!', err)
                     this.myVideo[`myPlayer${this.selected}`].play()
-                  },
+                  }
                 })
                 // setTimeout(() => {
 
@@ -1377,7 +1377,7 @@ export default {
       document.getElementById('picUrl').select()
       this.$message({
         showClose: true,
-        message: '手动复制,在浏览器打开,另存为',
+        message: '手动复制,在浏览器打开,另存为'
       })
     },
     // 添加设备
@@ -1397,15 +1397,15 @@ export default {
             sale_uid: this.addDevice.sale_uid,
             task_num: this.addDevice.task_num,
             iccid: this.addDevice.iccid,
-            gb: this.addDevice.gb,
-          }),
+            gb: this.addDevice.gb
+          })
         }).then((res) => {
           if (res.data.message == '') {
             // console.log(456);
             this.$message({
               message: '添加成功',
               type: 'success',
-              duration: 1500,
+              duration: 1500
             })
             this.$refs.addDeviceRef.resetFields()
             // this.equipmentID = '';
@@ -1417,7 +1417,7 @@ export default {
             this.$message({
               message: res.data.message,
               type: 'warning',
-              duration: 1500,
+              duration: 1500
             })
           }
         })
@@ -1502,7 +1502,7 @@ export default {
         sale_uid: '', // 业务员ID
         task_num: '', // 任务ID
         playback: false, // 是否添加回放功能
-        iccid: '', // sim卡
+        iccid: '' // sim卡
       }
       // console.log(this.$store.state.saleUserList);
     },
@@ -1524,7 +1524,7 @@ export default {
         this.$message({
           message: 'iccid不能为空',
           type: 'warning',
-          duration: 1500,
+          duration: 1500
         })
       } else if (this.equipmentValue !== '') {
         this.$axios({
@@ -1532,8 +1532,8 @@ export default {
           url: '/api/api_gateway?method=camera.camera_manage.add_camera_sim',
           data: this.qs.stringify({
             device_id: this.id, // 设备id
-            iccid: this.equipmentValue,
-          }),
+            iccid: this.equipmentValue
+          })
         })
           .then((res) => {
             // console.log(res);
@@ -1541,7 +1541,7 @@ export default {
               this.$message({
                 type: 'success',
                 message: 'sim卡绑定成功',
-                duration: 1500,
+                duration: 1500
               })
               this.bangDsimId = ''
               this.equipmentValue = ''
@@ -1551,7 +1551,7 @@ export default {
               this.$message({
                 type: 'error',
                 message: res.data.message,
-                duration: 1500,
+                duration: 1500
               })
             }
           })
@@ -1560,7 +1560,7 @@ export default {
             this.$message({
               type: 'error',
               message: 'sim卡绑定失败',
-              duration: 1500,
+              duration: 1500
             })
           })
       }
@@ -1575,7 +1575,7 @@ export default {
       this.playback = false
       this.$message({
         type: 'info',
-        message: '取消添加',
+        message: '取消添加'
       })
       this.input3 = ''
     },
@@ -1626,7 +1626,7 @@ export default {
           accessToken: this.accessToken,
           decoderPath: 'static/js/',
           width: 560,
-          height: 460,
+          height: 460
         })
       })
     },
@@ -1690,8 +1690,8 @@ export default {
           method: 'POST',
           url: '/api/api_gateway?method=camera.camera_manage.list_camera',
           data: this.qs.stringify({
-            device_id: query,
-          }),
+            device_id: query
+          })
         }).then((res) => {
           // this.equipmentID = res.data.data.data
           var list = res.data.data.data
@@ -1700,7 +1700,7 @@ export default {
           for (var i = 0; i < list.length; i++) {
             var obj = {
               label: list[i].device_id,
-              value: i,
+              value: i
             }
             this.equipmentIDlist.push(obj)
           }
@@ -1712,8 +1712,8 @@ export default {
         method: 'POST',
         url: '/api/api_gateway?method=camera.camera_manage.list_camera',
         data: this.qs.stringify({
-          device_id: simid,
-        }),
+          device_id: simid
+        })
       }).then((res) => {
         var list = res.data.data.data
         // console.log(list[0].sim);
@@ -1741,17 +1741,17 @@ export default {
       if (this.equipmentValue == '') {
         this.$message({
           type: 'info',
-          message: '请输入正确的iccid',
+          message: '请输入正确的iccid'
         })
       } else {
         var postData = this.qs.stringify({
-          iccid: this.equipmentValue,
+          iccid: this.equipmentValue
         })
         this.simloading = true
         this.$axios({
           method: 'POST',
           url: '/api/api_gateway?method=forecast.send_control.sim_query_new',
-          data: postData,
+          data: postData
         })
           .then((res) => {
             this.simloading = false
@@ -1762,7 +1762,7 @@ export default {
             } else {
               this.$message({
                 type: 'info',
-                message: res.data.data.msg,
+                message: res.data.data.msg
               })
             }
 
@@ -1795,31 +1795,31 @@ export default {
         this.$message({
           message: '账号不能为空,请填写!',
           type: 'warning',
-          duration: 1500,
+          duration: 1500
         })
       } else if (this.salesman == '') {
         this.$message({
           message: '业务员不能为空,请填写!',
           type: 'warning',
-          duration: 1500,
+          duration: 1500
         })
       } else if (this.tokenData == '') {
         this.$message({
           message: 'token不能为空,请填写!',
           type: 'warning',
-          duration: 1500,
+          duration: 1500
         })
       } else if (this.secretKey == '') {
         this.$message({
           message: 'appkey不能为空,请填写!',
           type: 'warning',
-          duration: 1500,
+          duration: 1500
         })
       } else if (this.furtiveData == '') {
         this.$message({
           message: 'appSecret不能为空,请填写!',
           type: 'warning',
-          duration: 1500,
+          duration: 1500
         })
       } else {
         var postData = this.qs.stringify({
@@ -1828,12 +1828,12 @@ export default {
           app_token: this.tokenData, // 萤石云账号 token
           app_key: this.secretKey, // 萤石云账号 appkey
           app_secret: this.furtiveData, // 萤石云账号 appSecret
-          account_type: this.radio,
+          account_type: this.radio
         })
         this.$axios({
           method: 'POST',
           url: '/api/api_gateway?method=camera.camera_manage.add_camera_account',
-          data: postData,
+          data: postData
         })
           .then((res) => {
             // console.log(res);
@@ -1841,14 +1841,14 @@ export default {
               this.$message({
                 message: '添加萤石云账号成功!',
                 type: 'success',
-                duration: 1500,
+                duration: 1500
               })
               this.addEquipment = false
             } else {
               this.$message({
                 message: '添加萤石云账号失败',
                 type: 'warning',
-                duration: 1500,
+                duration: 1500
               })
             }
           })
@@ -1857,7 +1857,7 @@ export default {
             this.$message({
               message: '添加萤石云账号失败',
               type: 'warning',
-              duration: 1500,
+              duration: 1500
             })
           })
       }
@@ -1867,12 +1867,12 @@ export default {
     FluoriteClouduserUserID() {
       var postData = this.qs.stringify({
         account: '', // 按萤石云账号名字搜索
-        salesman: '', // 按业务员名称搜索
+        salesman: '' // 按业务员名称搜索
       })
       this.$axios({
         method: 'POST',
         url: '/api/api_gateway?method=camera.camera_manage.see_camera_account',
-        data: postData,
+        data: postData
       })
         .then((res) => {
           // console.log(res.data.data);
@@ -1897,7 +1897,7 @@ export default {
       this.$axios({
         url: '/api/api_gateway?method=camera.camera_manage.list_camera',
         method: 'POST',
-        data: this.qs.stringify({ device_id: e }),
+        data: this.qs.stringify({ device_id: e })
       }).then((res) => {
         // console.log(res.data.data.data);
         this.bangDsimoptions = []
@@ -1906,7 +1906,7 @@ export default {
           this.bangDsimoptions.push({
             value: i,
             label: datas[i].device_id,
-            iccid: datas[i].sim,
+            iccid: datas[i].sim
           })
         }
       })
@@ -1917,7 +1917,7 @@ export default {
       if (this.bangDsimoptions[e].iccid == '') {
         this.$message({
           message: '该设备尚未绑定sim卡!',
-          type: 'warning',
+          type: 'warning'
         })
       }
     },
@@ -1939,7 +1939,7 @@ export default {
       this.$router.push(
         `/index/${type == 0 ? 'playbackDgp' : 'playbackDgp'}?id=${id}&accessKey=${token}`
       )
-    },
+    }
   },
   watch: {
     // 添加设备弹框
@@ -1959,8 +1959,8 @@ export default {
         this.furtiveData = '' // appSecret
         this.stepIndex = 0 // 步骤下标
       }
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -2096,6 +2096,7 @@ export default {
         padding: 16px;
         box-sizing: border-box;
         border-radius: 4px;
+        height: calc(100% - 16px);
       }
       .view-box:last-child {
         margin-top: 16px;
@@ -2110,7 +2111,8 @@ export default {
         background: #f5f7fa;
       }
       .viewLists {
-        height: 50%;
+        // height: 50%;
+        height: calc(100% - 94px);
         overflow: auto;
         padding: 0;
         li {