瀏覽代碼

添加设备全屏显示

yf_wsy 3 年之前
父節點
當前提交
d1dc98ad6e
共有 3 個文件被更改,包括 17457 次插入35 次删除
  1. 5 5
      config/index.js
  2. 17442 21
      package-lock.json
  3. 10 9
      src/pages/Monitor.vue

+ 5 - 5
config/index.js

@@ -12,17 +12,17 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       // '/api': {
-      //   // target: 'http://192.168.1.8:8000/',
+      // target: 'http://192.168.1.8:8000/',
       //   target: 'http://192.168.1.123:8007/',
-      //   // target: 'http://192.168.1.4:8000/',//杨
+      // target: 'http://192.168.1.4:8000/',//杨
       //   changeOrigin: true,
       //   pathRewrite: {
       //     '^/api': '' //重写接口
       //   }
       // },
       '/': {
-        // target: 'http://192.168.1.8:8000/',
-        target: 'http://192.168.1.123:8005/',
+      //   // target: 'http://192.168.1.8:8000/',
+        target: 'http://192.168.1.66:9000/',
         // target: 'http://192.168.1.4:8000/',//杨
         changeOrigin: true,
         pathRewrite: {
@@ -32,7 +32,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.123', // can be overwritten by process.env.HOST
+    host: '192.168.1.66', // can be overwritten by process.env.HOST
     port: 8000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

文件差異過大導致無法顯示
+ 17442 - 21
package-lock.json


+ 10 - 9
src/pages/Monitor.vue

@@ -128,7 +128,7 @@
             @click="splitPage('jia')"
           ></span>
         </div>
-        <!-- <div class="direc">
+         <!-- <div class="direc">
           <div
             @mousedown="configCamera(id, 'move', 0)"
             @mouseup="stopConfigCamera(id)"
@@ -149,10 +149,10 @@
             @mouseup="stopConfigCamera(id)"
             class="rightCtr"
           ></div>
-        </div> -->
-        <!-- <div class="btnBox">
-          <div class="zoom">
-            无论插件还是费插件都可以放大缩小
+        </div>  -->
+         <div class="btnBox">
+          <!-- <div class="zoom">
+             无论插件还是费插件都可以放大缩小 
             <span
               class="addCtr"
               @mousedown="configCamera(id, 'move', 8)"
@@ -163,15 +163,15 @@
               @mousedown="configCamera(id, 'move', 9)"
               @mouseup="stopConfigCamera(id)"
             ></span>
-          </div>
+          </div> -->
           <div
             v-show="videotape == 1"
             class="playBack"
             @click="playBackDialogVisible = true"
           ></div>
-          <div @click="addEquipDialogVisible = true" class="addequip"></div>
+          <div @click="addEquipDialogVisible = true" class="addequip" style="padding-top:20px"></div>
           <div @click="fScreenFun()" class="fSBtn1"></div>
-        </div> -->
+        </div> 
       </div>
     </div>
     <!-- 拍照 -->
@@ -333,7 +333,7 @@ export default {
     formatName: function (value) {
       //设备名字
       if (value.device_name) {
-        return `${value.device_name}-${value.jktype}`;
+        return `${value.device_name}.-${value.jktype}`;
       }
     },
     ellipsis(value) {
@@ -380,6 +380,7 @@ export default {
           site_id: id,
         }),
       }).then((res) => {
+        console.log("苗情苗情",res);
         this.Idlist = res.data.data;
         this.totalPage = Math.ceil(res.data.counts / 12);
         this.initMonitor(); //进入页面默认1屏都显示视频