ltao 3 년 전
부모
커밋
a0a033f2bd
3개의 변경된 파일25개의 추가작업 그리고 9개의 파일을 삭제
  1. 19 7
      src/views/barracksManagement/checkin/index.vue
  2. 4 1
      src/views/monitoring/camera/index.vue
  3. 2 1
      src/views/taishi/index.vue

+ 19 - 7
src/views/barracksManagement/checkin/index.vue

@@ -16,9 +16,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <!-- <el-form-item label="位置" prop="position">
+      <!-- <el-form-item label="位置" prop="common">
         <el-input
-          v-model="queryParams.position"
+          v-model="queryParams.common"
           placeholder="请输入位置"
           clearable
           size="small"
@@ -124,7 +124,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50"> </el-table-column>
       <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="位置" align="center" prop="position" />
+      <el-table-column label="位置" align="center" prop="common" />
       <el-table-column label="入住人姓名" align="center" prop="occupant" />
       <el-table-column
         label="备注"
@@ -189,10 +189,10 @@
         label-width="100px"
         :inline="true"
       >
-        <el-form-item label="位置" prop="position">
-          <el-input v-model="form.position" />
+        <el-form-item label="位置" prop="common">
+          <el-input v-model="form.common" />
         </el-form-item>
-        <el-form-item label="入单位" prop="unitName">
+        <el-form-item label="入单位" prop="unitName">
           <el-input v-model="form.unitName" />
         </el-form-item>
         <!-- <el-form-item label="单位id" prop="unitId">
@@ -254,6 +254,16 @@ import {
 export default {
   name: "Checkin",
   data() {
+    var validatePass = (rule, value, callback) => {
+      console.log(value)
+      var MobileRegex = /^(\d+)*#+(\d+)$/;
+      if (!MobileRegex.test(value)) {
+        callback(new Error("位置格式不正确!"));
+      }else{
+        console.log("11")
+        callback()
+      }
+    };
     return {
       // 遮罩层
       loading: true,
@@ -292,7 +302,9 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        common: [{ validator: validatePass, trigger: "blur" }],
+      },
     };
   },
   created() {

+ 4 - 1
src/views/monitoring/camera/index.vue

@@ -330,6 +330,7 @@
             <!-- :id="'videoElement' + i" -->
             <video
               autoplay
+             
               controls
               style="
                 width: 100%;
@@ -351,6 +352,7 @@
             class="fourscreen"
           >
             <video
+           
               autoplay
               controls
               style="
@@ -367,6 +369,7 @@
         <div class="video1" v-if="this.btn == 1 && this.dan == true">
           <div v-for="(i, index) in 1" :key="index" class="fullscreen">
             <video
+            
               autoplay
               controls
               style="width: 100%; height: 100%; position: relative"
@@ -604,7 +607,6 @@ export default {
                 setTimeout(() => {
                   videoElement1.play();
                 }, 10);
-                
               }
             }
           }, 1000);
@@ -625,6 +627,7 @@ export default {
       this.singleplayvideo("flvPlayer1", this.url1, "");
     },
     // 单分屏点击事件。
+    // 单分屏点击事件。
     clickhandleitem(data, index) {
       if (this.btn == 0) {
         for (var j of this.flvPlayerList1) {

+ 2 - 1
src/views/taishi/index.vue

@@ -1185,6 +1185,7 @@ export default {
     rizongwenyin().then(res => {
       // console.log(res.data[0])
       this.wylist = res.data;
+      console.log(this.wylist)
     });
     //军车
     juncheguanli().then(res => {
@@ -1387,7 +1388,7 @@ export default {
           ],
           series: [
             {
-              name: "完成率",
+              name: "在位率",
               type: "bar",
               zlevel: 1,
               showBackground: true,