代码更新

minggao/src/page/forecasting/maintain/maintain.vue

@@ -593,7 +593,7 @@ export default {
           strMiao = parseFloat(strMiao).toFixed(2); //精确小数点后面两位
         }
       }
-      console.log(strDu, strFen, strMiao);
+      // console.log(strDu, strFen, strMiao);
       return strDu + "°" + strFen + "′" + strMiao + "″" + A;
     },
     //度°分′秒″转度

minggao/src/page/home/index.vue

@@ -20,11 +20,11 @@
         <p>{{ headline }}</p>
       </div>
       <div class="index_out" style="display: flex">
-        <!-- <div
+        <div
           class="iconfont icon-erweima"
           style="margin-right: 15px; font-size: 22px; color: #666666"
           @click="QRcode"
-        ></div> -->
+        ></div>
         <el-dropdown trigger="click" @command="quit">
           <span class="el-dropdown-link" style="cursor: pointer">
             <span>{{ username }}</span>

minggao/src/page/monitor/Monitor.vue

@@ -4,12 +4,12 @@
       <div class="video-box">
         <div class="video-container" ref="videoContainerRef">
           <!-- 插件播放 -->
-          <div
+          <!-- <div
             class="x"
             v-if="playType == 1"
             v-html="html"
             style="width: 100%; height: 100%"
-          ></div>
+          ></div> -->
           <!-- 非插件播放 ，默认非插件播放-->
           <div class="v" style="width: 100%; height: 100%" v-if="playType == 0">
             <div
@@ -147,8 +147,8 @@
             v-show="playType == 0"
             @click="checkPlayType(1)"
             class="playtype1"
-          ></div>
-          <div
+          ></div> -->
+          <!-- <div
             v-show="playType == 1"
             @click="checkPlayType(0)"
             class="playtype0"
@@ -659,13 +659,17 @@
             <div class="haiguan">
               <p
                 class="haiguan_item"
-                v-for="item,index in ruleForm.oldorg_id"
+                v-for="(item, index) in ruleForm.oldorg_id"
                 :key="item.id"
               >
                 <span style="margin-right: 5px">{{ item.org_name }}</span>
-                <span style="font-size: 16px" @click="oldorgdelect(index)">×</span>
+                <span style="font-size: 16px" @click="oldorgdelect(index)"
+                  >×</span
+                >
+              </p>
+              <p v-if="ruleForm.oldorg_id.length == 0" class="haiguan_itemnone">
+                暂无绑定
               </p>
-              <p v-if="ruleForm.oldorg_id.length == 0" class="haiguan_itemnone">暂无绑定</p>
             </div>
           </el-form-item>
           <el-form-item label="隶属海关" prop="org_id">
@@ -1286,7 +1290,9 @@ export default {
         if (res.data.message == "") {
           var data = eval("(" + res.data.data + ")");
           let hlsHdSrc = data.hlsHd;
-          let rtmpHdSrc = data.rtmpHd;
+          hlsHdSrc = "https" + hlsHdSrc.toString().slice(4);
+          console.log(hlsHdSrc);
+          // let rtmpHdSrc = data.rtmpHd;
           // if (this.playType == 1) {
           //   //插件
           //   this.html = `<video id="player" autoplay muted poster='' controls playsInline webkit-playsinline src="${rtmpHdSrc}" style="width:100%; height:100%;"></video>`;
@@ -1295,28 +1301,28 @@ export default {
           //     this.myVideo["xPlayer"].play();
           //   }, 1000);
           // } else if (this.playType == 0) {
-            let playHtml = `<video id="myPlayer${this.selected}"  muted autoplay  poster='' controls playsInline  webkit-playsinline src="${hlsHdSrc}"  style="width:100%; height:100%;"></video>`;
-            document.getElementById("my-video" + this.selected).innerHTML =
-              playHtml;
-            //非插件
-            this.$nextTick(() => {
-              console.log(data.hlsHd, "data.hlsHddata.hlsHd");
-              this.myVideo[`myPlayer${this.selected}`] = new EZUIKit.EZUIPlayer(
-                `myPlayer${this.selected}`
-              );
-              setTimeout(() => {
-                this.myVideo[`myPlayer${this.selected}`].play();
-              }, 150);
-              this.VideoList.push(this.myVideo[`myPlayer${this.selected}`]);
-              // this.player = videojs('my-video' + this.selected)
-              // this.player.reset()
-              // this.player.src({
-              // 	src: this.hlsHdSrc,
-              // 	type: 'application/x-mpegURL'
-              // })
-              // this.player.play()
-              // this.player.load()
-            });
+          let playHtml = `<video id="myPlayer${this.selected}"  muted autoplay  poster='' controls playsInline  webkit-playsinline src="${hlsHdSrc}"  style="width:100%; height:100%;"></video>`;
+          document.getElementById("my-video" + this.selected).innerHTML =
+            playHtml;
+          //非插件
+          this.$nextTick(() => {
+            console.log(data.hlsHd, "data.hlsHddata.hlsHd");
+            this.myVideo[`myPlayer${this.selected}`] = new EZUIKit.EZUIPlayer(
+              `myPlayer${this.selected}`
+            );
+            setTimeout(() => {
+              this.myVideo[`myPlayer${this.selected}`].play();
+            }, 150);
+            this.VideoList.push(this.myVideo[`myPlayer${this.selected}`]);
+            // this.player = videojs('my-video' + this.selected)
+            // this.player.reset()
+            // this.player.src({
+            // 	src: this.hlsHdSrc,
+            // 	type: 'application/x-mpegURL'
+            // })
+            // this.player.play()
+            // this.player.load()
+          });
           // }
         }
       });
@@ -1972,7 +1978,7 @@ export default {
     },
     oldorgdelect(index) {
       this.ruleForm.oldorg_id.splice(index, 1);
-      console.log(this.ruleForm.oldorg_id)
+      console.log(this.ruleForm.oldorg_id);
     },
     submitForm(formName) {
       console.log(this.ruleForm.org_id);
@@ -1991,11 +1997,11 @@ export default {
           if (org_id.indexOf(this.ruleForm.oldorg_id[i].org_id) == -1) {
             org_id.push(this.ruleForm.oldorg_id[i].org_id);
           }
-        }else{
+        } else {
           org_id.push(this.ruleForm.oldorg_id[i].org_id);
         }
       }
-      console.log(org_id)
+      console.log(org_id);
       if (org_id.length > 0) {
         org_id = org_id.join("/");
       } else {
@@ -2665,14 +2671,14 @@ export default {
 .haiguan {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 5px;
+  margin-top: 10px;
   .haiguan_item {
-    // width: 70px;
+    width: 70px;
     height: 20px;
     border: 1px solid #d4d2d2;
     line-height: 20px;
     margin-right: 10px;
-    padding: 2px 10px;
+    padding: 0 0 0 10px;
     border-radius: 5px;
   }
   .haiguan_itemnone {