diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 8dad5dd..ad5f60e 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -196,6 +196,16 @@
           >
         </template>
       </el-table-column>
+      <el-table-column 
+        label="处理状态" 
+        align="center"
+        prop="orderStatus" />
+      <el-table-column
+        label="报修去向"
+        align="center"
+        prop="repairDestination"
+        width="120"
+      />
       <el-table-column
         label="设备编码"
         align="center"
@@ -252,16 +262,6 @@
         prop="orderConnection"
         width="120"
       />
-      <el-table-column 
-        label="处理状态" 
-        align="center"
-        prop="orderStatus" />
-      <el-table-column
-        label="报修去向"
-        align="center"
-        prop="repairDestination"
-        width="120"
-      />
       <el-table-column
         label="创建人"
         align="center"
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 4318ed4..6edbc7a 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -894,12 +894,14 @@
                 :contentStyle="CS"
                 :label-style="LS_WRITE_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlBeforeLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlBeforeLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="1" border>
               <el-descriptions-item
@@ -907,12 +909,14 @@
                 :contentStyle="CS"
                 :label-style="LS_WRITE_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlAfterLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlAfterLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
 
@@ -2288,6 +2292,11 @@ export default {
   height: 400px;
   overflow-y: auto;
 }
+
+.view_picture_body {
+  height: 300px;
+  overflow-y: auto;
+}
 </style>
 
 
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index 47948bc..35ecbbf 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -204,6 +204,19 @@
           }}</el-button>
         </template>
       </el-table-column>
+      <el-table-column
+        label="维修状态"
+        align="center"
+        prop="workStatus"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_repair_status"
+            :value="scope.row.workStatus"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="报修单号"
         align="center"
@@ -308,25 +321,8 @@
         align="center"
         prop="workCostTime"
         width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workCostTime) }}</span>
-        </template>
-      </el-table-column>
+      ></el-table-column>
       <el-table-column label="维修费用" align="center" prop="workCost" />
-      <el-table-column
-        label="维修状态"
-        align="center"
-        prop="workStatus"
-        width="150"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.device_repair_status"
-            :value="scope.row.workStatus"
-          />
-        </template>
-      </el-table-column>
       <el-table-column label="工厂编码" align="center" prop="factoryCode" />
     </el-table>
 
@@ -397,15 +393,17 @@
             <el-descriptions :column="1" border>
               <el-descriptions-item
                 label="维修前故障图片"
-                :contentStyle="CS"
-                :label-style="LS"
+                :contentStyle="CS_IMG"
+                :label-style="LS_BEFORE_IMG"
               >
-                <el-image
-                  v-for="(item, index) in urlBeforeLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlBeforeLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
 
@@ -482,16 +480,18 @@
             <el-descriptions
               :column="1"
               border
-              :contentStyle="CS"
-              :label-style="LS"
+              :contentStyle="CS_IMG"
+              :label-style="LS_AFTER_IMG"
             >
               <el-descriptions-item label="维修后图片">
-                <el-image
-                  v-for="(item, index) in urlAfterLists"
-                  :key="index"
-                  :src="item"
-                ></el-image
-              ></el-descriptions-item>
+                <div class="view_picture_body">
+                  <el-image
+                    v-for="(item, index) in urlAfterLists"
+                    :key="index"
+                    :src="item"
+                  ></el-image>
+                </div>
+              </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
 
@@ -613,6 +613,18 @@ export default {
         "text-align": "center",
         width: "200px",
       },
+      //表格样式
+      CS_IMG: {
+        "text-align": "center",
+      },
+      LS_BEFORE_IMG: {
+        "text-align": "center",
+        width: "190px",
+      },
+      LS_AFTER_IMG: {
+        "text-align": "center",
+        width: "280px",
+      },
       //检查项表格数据
       detailList: [],
       //维修前照片
@@ -828,6 +840,8 @@ export default {
             urlBeforeLists.push(item.url);
           });
           this.urlBeforeLists = urlBeforeLists;
+        }else{
+          this.urlBeforeLists = null;
         }
 
         //遍历response.data.afterRepairFiles
@@ -846,6 +860,8 @@ export default {
             urlAfterLists.push(item.url);
           });
           this.urlAfterLists = urlAfterLists;
+        }else{
+          this.urlAfterList = null;
         }
 
         //重置
@@ -891,7 +907,6 @@ export default {
           });
 
           this.detailList = standards;
-          console.log("111111111111", this.detailList);
         }
 
         //展示
@@ -972,5 +987,10 @@ export default {
   height: 400px;
   overflow-y: auto;
 }
+
+.view_picture_body {
+  height: 300px;
+  overflow-y: auto;
+}
 </style>