Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into sl3

src/views/HealthControl/infotrack2.vue

@@ -332,7 +332,7 @@
         class="videoBoxiframe"
         width="100%"
         height="600px"
-        src="http://localhost:8081?token=stream-1"
+        :src="'http://10.155.32.4:9984/ws.html?token=' + form.wtId +'_TD&autoplay=true'"
       ></iframe>
     </el-dialog>
     <el-dialog
@@ -522,30 +522,30 @@ export default {
     },
   },
   watch: {
-  	formdata(res) {
-  		if (res) {
-  			this.form = this.formdata;
-  			this.form.tjss = this.form.tjss
-  			  ? new Date(this.form.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.prodtdepttime = this.form.prodtdepttime
-  			  ? new Date(this.form.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.departuretime = this.form.departuretime
-  			  ? new Date(this.form.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.arrivaltime = this.form.arrivaltime
-  			  ? new Date(this.form.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.repairedtime = this.form.repairedtime
-  			  ? new Date(this.form.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  			this.form.checktime = this.form.checktime
-  			  ? new Date(this.form.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
-  			  : null;
-  		}
-  	}
-  }
+    formdata(res) {
+      if (res) {
+        this.form = this.formdata;
+        this.form.tjss = this.form.tjss
+          ? new Date(this.form.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.prodtdepttime = this.form.prodtdepttime
+          ? new Date(this.form.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.departuretime = this.form.departuretime
+          ? new Date(this.form.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.arrivaltime = this.form.arrivaltime
+          ? new Date(this.form.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.repairedtime = this.form.repairedtime
+          ? new Date(this.form.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+        this.form.checktime = this.form.checktime
+          ? new Date(this.form.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
+          : null;
+      }
+    },
+  },
 };
 </script>
 

src/views/Home/components/power-plan.vue

@@ -15,8 +15,8 @@
         <!-- <percent-card-2 :title="'月完成率' + parseInt((planData.yfdl / planData.yfdljh) * 100) + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.yfdl" :ActualValue="planData.yfdljh" :percent="planData.ywcl" /> -->
         <percent-card-2
           :title="''"
-          TotalText="实际"
-          ActualText="计划"
+          TotalText="月实际"
+          ActualText="月计划"
           :TotalValue="planData.yfdl"
           :ActualValue="planData.yfdljh"
           :percent="planData.ywcl"
@@ -26,8 +26,8 @@
         <!-- <percent-card-2 :title="'年完成率' + parseInt((planData.nfdl / planData.nfdljh) * 100) + '%'" TotalText="实际" ActualText="计划" :TotalValue="planData.nfdl" :ActualValue="planData.nfdljh" :percent="planData.nwcl" /> -->
         <percent-card-2
           :title="''"
-          TotalText="实际"
-          ActualText="计划"
+          TotalText="年实际"
+          ActualText="年计划"
           :TotalValue="planData.nfdl"
           :ActualValue="planData.nfdljh"
           :percent="planData.nwcl"