PY-2022.1 <Faith@DESKTOP-FQ04LTL Merge branch 'master'

src/views/monitoring/camera/index.vue

@@ -89,15 +89,23 @@ export default {
   data() {
     return {
       isfour: false,
-      onevideoUrl: null,
+      onevideoUrl: {
+        caddr:
+          "https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv",
+        name: "摄像头1",
+      },
       fourVideo: [],
       faith: 0,
-      arr:[]
+      arr: [],
     };
   },
+  mounted() {
+    this.jiekou();
+  },
   created() {
     this.jiekou();
   },
+
   methods: {
     faith_one() {
       this.isfour = false;
@@ -108,26 +116,29 @@ export default {
     jiekou() {
       var index = this.$route.path.split("/")[2];
       listCamera({ belongLocal: index }).then((response) => {
+        // console.log(response.rows);
+
         this.fourVideo = response.rows;
+        // this.fourVideo = {
+        //   caddr:
+        //     "https://sf1-hscdn-tos.pstatp.com/obj/media-fe/xgplayer_doc_video/flv/xgplayer-demo-360p.flv",
+        //   name: "摄像头",
+        // };
         if (this.fourVideo.length >= 4) {
-         this.fourVideo.forEach((item,i)=>{
-           if (i <= 3){
-             this.arr.push(item)
-           }
+          this.fourVideo.forEach((item, i) => {
+            if (i <= 3) {
+              this.arr.push(item);
+            }
           });
-        }else {
-          this.fourVideo.forEach((item,i)=>{
-           if (i <= 3){
-             this.arr.push(item)
-           }
+        } else {
+          this.fourVideo.forEach((item, i) => {
+            if (i <= 3) {
+              this.arr.push(item);
+            }
           });
         }
-        if (
-          response.rows != undefined ||
-          response.rows != null ||
-          response.rows != "" ||
-          response.rows != response.rows.lenght > 0
-        ) {
+        if (response.rows.lenght > 0) {
+          console.log(response.rows);
           this.onevideoUrl = [...response.rows][0];
         }
       });
@@ -138,13 +149,14 @@ export default {
       if (!this.isfour) {
         this.onevideoUrl = [...this.fourVideo][index];
       } else {
-        this.arr[this.faith].caddr = this.fourVideo[index].caddr
-        this.faith += 1
-        if (this.faith == 4){
-          this.faith = 0
+        this.arr[this.faith].caddr = this.fourVideo[index].caddr;
+        this.faith += 1;
+        if (this.faith == 4) {
+          this.faith = 0;
           var index = this.$route.path.split("/")[2];
-      listCamera({ belongLocal: index }).then((response) => {
-        this.fourVideo = response.rows;})
+          listCamera({ belongLocal: index }).then((response) => {
+            this.fourVideo = response.rows;
+          });
         }
       }
     },

src/views/peopleChuRu/bdglLeave/index.vue

@@ -83,13 +83,13 @@
         prop="startTime"
         width="200"
       />
-      
+
       <el-table-column
         label="请假结束时间"
         align="center"
         prop="endTime"
         width="200"
-     />
+      />
 
       <el-table-column label="请假类型" align="center" prop="leaveType">
         <template slot-scope="scope">
@@ -112,14 +112,14 @@
         prop="departureTime"
         width="200"
       />
-  
+
       <el-table-column
         label="归队时间"
         align="center"
         prop="returnTime"
         width="200"
       />
-  
+
       <el-table-column label="是否归队" align="center" prop="isReturn">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_is" :value="scope.row.isReturn" />
@@ -454,12 +454,12 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批人" prop="peopleId2">
+        <el-form-item label="连级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder="请输入一级审批人"
+            placeholder="请选择连级审批人"
             ref="abcdef"
             clearable
             @clear="peopleIdOne"
@@ -475,12 +475,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二级审批人" prop="peopleId2">
+        <el-form-item label="营级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder="请输入二级审批人"
+            placeholder="请选择营级审批人"
             ref="abcde"
             clearable
             @clear="peopleIdTwo"
@@ -496,12 +496,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="三级审批人" prop="peopleId3">
+        <el-form-item label="政治审批人" prop="peopleId3">
           <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder="请输入三级审批人"
+            placeholder="请选择政治审批人"
             ref="abcd"
             clearable
             @clear="peopleIdThere"
@@ -606,7 +606,7 @@
             clearable
             size="small"
             v-model="form.startTime"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             placeholder="选择请假开始时间"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -619,7 +619,7 @@
             size="small"
             v-model="form.endTime"
             placeholder="选择请假结束时间"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
@@ -644,7 +644,7 @@
             size="small"
             v-model="form.departureTime"
             placeholder="请输入离队时间"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
@@ -656,19 +656,19 @@
             clearable
             size="small"
             v-model="form.returnTime"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             placeholder="选择归队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批人" prop="peopleId2">
+        <el-form-item label="连级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder="请输入一级审批人"
+            placeholder="请选择连级审批人"
             ref="abcdef"
             :disabled="xiugai"
             clearable
@@ -684,12 +684,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二级审批人" prop="peopleId2">
+        <el-form-item label="营级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder="请输入二级审批人"
+            placeholder="请选择营级审批人"
             ref="abcde"
             :disabled="xiugai"
             clearable
@@ -705,12 +705,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="三级审批人" prop="peopleId3">
+        <el-form-item label="政治审批人" prop="peopleId3">
           <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder="请输入三级审批人"
+            placeholder="请选择政治审批人"
             ref="abcd"
             :disabled="xiugai"
             clearable
@@ -859,7 +859,7 @@
             clearable
             size="small"
             v-model="form.departureTime"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             placeholder="选择离队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -881,12 +881,12 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批人" prop="peopleId2">
+        <el-form-item label="连级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder="请输入一级审批人"
+            placeholder=""
             ref="abcdef"
             disabled
             clearable
@@ -902,12 +902,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二级审批人" prop="peopleId2">
+        <el-form-item label="营级审批人" prop="peopleId2">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入二级审批人" /> -->
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder="请输入二级审批人"
+            placeholder=""
             ref="abcde"
             disabled
             clearable
@@ -923,12 +923,12 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="三级审批人" prop="peopleId3">
+        <el-form-item label="政治审批人" prop="peopleId3">
           <!-- <el-input v-model="form.peopleId3" placeholder="请输入三级审批人" /> -->
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder="请输入三级审批人"
+            placeholder=""
             ref="abcd"
             disabled
           >
@@ -1052,7 +1052,7 @@
             clearable
             size="small"
             v-model="form.endTime"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             placeholder="选择请假结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -1079,7 +1079,7 @@
             clearable
             size="small"
             v-model="form.departureTime"
-           type="datetime"
+            type="datetime"
             default-time="00:00:00"
             placeholder="选择离队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -1092,7 +1092,7 @@
             clearable
             size="small"
             v-model="form.returnTime"
-             type="datetime"
+            type="datetime"
             default-time="00:00:00"
             placeholder="选择归队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -1100,11 +1100,11 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批人" prop="peopleId1">
+        <el-form-item label="连级审批人" prop="peopleId1">
           <el-select
             v-model="form.peopleId1"
             filterable
-            placeholder="请输入一级审批人"
+            placeholder=""
             ref="abcdef"
             disabled
           >
@@ -1118,11 +1118,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="二级审批人" prop="peopleId2">
+        <el-form-item label="营级审批人" prop="peopleId2">
           <el-select
             v-model="form.peopleId2"
             filterable
-            placeholder="请输入二级审批人"
+            placeholder=""
             ref="abcde"
             disabled
           >
@@ -1136,11 +1136,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="三级审批人" prop="peopleId3">
+        <el-form-item label="政治审批人" prop="peopleId3">
           <el-select
             v-model="form.peopleId3"
             filterable
-            placeholder="请输入三级审批人"
+            placeholder=""
             ref="abcd"
             disabled
           >