Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

.env.development

@@ -15,6 +15,9 @@ VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
+# VUE_APP_BASE_API = 'http://localhost:8080'
+# 55环境
+# VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 #VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
 #VUE_APP_BASE_API = 'http://10.87.21.103:8080'

src/views/core/drill/task/dialog.info.vue

@@ -65,6 +65,7 @@
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"
+            span="2"
             label="预设案由"
           >
             <!-- {{ formData.presetCase }} -->
@@ -72,6 +73,7 @@
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"
+            span="2"
             label="演练情况"
           >
             {{ formData.drillSituation }}
@@ -92,7 +94,7 @@
                   formData.categoryText
                 }}
               </el-form-item>
-            </el-col> 
+            </el-col>
             <el-col :span="12">
               <el-form-item prop="type" label="任务进度">{{
                   getLabel(dict.type.drill_task_status, formData.status,"未知")
@@ -166,7 +168,7 @@
               </el-form-item>
             </el-col>
 
-          
+
             <el-col :span="12">
               <el-form-item prop="dueCount" label="参与人员">{{
                   formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
@@ -181,13 +183,13 @@
                 }}
               </el-form-item>
             </el-col>
-           
+
             <el-col :span="12">
               <el-form-item prop="imageList" label="演练图片">
                 <ImageListPreview v-model="formData.imageList"></ImageListPreview>
               </el-form-item>
             </el-col>
-         
+
             <el-col :span="12">
               <el-form-item prop="imageList" label="参演人员签名图片">
                 <ImageListPreview v-model="formData.signImageList"></ImageListPreview>

src/views/core/task/dialog.info.vue

@@ -99,6 +99,9 @@
               }}</el-form-item>
             </el-col>
           </el-row> -->
+          <div class="extend_mod">
+
+          
           <el-table
             v-loading="loading"
             :data="formData.taskDataVoList"
@@ -137,6 +140,7 @@
             </el-table-column>
             <el-table-column label="说明" align="center" prop="remark" />
           </el-table>
+        </div>
         </el-form>
       </div>
 

src/views/question/reform/dialog.vue

@@ -372,6 +372,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.margin-top{
+    margin-bottom: -21px;
+  }
 .form {
   padding-top: 20px;
 }

src/views/resumption/protection/dialog.history.vue

@@ -3,7 +3,7 @@
     <DialogCom
       title="布撤防历史"
       :visible.sync="isShow"
-      width="700px"
+      width="1200px"
       @close="close"
     >
       <div class="page-body">
@@ -52,7 +52,8 @@
             >
             </DataRangePicker>
           </div>
-          <el-table :data="tableData" border style="width: 100%">
+          <div class="extend_mod">
+            <el-table :data="tableData" border style="width: 100%">
             <el-table-column
               type="index"
               label="序号"
@@ -83,6 +84,8 @@
               label="登记人"
             ></el-table-column>
           </el-table>
+          </div>
+        
           <div style="margin-top: 20px; text-align: right">
             <pagination
               v-show="total > 0"
@@ -200,7 +203,8 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" >
+
 .device_info {
   .el-form {
     width: 600px;

src/views/resumption/taskManager/dialog.detail.vue

@@ -43,6 +43,9 @@
           dayjs(detail.submitTime).format("YYYY-MM-DD HH:mm")
         }}</el-descriptions-item>
       </el-descriptions>
+      <div class="extend_mod">
+
+      
       <el-table
         size="small"
         :data="tableData"
@@ -140,6 +143,7 @@
           :show-overflow-tooltip="true"
         />
       </el-table>
+    </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关闭</el-button>
       </div>

src/views/safetycheck/task/components/detail.vue

@@ -46,6 +46,9 @@
     </el-descriptions>
 
     <div class="itemDetail">
+      <div class="extend_mod">
+        
+    
       <el-table
         size="small"
         :data="taskInfo.checkList"
@@ -111,6 +114,7 @@
         />
       </el-table>
     </div>
+    </div>
     <div class="dialog-footer">
       <el-button @click="onClose">关闭</el-button>
     </div>

src/views/scorestatistics/pointsDialog.vue

@@ -60,6 +60,9 @@
           </el-col>
         </el-row>
       </el-form> -->
+      <div class="extend_mod">
+
+    
       <el-table
         border
         height="650"
@@ -85,6 +88,7 @@
         </el-table-column>
         <el-table-column label="状态" prop="execStatusText"> </el-table-column>-->
       </el-table>
+    </div>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
         <el-button @click="onHide">关闭</el-button>

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -37,7 +37,8 @@
             >{{ queryParams.orgName }}
           </el-form-item>
         </el-form> -->
-
+        <div class="extend_mod">
+          
         <el-table
           v-loading="loading"
           :data="tableData"
@@ -60,6 +61,7 @@
           </el-table-column>
           <el-table-column prop="levelName" label="安全等级"> </el-table-column>
         </el-table>
+        </div>
         <pagination
           v-show="total > 0"
           :total="total"
@@ -176,6 +178,9 @@
           </el-form-item>
         </el-row>
       </el-form> -->
+      <div class="extend_mod">
+
+      
       <el-table
         border
         height="650"
@@ -204,6 +209,7 @@
         </el-table-column>
         <el-table-column label="扣分" prop="score"> </el-table-column>
       </el-table>
+    </div>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
         <el-button @click="closeHandler">关闭</el-button>