点检、巡检、保养图片上传和显示

src/views/device/deviceOrder/index.vue

@@ -225,7 +225,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -238,7 +238,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -357,12 +357,12 @@
           <span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="执行开始时间" align="center" prop="orderStart">
+      <el-table-column v-if="false" width="120" label="执行开始时间" align="center" prop="orderStart">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="120" label="执行结束时间" align="center" prop="orderEnd">
+      <el-table-column v-if="false" width="120" label="执行结束时间" align="center" prop="orderEnd">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
         </template>
@@ -545,8 +545,8 @@
             <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
             <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
             <el-descriptions-item label="循环结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
             <el-descriptions-item label="巡检人">{{ workVO.order.planPerson }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
           </el-descriptions>
@@ -599,6 +599,26 @@
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                prop="picturePath"
+                label="图片">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="right"
+                    width="300"
+                    trigger="hover">
+                    <div class="demo-image__lazy">
+                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
+                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
+                        <el-image
+                          :src="url"
+                        ></el-image>
+                      </div>
+                    </div>
+                    <el-button slot="reference">图片</el-button>
+                  </el-popover>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -926,3 +946,9 @@ export default {
   }
 };
 </script>
+<style>
+.demo-image__lazy{
+  height: 400px;
+  overflow-y: auto;
+}
+</style>

src/views/device/inspectionPlan/index.vue

@@ -286,7 +286,7 @@
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
       <el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
       <el-table-column width="150" label="计划编码" align="center" prop="planCode"/>
-      <el-table-column width="120" label="计划名称" align="center" prop="planName"/>
+      <el-table-column width="200" label="计划名称" align="center" prop="planName"/>
       <el-table-column width="100" label="车间编码" align="center" prop="planWorkshop"/>
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine"/>

src/views/device/inspectionWork/index.vue

@@ -484,6 +484,26 @@
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                prop="picturePath"
+                label="图片">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="right"
+                    width="300"
+                    trigger="hover">
+                    <div class="demo-image__lazy">
+                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
+                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
+                        <el-image
+                          :src="url"
+                        ></el-image>
+                      </div>
+                    </div>
+                    <el-button slot="reference">图片</el-button>
+                  </el-popover>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -785,5 +805,8 @@ export default {
 };
 </script>
 <style>
-
+.demo-image__lazy{
+  height: 400px;
+  overflow-y: auto;
+}
 </style>

src/views/device/maintenanceWork/index.vue

@@ -540,6 +540,26 @@
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                prop="picturePath"
+                label="图片">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="right"
+                    width="300"
+                    trigger="hover">
+                    <div class="demo-image__lazy">
+                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
+                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
+                        <el-image
+                          :src="url"
+                        ></el-image>
+                      </div>
+                    </div>
+                    <el-button slot="reference">图片</el-button>
+                  </el-popover>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -850,4 +870,8 @@ export default {
 .my-margin-top{
   margin-top: 10px;
 }
+.demo-image__lazy{
+  height: 400px;
+  overflow-y: auto;
+}
 </style>

src/views/device/spotInspectionOrder/index.vue

@@ -236,7 +236,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -249,7 +249,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"
@@ -348,12 +348,12 @@
 					<span>{{ parseTime(scope.row.planLoopEnd, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column width="120" label="执行开始时间" align="center" prop="orderStart">
+			<el-table-column  v-if="false" width="120" label="执行开始时间" align="center" prop="orderStart">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.orderStart, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column width="120" label="执行结束时间" align="center" prop="orderEnd">
+			<el-table-column v-if="false" width="120" label="执行结束时间" align="center" prop="orderEnd">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
 				</template>
@@ -441,12 +441,13 @@
               >
               </el-table-column>
               <el-table-column
-                width="180"
+                width="170"
                 prop="standardName"
                 label="标准名称"
               >
               </el-table-column>
               <el-table-column
+                width="110"
                 prop="detailReach"
                 label="是否达标">
                 <template slot-scope="scope">
@@ -478,10 +479,18 @@
                 </template>
               </el-table-column>
               <el-table-column
-                width="80"
+                width="60"
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                width="300"
+                prop="detailUnit"
+                label="图片上传">
+                <template slot-scope="scope">
+                  <FileUpload v-model="scope.row.picturePath" />
+                </template>
+              </el-table-column>
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="工单信息修改">
@@ -536,8 +545,8 @@
             <el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
             <el-descriptions-item label="循环开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
             <el-descriptions-item v-if="false" label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
-            <el-descriptions-item label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
-            <el-descriptions-item label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
+            <el-descriptions-item v-if="false" label="执行结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
             <el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item>
             <el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
           </el-descriptions>
@@ -590,6 +599,26 @@
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                prop="picturePath"
+                label="图片">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="right"
+                    width="300"
+                    trigger="hover">
+                    <div class="demo-image__lazy">
+                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
+                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
+                        <el-image
+                          :src="url"
+                        ></el-image>
+                      </div>
+                    </div>
+                    <el-button slot="reference">图片</el-button>
+                  </el-popover>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -599,6 +628,7 @@
     <el-button type="primary" @click="workDetail = false">确 定</el-button>
   </span>
     </el-dialog>
+
 	</div>
 </template>
 
@@ -613,8 +643,6 @@ export default {
   dicts: ['device_order_status', 'device_loop_type','device_reach_standard'],
 	data() {
 		return {
-      dialogImageUrl: '',
-      dialogVisible: false,
       workDetail:false,
       // 初始化VO
       workVO: {
@@ -928,3 +956,9 @@ export default {
 	}
 };
 </script>
+<style>
+.demo-image__lazy{
+  height: 400px;
+  overflow-y: auto;
+}
+</style>

src/views/device/spotInspectionWork/index.vue

@@ -473,6 +473,26 @@
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                prop="picturePath"
+                label="图片">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="right"
+                    width="300"
+                    trigger="hover">
+                    <div class="demo-image__lazy">
+                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
+                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
+                        <el-image
+                          :src="url"
+                        ></el-image>
+                      </div>
+                    </div>
+                    <el-button slot="reference">图片</el-button>
+                  </el-popover>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -773,4 +793,8 @@ export default {
 .my-margin-top{
   margin-top: 10px;
 }
+.demo-image__lazy{
+  height: 400px;
+  overflow-y: auto;
+}
 </style>

src/views/device/upkeepOrder/index.vue

@@ -1114,6 +1114,26 @@
                 prop="detailUnit"
                 label="单位">
               </el-table-column>
+              <el-table-column
+                prop="picturePath"
+                label="图片">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="right"
+                    width="300"
+                    trigger="hover">
+                    <div class="demo-image__lazy">
+                      <el-empty :image-size="200" v-if="scope.row.checkPictrueList.length == 0"></el-empty>
+                      <div v-for="(url, index) in scope.row.checkPictrueList" :key="index">
+                        <el-image
+                          :src="url"
+                        ></el-image>
+                      </div>
+                    </div>
+                    <el-button slot="reference">图片</el-button>
+                  </el-popover>
+                </template>
+              </el-table-column>
             </el-table>
           </div>
         </el-tab-pane>
@@ -1782,4 +1802,8 @@ export default {
 .el-transfer-panel {
   width: 250px;
 }
+.demo-image__lazy{
+  height: 400px;
+  overflow-y: auto;
+}
 </style>