详情缩小距离

gassafety-web/src/views/dataMonitoring/alarmdetail/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -11,7 +11,7 @@
         </el-col>
       </el-row>
 
-      <el-row style="width: 100%;height: 45px;">
+      <el-row style="width: 100%;height: 40px;">
         <el-col :span="24">
           <div style="">
             <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">报警信息管理详情</li></ul>
@@ -19,7 +19,7 @@
         </el-col>
       </el-row>
       <el-divider></el-divider>
-      <el-row style="padding-left: 50px;">
+      <el-row style="padding-left: 50px;margin-top: -10px;margin-bottom: -10px;">
         <el-col :span="6">
           <el-form ref="form" v-model="form" style="width: 100%;">
             <el-form-item label="设备类型:" prop="deviceType">
@@ -71,8 +71,8 @@
         </el-col>
       </el-row>
       <el-divider></el-divider>
-      <el-row style="width: 100%;height: 45px;">
-        <el-col :span="24">
+      <el-row style="width: 100%;height: 45px;margin-top: -15px;">
+        <el-col :span="24" style="margin-bottom: -10px;">
           <div style="color: #31EAEA;">
             <ul><li>设备详情</li></ul>
           </div>

gassafety-web/src/views/dataMonitoring/realtimedetail/index.vue

@@ -3,7 +3,7 @@
     <div style="padding-top: 10px;background: #fff;height: 100%;">
 
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -11,8 +11,8 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;height: 45px;">
-        <el-col :span="24">
+      <el-row style="width: 100%;height: 40px;">
+        <el-col :span="24" style="margin-bottom: -10px;">
           <div style="">
             <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">实时数据详情</li></ul>
           </div>

gassafety-web/src/views/device/deviceInfoDetail/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -11,7 +11,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;height: 45px;">
+      <el-row style="width: 100%;height: 40px;">
         <el-col :span="24">
           <div style="">
             <ul>
@@ -21,7 +21,7 @@
         </el-col>
       </el-row>
       <el-divider></el-divider>
-      <el-row style="width: 100%;">
+      <el-row style="width: 100%;margin-top: -15px;margin-bottom: -5px;">
         <el-col :span="24">
           <div style="color: #31EAEA;height: 25px;">
             <ul>
@@ -31,7 +31,7 @@
         </el-col>
       </el-row>
 
-      <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
+      <el-row style="width: 100%;padding: 10px;">
         <el-col :span="5">
           <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
             <el-form-item label="设备名称:" prop="deviceName">
@@ -92,13 +92,13 @@
         </el-col>
         <el-col :span="11">
           <div id="marbox"
-            style="width: 100%;height: 390px;margin-top: -35px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+            style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </el-col>
       </el-row>
 
-      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
+      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 5px;">
         <el-button size="normal" type="primary" icon="el-icon-edit" @click="handleUpdate(form)"
           v-hasPermi="['device:deviceInfo:edit']">修改</el-button>
         <el-button size="normal" type="primary" icon="el-icon-delete" @click="handleDelete(form)"

gassafety-web/src/views/device/pipeDetail/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container detail" style="background-color: rgb(238, 241, 245);">
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -11,7 +11,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;height: 45px;">
+      <el-row style="width: 100%;height: 40px;">
         <el-col :span="24">
           <div style="">
             <ul>
@@ -22,7 +22,7 @@
       </el-row>
       <el-divider></el-divider>
 
-      <el-row style="width: 100%;">
+      <el-row style="width: 100%;margin-top: -15px;margin-bottom: -5px;">
         <el-col :span="24">
           <div style="color: #31EAEA;height: 25px;">
             <ul>
@@ -31,7 +31,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
+      <el-row style="width: 100%;padding: 10px;">
         <el-col :span="5">
           <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
             <el-form-item label="管道名称:" prop="pipeName">
@@ -78,13 +78,13 @@
         </el-col>
         <el-col :span="11">
           <div id="marbox"
-            style="width: 100%;height: 390px;margin-top: -35px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
+            style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
             <div style="width: 100%;height: 100%" id="container"></div>
           </div>
         </el-col>
       </el-row>
 
-      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
+      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 5px;">
         <el-button size="normal" type="primary" icon="el-icon-edit" @click="handleUpdate(form)"
           v-hasPermi="['device:pipe:edit']">修改</el-button>
         <el-button size="normal" type="primary" icon="el-icon-delete" @click="handleDelete(form)"

gassafety-web/src/views/deviceInspection/inspectiondetail/index.vue

@@ -3,7 +3,7 @@
     <!-- 巡检计划信息 -->
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -12,7 +12,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;height: 45px;">
+      <el-row style="width: 100%;height: 40px;">
         <el-col :span="24">
           <div style="">
             <ul>
@@ -23,7 +23,7 @@
       </el-row>
       <el-divider></el-divider>
 
-      <el-row style="width: 100%;">
+      <el-row style="width: 100%;margin-top: -15px;">
         <el-col :span="24">
           <div style="color: #31EAEA;height: 25px;">
             <ul>
@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
 
-      <el-row style="width: 100%;padding: 10px;">
+      <el-row style="width: 100%;padding: 10px;margin-bottom: -5px;margin-top: -5px;">
         <el-col :span="12">
           <el-col :span="12">
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px"
@@ -96,7 +96,7 @@
       <!-- 接单信息 -->
       <el-row v-if="this.form.orderId != null && this.form.orderId != ''">
         <el-divider></el-divider>
-        <el-col :span="24">
+        <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul>
               <li>接单信息</li>
@@ -134,8 +134,8 @@
 
 
       </div>
-      <el-divider></el-divider>
-      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;" v-if="form.planStatus == 0">
+      <!-- <el-divider></el-divider> -->
+      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 15px;" v-if="form.planStatus == 0">
         <el-button size="normal" type="primary" icon="el-icon-edit" @click="handleIssue(form.planId)"
           v-hasPermi="['workOrder:basicsInfo:add']">生成工单
         </el-button>

gassafety-web/src/views/riskManagement/hiddenTroubleDetail/index.vue

@@ -3,7 +3,7 @@
       <!-- 巡检计划信息 -->
       <div style="padding-top: 10px;background: #fff;height: 100%;">
         <el-row>
-          <el-col :span="24" style="padding-left: 15px;">
+          <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
             <div style="height: 45px;" @click="$router.go(-1)">
               <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
               </el-button>
@@ -11,7 +11,7 @@
             </div>
           </el-col>
         </el-row>
-        <el-row style="width: 100%;height: 45px;">
+        <el-row style="width: 100%;height: 40px;">
           <el-col :span="24">
             <div style="">
               <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">隐患管理详情</li></ul>
@@ -20,7 +20,7 @@
         </el-row>
         <el-divider></el-divider>
 
-        <el-row style="width: 100%;">
+        <el-row style="width: 100%;margin-top: -15px;margin-bottom: -5px;">
           <el-col :span="24">
             <div style="color: #31EAEA;height: 25px;">
               <ul><li>详细信息</li></ul>
@@ -28,7 +28,7 @@
           </el-col>
         </el-row>
 
-        <el-row style="width: 100%;padding: 10px;">
+        <el-row style="width: 100%;padding: 10px;margin-bottom: -20px;">
           <el-col :span="12">
             <el-col :span="12">
               <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;margin-bottom: 25px;">
@@ -80,12 +80,12 @@
         <!-- 接单信息 -->
         <el-row v-if="form.orderId != null && form.orderId != ''" style="width: 100%;">
           <el-divider></el-divider>
-          <el-col :span="24">
+          <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
             <div style="color: #31EAEA;width: 100%;height: 40px;">
               <ul><li>接单信息</li></ul>
             </div>
           </el-col>
-          <el-row style="width: 100%;padding-left: 10px;">
+          <el-row style="width: 100%;padding-left: 10px;margin-bottom: 10px;">
             <el-col :span="5">
               <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
                 <el-form-item label="下发人员:" prop="appointInspectorName">
@@ -111,9 +111,9 @@
             </el-col>
           </el-row>
         </el-row>
-        <el-divider></el-divider>
         <!-- 处置信息 -->
-        <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
+        <div style="width: 100%;font-weight: 600;margin-top: -15px;" v-if="form.feedbackList != null">
+          <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>处置信息</li></ul>
           </div>
@@ -171,16 +171,16 @@
             </el-timeline>
           </div>
           <div style="width: 95%;position: relative;" @click="changeDisplay(scope)">
-            <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;">
-              <span style="text-decoration:underline">显示全部</span>
+            <i class="el-icon-arrow-down" v-if="isDisplay==false" style="margin-left: 100px;color: #909399;font-size: 14px;margin-bottom: 15px;">
+              <span style="text-decoration:underline;">显示全部</span>
             </i>
-            <i class="el-icon-arrow-up" v-else style="color: #909399;font-size: 14px;margin-left: 100px;">
-              <span style="text-decoration:underline">收起</span>
+            <i class="el-icon-arrow-up" v-else style="color: #909399;font-size: 14px;margin-left: 100px;margin-bottom: 15px;">
+              <span style="text-decoration:underline;">收起</span>
             </i>
           </div>
         </div>
 
-        <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;" v-if="form.orderId == '' || form.orderId == null">
+        <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;margin-top: 20px;" v-if="form.orderId == '' || form.orderId == null">
           <el-button
             size="normal"
             type="primary"

gassafety-web/src/views/workOrder/detail/index.vue

@@ -3,7 +3,7 @@
     <!-- 工单信息 -->
     <div style="padding-top: 10px;background: #fff;height: 100%;">
       <el-row>
-        <el-col :span="24" style="padding-left: 15px;">
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
           <div style="height: 45px;" @click="$router.go(-1)">
             <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
             </el-button>
@@ -12,7 +12,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;height: 45px;">
+      <el-row style="width: 100%;height: 40px;">
         <el-col :span="24">
           <div style="">
             <ul>
@@ -33,7 +33,7 @@
 
 
 
-      <el-row style="width: 100%;">
+      <el-row style="width: 100%;margin-top: -15px;">
         <el-col :span="24">
           <div style="color: #31EAEA;height: 25px;">
             <ul>
@@ -42,7 +42,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
+      <el-row style="width: 100%;padding: 10px;padding-left: 40px;margin-bottom: -10px;">
         <el-col :span="6">
           <el-form ref="form" v-model="form" :rules="rules" style="width: 100%;">
             <el-form-item label="工单类型:" prop="orderType" style="margin-bottom: 0px;">
@@ -109,17 +109,15 @@
 
       <div v-if="form.actualTime != '' && form.actualTime != null">
         <el-divider></el-divider>
-        <el-row>
-          <el-col :span="24">
+          <el-col :span="24" style="margin-top: -15px;margin-bottom: -10px;">
             <div style="color: #31EAEA;width: 100%;height: 40px;">
               <ul>
                 <li>接单信息</li>
               </ul>
             </div>
           </el-col>
-        </el-row>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="6"style="margin-bottom: 15px;">
             <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="height: 30px;width: 100%;">
               <el-form-item label="接单人:" prop="actualInspectorName">
                 <font>{{form.actualInspectorName}}</font>
@@ -134,17 +132,17 @@
             </el-form>
           </el-col>
         </el-row>
-        <el-divider></el-divider>
       </div>
 
       <!-- 反馈信息 -->
       <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
+        <el-divider></el-divider>
         <div style="color: #31EAEA;width: 100%;height: 40px;">
           <ul>
             <li>反馈信息</li>
           </ul>
         </div>
-        <div class="block" style="width: 95%;margin-left: 2%;">
+        <div class="block" style="width: 95%;">
           <el-timeline ref="timeline">
             <el-timeline-item v-for="(activity, index) in form.feedbackList" v-show='index>1?false:true' :key="index"
               :timestamp="activity.feedbackTime">
@@ -183,17 +181,17 @@
                     <div class="feedbackTime-div">
                       <div class="feedbackTime">
                         <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]"
-                          v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;">
+                          v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 100%;">
                         </el-image>
                       </div>
                       <div class="feedbackTime">
                         <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"
-                          v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 90px;">
+                          v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 100%;">
                         </el-image>
                       </div>
                       <div class="feedbackTime">
                         <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"
-                          v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;">
+                          v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 100%;">
                         </el-image>
                       </div>
                     </div>
@@ -250,10 +248,10 @@
 
       <!-- 归档 -->
 
-      <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
-        <el-button type="primary" size="normal" icon="el-icon-edit" @click="handleUpdate(form.orderId)"
+      <div class="" style="width: 95%;margin-left: 50px;text-align: center;margin-top: 10px;">
+        <el-button style="margin-bottom: 15px;" type="primary" size="normal" icon="el-icon-edit" @click="handleUpdate(form.orderId)"
           v-hasPermi="['workOrder:basicsInfo:edit']" v-if="form.orderStatus == 0">修改</el-button>
-        <el-button type="primary" size="normal" icon="el-icon-edit" @click="handleFinish(form.orderId)"
+        <el-button style="margin-bottom: 15px;" type="primary" size="normal" icon="el-icon-edit" @click="handleFinish(form.orderId)"
           v-hasPermi="['workOrder:basicsInfo:editStatus']" v-if="form.orderStatus == 2">归档</el-button>
         <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -632,23 +630,22 @@
   }
 
   .feedbackTime-div {
+    width: 100%;
     float: left;
     margin-left: 150px;
     margin-top: 10px;
   }
 
   .feedbackTime {
-    height: 120px;
-    width: 120px;
+    width: 15%;
     float: left;
     margin-left: 15px;
     margin-top: 5px;
-    margin-bottom: 15px;
+    margin-bottom: 5px;
     display: flex;
     justify-content: center;
     align-items: center;
   }
-
   .el-card__body {
     padding: 5px 20px 20px 20px;
   }

gassafety-web/src/views/workOrder/feedbackdetail/index.vue

@@ -3,7 +3,7 @@
       <!-- 工单信息 -->
       <div style="padding-top: 10px;background: #fff;height: 100%;">
         <el-row>
-          <el-col :span="24" style="padding-left: 15px;">
+          <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
             <div style="height: 45px;" @click="$router.go(-1)">
               <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
               </el-button>
@@ -11,7 +11,7 @@
             </div>
           </el-col>
         </el-row>
-        <el-row style="width: 100%;height: 45px;">
+        <el-row style="width: 100%;height: 40px;">
           <el-col :span="24">
             <div style="">
               <ul><li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">工单反馈详情</li></ul>
@@ -27,14 +27,14 @@
           </el-steps>
 
           <el-divider></el-divider>
-          <el-row style="width: 100%;">
+          <el-row style="width: 100%;margin-top: -15px;">
             <el-col :span="24">
               <div style="color: #31EAEA;height: 25px;">
                 <ul><li>详细信息</li></ul>
               </div>
             </el-col>
           </el-row>
-          <el-row style="width: 100%;padding: 10px;padding-left: 40px;">
+          <el-row style="width: 100%;padding: 10px;padding-left: 40px;margin-bottom: -10px;">
             <el-col :span="6">
               <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="width: 100%;">
                 <el-form-item label="工单类型:" prop="orderType">
@@ -108,7 +108,7 @@
         <!-- 接单信息 -->
         <div v-if="form.actualTime != '' && form.actualTime != null">
           <el-divider></el-divider>
-          <el-row>
+          <el-row style="margin-top: -15px;">
             <el-col :span="24">
               <div style="color: #31EAEA;width: 100%;height: 40px;">
                 <ul><li>接单信息</li></ul>
@@ -132,13 +132,13 @@
             </el-col>
           </el-row>
         </div>
-        <el-divider></el-divider>
         <!-- 反馈信息 -->
         <div style="width: 100%;font-weight: 600;" v-if="form.feedbackList != null">
+          <el-divider></el-divider>
           <div style="color: #31EAEA;width: 100%;height: 40px;">
             <ul><li>反馈信息</li></ul>
           </div>
-              <div class="block" style="width: 95%;margin-left: 2%;">
+              <div class="block" style="width: 95%;">
                 <el-timeline ref="timeline">
                   <el-timeline-item v-for="(activity, index) in form.feedbackList"  v-show='index>1?false:true' :key="index" :timestamp="activity.feedbackTime">
                     <el-card>
@@ -174,13 +174,13 @@
                         <el-col :span="12">
                           <div class="feedbackTime-div">
                             <div class="feedbackTime">
-                              <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image>
+                              <el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 100%;"></el-image>
                             </div>
                             <div class="feedbackTime">
-                              <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"  v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 90px;"></el-image>
+                              <el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]"  v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 100%;"></el-image>
                             </div>
                             <div class="feedbackTime">
-                              <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image>
+                              <el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]"  v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 100%;"></el-image>
                             </div>
                           </div>
                         </el-col>
@@ -201,11 +201,12 @@
 
         <!-- 归档 -->
 
-        <div class="" style="width: 95%; height: 60px;margin-left: 50px;text-align: center;">
+        <div class="" style="width: 95%;margin-left: 50px;text-align: center;margin-top: 10px;">
           <el-button
             type="primary"
             size="normal"
             icon="el-icon-edit"
+            style="margin-bottom: 15px;"
             @click="handleFeedback(form.orderId)"
             v-hasPermi="['workOrder:basicsInfo:editStatus']"
             v-if="form.orderStatus == 1 || form.orderStatus == 2"
@@ -554,15 +555,17 @@ export default {
       margin: 20px 0;
     }
     .feedbackTime-div{
-      float: left;margin-left: 150px;margin-top: 10px;
+      width: 100%;
+      float: left;
+      margin-left: 150px;
+      margin-top: 10px;
     }
     .feedbackTime{
-      height: 120px;
-      width: 120px;
+      width: 15%;
       float: left;
       margin-left: 15px;
       margin-top: 5px;
-      margin-bottom: 15px;
+      margin-bottom: 5px;
       display: flex;
       justify-content: center;
       align-items: center;