修改

src/assets/js/common.js

@@ -464,6 +464,22 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
+			//视频监控——矿山监控——摄像头萤石云视频监控获取token
+			mineMonitoringGetTokenaQuery: function(param){
+				return request({
+					url: '/cameraDetail/token',
+					method: 'get',
+					params:param,
+				})
+			},
+			//视频监控——矿山监控——摄像头视频监控云台控制判断有无
+			mineMonitoringHowYuntaiQuery: function(param){
+				return request({
+					url: '/cameraDetail/yuntai',
+					method: 'get',
+					params:param,
+				})
+			},
 			//视频监控——车辆监控管理——车队管理
 			carMonitoringFleetQuery: function(param){
 				return request({

src/components/ezuikit/EZUIKitJs.vue

 <template>
-  <div style="background: white">
+  <div>
     <el-container>
-      <el-header style="font-size: 20px; font-weight: bold"
-        >鑫海矿业监控视频</el-header
-      >
-
+      <el-header style="font-size: 20px; font-weight: bold">
+        卡车调度系统矿山监控视频
+      </el-header>
       <el-container>
-        <el-aside width="230px" style="height: 86vh">
+        <el-aside width="230px" style="height: 79vh">
           <el-tree
             :data="videoData"
             :props="defaultProps"
@@ -62,16 +61,7 @@
 <script>
 // import Hls from "hls.js"
 // import EZUIKit from "ezuikit-js";
-// import { httpGet, httpPost, httpPostForJson } from "@/common/httpBean.js";
-// import {
-//   mainCameraDetail,
-//   cameraDetailToken,
-//   cameraDetailDahuatoken,
-//   mainCamera,
-//   startCamera,
-//   stopCamera,
-//   cameraDetailYuntai,
-// } from "@/axios/api.js";
+import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
 var noPtzhls = null;
 export default {
   data() {
@@ -102,31 +92,27 @@ export default {
   },
   mounted() {
     this.getCode();
-    this.getDaHua();
-    this.getAccessToken();
+    //this.getDaHua();
+    //this.getAccessToken();
   },
   methods: {
     getAccessToken() {
-      httpGet(cameraDetailToken).then(res => {
-        this.accessToken = res.data.accessToken;
-      });
+      let param = {};
+      HttpReq.truckDispatching.mineMonitoringGetTokenaQuery(param).then((res) => {
+				this.accessToken = res.data.accessToken;
+			})
     },
     getCode() {
       //分区数据
-      httpGet(mainCamera, { size: 999 }).then((res) => {
-        //console.log(res);
+      HttpReq.truckDispatching.mineMonitoringPartitionQuery({size: 999}).then((res) => {
         let data1 = [];
         res.content.forEach((item) => {
           item.label = item.name;
           data1.push(item);
         });
-        //this.videoData = data1;
         if (res != "") {
           //总摄像头数据
-          httpGet(mainCameraDetail, { size: 999 }).then((res) => {
-            let fenqu1 = [];
-            let fenqu2 = [];
-            let fenqu3 = [];
+          HttpReq.truckDispatching.mineMonitoringCameraQuery({size: 999}).then((res) => {
             let fenquName = [];
             res.content.forEach((item,index) => {
               item.ref = "video" + index;
@@ -134,31 +120,19 @@ export default {
               item.label = item.cameraName;
               fenquName.push(item);
             });
-            fenquName.forEach(function (item) {
-              if (item.cameraId == 1) {
-                fenqu1.push(item);
-              } else if (item.cameraId == 2) {
-                fenqu2.push(item);
-              } else {
-                fenqu3.push(item);
-              }
-            });
-            let videoData1 = data1;
-            videoData1.forEach((item) => {
-              if (item.id == 1) {
-                item.children = fenqu1;
-              } else if (item.id == 2) {
-                item.children = fenqu2;
-              } else {
-                item.children = fenqu3;
-              }
+            data1.forEach((item) => {
+              item.children = [];
+              fenquName.forEach((itemSon,index)=>{
+                if(item.id == itemSon.cameraId){
+                  item.children.push(itemSon);
+                }
+              })
             });
-            this.videoData = videoData1;
+            this.videoData = data1;
             console.log(this.videoData);
-          });
+          })
         }
-      });
-
+			})
     },
     handleNodeClick(data) {
       console.log(data);
@@ -184,8 +158,8 @@ export default {
                 item.hls.loadSource(item.url)
                 item.hls.attachMedia(that.$refs[item.ref][0]);
                 item.hls.on(Hls.Events.MANIFEST_PARSED,function() {
-                  that.$refs[item.ref][0].play();
-                });
+                  that.$refs[item.ref][0].play();
+                });
               })
             })
 
@@ -203,8 +177,8 @@ export default {
                 item.hls.loadSource(item.url)
                 item.hls.attachMedia(that.$refs[item.ref][0]);
                 item.hls.on(Hls.Events.MANIFEST_PARSED,function() {
-                  that.$refs[item.ref][0].play();
-                });
+                  that.$refs[item.ref][0].play();
+                });
               })
             })
 
@@ -315,15 +289,15 @@ export default {
       } else {
         this.btnChildren = false;
         if (data.brand == 1) {
-          httpGet(cameraDetailYuntai, {ip:data.cameraIp}).then((res) => {
+          HttpReq.truckDispatching.mineMonitoringHowYuntaiQuery({ip:data.cameraIp}).then((res) => {
             if(!res){
               let noPtzVideo = document.getElementById('noPtzVideo');
               noPtzhls = new Hls();
-              noPtzhls.loadSource(data.url);
-              noPtzhls.attachMedia(noPtzVideo);
-              noPtzhls.on(Hls.Events.MANIFEST_PARSED,function() {
+              noPtzhls.loadSource(data.url);
+              noPtzhls.attachMedia(noPtzVideo);
+              noPtzhls.on(Hls.Events.MANIFEST_PARSED,function() {
                 noPtzVideo.play();
-              });
+              });
               this.isChildren1 = false;
               this.isChildren2 = false;
               this.isChildren3 = false;
@@ -344,7 +318,6 @@ export default {
               if(noPtzhls != null){
                 noPtzhls.destroy();
               }
-
             }
           })
         } else if (data.brand == 2) {
@@ -381,8 +354,7 @@ export default {
       }
     },
     getDaHua() {
-      httpGet(mainCameraDetail, { page: 0, size: 100 }).then((res) => {
-        let that = this;
+      HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100}).then((res) => {
         let dahua = [];
         res.content.forEach(function (item) {
           if (item.brand == 2) {
@@ -390,7 +362,7 @@ export default {
           }
         });
         this.dahuaData = dahua;
-      });
+			})
     },
     upPage() {
       let that = this;
@@ -505,14 +477,17 @@ export default {
   background-color: #fffef9;
   color: #333;
   text-align: center;
+  padding: 0;
+  margin-bottom: 0px;
 }
 
 .el-main {
   background-color: white;
   color: #333;
   text-align: center;
-  height: 86vh;
+  height: 79vh;
   overflow:hidden;
+  width: 73vw;
 }
 
 .el-tree-node__content {

src/views/carManagement/carManualScheduling/index.vue → src/views/IntelligentDispatchManagement/carManualScheduling/index.vue

@@ -223,7 +223,7 @@ import Axios from 'axios'
 import EZUIKit from "ezuikit-js";
 
 export default {
-	name: 'carManualScheduling',
+	name: 'CarManualScheduling',
 	components: {
 		DateRangePicker, cuAmap
 	},

src/views/carManagement/carManualSchedulingManagement/index.vue → src/views/IntelligentDispatchManagement/carManualSchedulingManagement/index.vue

@@ -223,7 +223,7 @@ import Axios from 'axios'
 import EZUIKit from "ezuikit-js";
 
 export default {
-	name: 'carManualSchedulingManagement',
+	name: 'CarManualSchedulingManagement',
 	components: {
 		DateRangePicker, cuAmap
 	},

src/views/carManagement/carVoiceSupplement/index.vue → src/views/IntelligentDispatchManagement/carVoiceSupplement/index.vue

@@ -223,7 +223,7 @@ import Axios from 'axios'
 import EZUIKit from "ezuikit-js";
 
 export default {
-	name: 'carVoiceSupplement',
+	name: 'CarVoiceSupplement',
 	components: {
 		DateRangePicker, cuAmap
 	},

src/views/monitoringManagement/carVideo/index.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import EZUIKitJs from '../../../components/ezuikit/EZUIKitJs.vue'
+import EZUIKitJs from '../../../components/ezuikit/carsEZUIKitJs.vue'
 export default {
   components: {
     EZUIKitJs
@@ -15,7 +15,6 @@ export default {
 
 <style scoped>
 #app {
-  background-color: white;
   font-family: Avenir, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

src/views/monitoringManagement/mineVideo/index.vue

@@ -15,7 +15,6 @@ export default {
 
 <style scoped>
 #app {
-  background-color: white;
   font-family: Avenir, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;