Jelajahi Sumber

Merge http://39.104.94.153:3000/yf_zy/MingGao_vue

zhangyun 3 tahun lalu
induk
melakukan
08a6cfda12

+ 1 - 0
minggao/index.html

@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>深圳海关国门生物安全监测预警指挥平台</title>
+    <link rel="SHORTCUT ICON" href="../static/images/ico.ico">
   </head>
   <body style="margin: 0;">
     <div id="app"></div>

File diff ditekan karena terlalu besar
+ 0 - 12170
minggao/package-lock.json


+ 2 - 1
minggao/src/page/forecasting/trap/trap.vue

@@ -114,7 +114,7 @@
                 v-else
               >
                 <div class="popover-content" v-html="content"></div>
-                <span @mouseover="orglisthover(scope.row)" slot="reference"
+                <span v-if="scope.row.org_list.length !== 0" @mouseover="orglisthover(scope.row)" slot="reference"
                   >{{ scope.row.org_list[0].org_name }}...</span
                 >
               </el-popover>
@@ -557,6 +557,7 @@ export default {
       }).then((res) => {
         this.loading = false;
         console.log(res.data.data);
+        // console.log(res.data.data.page_list[0].org_list[0].org_name, '-----------111---------------------')
         this.total = res.data.data.total_item;
         this.tableData = res.data.data.page_list;
         for (var i = 0; i < this.tableData.length; i++) {

+ 2 - 0
minggao/src/page/homepage/facilitydistribute.vue

@@ -757,6 +757,8 @@ export default {
         if (this.baseinfo[0].device_info) {
           // console.log(this.baseinfo[0].device_info.hlsHd)
           let hlsHd = this.baseinfo[0].device_info.hlsHd;
+          hlsHd = "https" + hlsHd.toString().slice(4);
+          console.log(hlsHd)
           let playHtml = `<video id="myPlayer"  muted autoplay  poster='' controls playsInline  webkit-playsinline src="${hlsHd}"  style="width:100%; height:100%;"></video>`;
           // console.log(hlsHd);
           this.$nextTick(() => {

TEMPAT SAMPAH
minggao/static/images/ico.ico