2 Комити fd82bea2eb ... 40dda283f5

Аутор SHA1 Порука Датум
  wangzhe 40dda283f5 Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0 пре 7 месеци
  wangzhe eef7ee8c6c 安检维修 详情 пре 7 месеци

+ 1 - 1
src/api/gas/order.js

@@ -163,7 +163,7 @@ export function getListWeiXiu(query) {
 //开栓列表
 export function getListKaiShuan(query) {
   return request({
-    url: '/yq/gas/order/getListKaiShuan',
+    url: '/gas/order/getListKaiShuan',
     method: 'get',
     params: query
   })

+ 18 - 2
src/views/zdsz_p1/anjian/index.vue

@@ -177,8 +177,24 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="照片" prop="photoList">
-          <imageUpload v-model="form.photoList"/>
-        </el-form-item>
+          <!--<el-form-item label="照片">-->
+            <el-image
+                v-if="form.photoList && form.photoList.length> 0 && (form.photoList[0].substring(form.photoList[0].lastIndexOf('.')+1)!='mp4')"
+                style="width: 100px; height: 100px"
+                :src="form.photoList[0]"
+                :preview-src-list="form.photoList"
+            >
+            </el-image>
+            <video
+                v-if="form.photoList && form.photoList.length> 0 && (form.photoList[0].substring(form.photoList[0].lastIndexOf('.')+1)=='mp4')"
+                style="width: 100px; height: 100px"
+                :src="form.photoList[0]"
+            >
+            </video>
+            <!--<imageUpload v-model="form.photo" :disabled="true"/>-->
+          </el-form-item>
+          <!--<imageUpload v-model="form.photoList"/>-->
+        <!--</el-form-item>-->
         <el-form-item label="职工" prop="userId">
           <el-select v-model="form.userId" filterable placeholder="请选择职工" disabled>
             <el-option v-for="item in workerList" :key="item.id" :value="item.id" :label="item.name">{{

+ 14 - 1
src/views/zdsz_p1/kaishuan/index.vue

@@ -165,7 +165,20 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="照片" prop="photoList">
-          <imageUpload v-model="form.photoList"/>
+          <el-image
+              v-if="form.photoList && form.photoList.length> 0 && (form.photoList[0].substring(form.photoList[0].lastIndexOf('.')+1)!='mp4')"
+              style="width: 100px; height: 100px"
+              :src="form.photoList[0]"
+              :preview-src-list="form.photoList"
+          >
+          </el-image>
+          <video
+              v-if="form.photoList && form.photoList.length> 0 && (form.photoList[0].substring(form.photoList[0].lastIndexOf('.')+1)=='mp4')"
+              style="width: 100px; height: 100px"
+              :src="form.photoList[0]"
+          >
+          </video>
+          <!--<imageUpload v-model="form.photoList"/>-->
         </el-form-item>
         <el-form-item label="职工" prop="userId">
           <el-select v-model="form.userId" filterable placeholder="请选择职工">

+ 16 - 3
src/views/zdsz_p1/otherEngine/index.vue

@@ -175,10 +175,23 @@
           <el-input v-model="form.address" placeholder="请输入工程地址" disabled/>
         </el-form-item>
         <el-form-item label="照片">
-          <imageUpload v-model="form.photo" :disabled="true"/>
+          <el-image
+              v-if="form.photo && form.photo.length> 0 && (form.photo[0].substring(form.photo[0].lastIndexOf('.')+1)!='mp4')"
+              style="width: 100px; height: 100px"
+              :src="form.photo[0]"
+              :preview-src-list="form.photo"
+          >
+          </el-image>
+          <video
+              v-if="form.photo && form.photo.length> 0 && (form.photo[0].substring(form.photo[0].lastIndexOf('.')+1)=='mp4')"
+              style="width: 100px; height: 100px"
+              :src="form.photo[0]"
+          >
+          </video>
+          <!--<imageUpload v-model="form.photo" :disabled="true"/>-->
         </el-form-item>
-        <el-form-item label="备注" prop="remark" disabled>
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" disabled/>
         </el-form-item>
         <el-form-item label="是否完工" prop="status">
           <el-radio-group v-model="form.status" disabled>

+ 15 - 2
src/views/zdsz_p1/weixiu/index.vue

@@ -144,7 +144,7 @@
             icon="el-icon-view"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['gas:order:edit']"
-          >修改
+          >详情
           </el-button>
           <!--<el-button-->
             <!--size="mini"-->
@@ -177,7 +177,20 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="照片" prop="photoList">
-          <imageUpload v-model="form.photoList"/>
+          <el-image
+              v-if="form.photoList && form.photoList.length> 0 && (form.photoList[0].substring(form.photoList[0].lastIndexOf('.')+1)!='mp4')"
+              style="width: 100px; height: 100px"
+              :src="form.photoList[0]"
+              :preview-src-list="form.photoList"
+          >
+          </el-image>
+          <video
+              v-if="form.photoList && form.photoList.length> 0 && (form.photoList[0].substring(form.photoList[0].lastIndexOf('.')+1)=='mp4')"
+              style="width: 100px; height: 100px"
+              :src="form.photoList[0]"
+          >
+          </video>
+          <!--<imageUpload v-model="form.photoList"/>-->
         </el-form-item>
         <el-form-item label="职工" prop="userId">
           <el-select v-model="form.userId" filterable placeholder="请选择职工" disabled>