bug修复

src/components/ConstructionDetails/index.vue

@@ -40,10 +40,10 @@
               <span>负责人电话：{{
                   e.headPhone === undefined || e.headPhone === null || e.headPhone === '' ? '无' : e.headPhone
                 }}</span>
-              <span>施工人：{{ e.constructUser }}</span>
-              <span>施工人电话：{{
-                  e.constructPhone === undefined || e.constructPhone === null || e.constructPhone === '' ? '无' : e.constructPhone
-                  }}</span>
+<!--              <span>施工人：{{ e.constructUser }}</span>-->
+<!--              <span>施工人电话：{{-->
+<!--                  e.constructPhone === undefined || e.constructPhone === null || e.constructPhone === '' ? '无' : e.constructPhone-->
+<!--                  }}</span>-->
             </div>
             <hr>
             <!--  用料明细 -->
@@ -345,7 +345,7 @@
           </el-collapse-item>
         </el-collapse>
       </el-tab-pane>
-      <el-button class="check" plain type="danger" @click="checkWorking" v-show="currentStatus == 'check' && reviewStatus && isChecking " style="width: 80px;" :disabled="currentCollapses.length == 0">审核</el-button>
+      <el-button class="check" plain type="danger" @click="checkWorking" v-show="currentStatus == 'check'  && isChecking " style="width: 80px;" :disabled="currentCollapses.length == 0">审核</el-button>
       <el-button class="check" plain type="danger" @click="updateNodeOption" style="width: 94px;cursor: pointer;" v-if="currentStatus != 'check' && status != 'read-only'  ">修改</el-button>
     </el-tabs>
     </el-dialog>
@@ -687,8 +687,8 @@ export default {
       this.currentCollapses[idx].photosAfter = [...arguments][0][0].map(e=>e.url) || [];
     },
   getVideoUrl(_,idx) {
-    this.currentCollapses[idx].Video = [...arguments][0][0].map(e=>e.url) || [];
-    console.log(this.currentCollapses[idx].Video)
+    this.currentCollapses[idx].video = [...arguments][0][0].map(e=>e.url) || [];
+    console.log(this.currentCollapses[idx].video)
   }
   }
 }

src/components/EnginNodeInfo/index.vue

@@ -86,7 +86,7 @@
                         @input="getinferiorSulcusUrl"></ObsImageUpload>
       </el-form-item>
       <el-form-item label="视频" prop="Video" v-if="currentContain.includes('Video')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
-        <ObsVideoUpload ref="Video" :limit="9999" :fileType="['mp4']" :value="nodeInfo.Video"
+        <ObsVideoUpload ref="Video" :limit="9999" :fileType="['mp4']" :value="nodeInfo.video"
                         @input="getVideoUrl"></ObsVideoUpload>
       </el-form-item>
       <el-form-item label="备注" prop="remark" v-if="currentContain.includes('remark')">
@@ -524,7 +524,7 @@ export default {
       this.nodeInfo.inferiorSulcus = this.$refs.inferiorSulcus.fileList ? this.$refs.inferiorSulcus.fileList.map(e=>e.url):[];
     },
     getVideoUrl(url) {
-      this.nodeInfo.Video = this.$refs.Video.fileList ? this.$refs.Video.fileList.map(e=>e.url):[];
+      this.nodeInfo.video = this.$refs.Video.fileList ? this.$refs.Video.fileList.map(e=>e.url):[];
     },
     // 获取材质规格
     getEnginSpecificationsList(e,idx){

src/components/ObsVideoUpload/index.vue

@@ -159,11 +159,15 @@ export default {
       const canvas = document.createElement('canvas');
       const video = document.createElement('video');
       document.body.appendChild(video);
+      video.setAttribute("autoplay", "autoplay");
       video.setAttribute('crossOrigin', 'anonymous');
       canvas.width = video.clientWidth ? video.clientWidth : 320;
       canvas.height = video.clientHeight ? video.clientHeight : 320;
       //video.style.height = '0';
-      video.addEventListener('loadeddata', () =>  {
+      //debugger
+      video.setAttribute('src', file.url);
+      video.addEventListener('canplay', () =>  {
+        debugger
           canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
           let b64 = canvas.toDataURL('image/png');
           let videoUrl = file.url;
@@ -171,7 +175,13 @@ export default {
           file.videoUrl = videoUrl; // file的videoUrl储存视频
           document.body.removeChild(video);
       });
-      video.setAttribute('src', file.url);
+      canvas.toBlob((blob) => {
+        console.log('截图成功！',blob)
+      });
+
+      console.log(file)
+      console.log(video)
+      console.log(canvas)
       // video.oncanplay =function getVideoCover() {
       //   canvas.width = video.clientWidth ? video.clientWidth : 320; // 获取视频宽度
       //   canvas.height = video.clientHeight ? video.clientHeight : 320; //获取视频高度
@@ -282,7 +292,7 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
       this.type=file.name.slice(file.name.lastIndexOf(".")+1);
-      this.getVideoCover(file);
+      //this.getVideoCover(file);
       console.log(this.type)
     },
     // 对象转成指定字符串分隔

src/views/zdsz/engineeringCivil/index.vue

@@ -876,7 +876,18 @@ export default {
           ]
         },
         {
-          name: '报警器切断阀',
+          name: '报警器',
+          components: [
+            [
+              'brand',                                 // 品牌
+            ],
+            'constructTime',                           // 施工时间
+            'zEngiineeringPhotoBoList',                // 照片
+            // 'remark',                                  // 施工内容
+          ]
+        },
+        {
+          name: '切断阀',
           components: [
             [
               'brand',                                 // 品牌

src/views/zdsz/house/index.vue

@@ -55,9 +55,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号" prop="photo">
+      <el-form-item label="手机号" prop="phone">
         <el-input
-          v-model="queryParams.photo"
+          v-model="queryParams.phone"
           placeholder="请输入手机号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -133,8 +133,8 @@
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="户主姓名" align="center" prop="houseUserName" show-overflow-tooltip/>
       <el-table-column label="身份证" align="center" prop="idCard" show-overflow-tooltip/>
-      <el-table-column label="手机号" align="center" prop="photo" show-overflow-tooltip/>
-      <el-table-column label="现主人电话" align="center" prop="newPhoto" show-overflow-tooltip/>
+      <el-table-column label="手机号" align="center" prop="phone" show-overflow-tooltip/>
+      <el-table-column label="现主人电话" align="center" prop="newPhone" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -227,15 +227,11 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="户主手机号" prop="photo">
-              <el-input v-model="form.photo" placeholder="请输入" maxlength="11"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="现主人电话" prop="newPhoto">
-              <el-input v-model="form.newPhoto" placeholder="请输入" maxlength="11"/>
+            <el-form-item label="户主手机号" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入" maxlength="11"/>
             </el-form-item>
           </el-col>
+
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
@@ -244,6 +240,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="15">
+          <el-form-item label="现主人电话" prop="newPhone">
+            <el-table :data="newPhone" style="width: 100%">
+              <el-table-column
+              type="index"
+              width="50">
+            </el-table-column>
+              <el-table-column
+                prop="newPhone"
+                label="联系方式"
+                width="180">
+              </el-table-column></el-table>
+          </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-button type="success">新增</el-button>
+            </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -294,7 +309,7 @@ export default {
         name: undefined,
         houseUserName: undefined,
         idCard: undefined,
-        photo: undefined,
+        phone: undefined,
       },
       // 表单参数
       form: {},
@@ -322,6 +337,7 @@ export default {
       areas: [],
       builds: [],
       units: [],
+      newPhone:[]
     };
   },
   created() {
@@ -403,8 +419,8 @@ export default {
         updateTime: undefined,
         houseUserName: undefined,
         idCard: undefined,
-        photo: undefined,
-        newPhoto: undefined
+        phone: undefined,
+        newPhone: undefined
       };
       this.resetForm("form");
     },
@@ -457,6 +473,15 @@ export default {
         })
         this.loading = false;
         this.form = response.data;
+        if(this.form.newPhone!=null)
+        {
+          let name=""
+             name=this.form.newPhone
+          console.log(name)
+          // this.form.newPhone.splice(',').forEach(item=>{
+          //   this.newPhone.push({phone:item})
+          // })
+        }
         this.open = true;
         this.title = "修改房间管理";
       });