coys

src/assets/styles/globalForm.scss

@@ -0,0 +1,32 @@
+// .centerDialog {
+//   .el-form {
+//     border-left: 1px solid #ccc;
+//     border-right: 1px solid #ccc;
+//     border-bottom: 1px solid #ccc;
+//     .el-form-item {
+//       margin: 0px !important;
+//       background-color: #ccc;
+//       .el-form-item__label {
+//         text-align: center;
+//         background-color: #ccc;
+//         color: black;
+//         display: flex;
+    
+//         border-top: 1px solid #fff;
+//       }
+//       .el-form-item__content {
+  
+//         display: flex;
+//         align-items: center;
+//         text-align: left;
+//         padding-left: 10px;
+//         background-color: #fff;
+//         border-top: 1px solid #ccc !important;
+        
+//       }
+//     }
+//   }
+// }
+.el-descriptions__body{
+    margin-bottom: 20px;
+}

src/components/elDialog/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
+    <el-dialog  v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
       <slot></slot>
       <slot name="footer" class="dialog-footer"></slot>
     </el-dialog>

src/main.js

@@ -14,7 +14,7 @@ import "./permission"; // permission control
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-
+import  '@/assets/styles/globalForm.scss'
 import {
   parseTime,
   resetForm,

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

@@ -1,8 +1,84 @@
 <template>
   <div class="edu-training-edit">
-    <DialogCom title="演练任务详情" :visible.sync="isShow" width="960px">
+    <DialogCom title="演练任务详情" :visible.sync="isShow" width="1200px">
       <div class="page-body">
-        <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          size="medium"
+          border
+          :contentStyle="content_style"
+          :label-style="labelStyle"
+        >
+          <el-descriptions-item labelClassName="gx_info_label" label="任务名称">
+            {{ formData.title }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="任务进度"
+          >
+            {{
+              getLabel(dict.type.drill_task_status, formData.status, "未知")
+            }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="任务时间"
+          >
+            {{
+              formData.startDate + " ~ " + formData.endDate
+            }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="演练机构"
+          >
+            {{ formData.orgName }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="指挥人"
+          >
+            {{ formData.hostName }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="登记人"
+          >
+            {{ formData.recorderName}} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="演练项目"
+          >
+            {{  formData.typeText }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="演练地点"
+          >
+            {{ formData.drillSite }} </el-descriptions-item
+          ><el-descriptions-item
+            labelClassName="gx_info_label"
+            label="演练开始时间"
+          >
+            {{ formData.drillStartTime }} </el-descriptions-item
+          >
+          <el-descriptions-item
+            labelClassName="gx_info_label"
+            label="演练结束时间"
+          >
+            {{ formData.drillEndTime }}
+          </el-descriptions-item>
+          <el-descriptions-item
+            labelClassName="gx_info_label"
+            label="预设案由"
+          >
+            <!-- {{ formData.presetCase }} -->
+            江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号
+          </el-descriptions-item>
+          <el-descriptions-item
+            labelClassName="gx_info_label"
+            label="演练情况"
+          >
+            {{ formData.drillSituation }}
+          </el-descriptions-item>
+        </el-descriptions>
+
+        <!-- <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                  label-suffix=":">
           <el-row>
             <el-col :span="12">
@@ -11,12 +87,12 @@
                 }}
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12">
+           <el-col :span="12">
               <el-form-item prop="type" label="演练类型">{{
                   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,"未知")
@@ -90,7 +166,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)
@@ -105,13 +181,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>
@@ -138,7 +214,7 @@
             </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
+        </el-form> -->
       </div>
 
       <div slot="footer" class="dialog-footer">
@@ -149,15 +225,15 @@
 </template>
 
 <script>
-import {mapState, mapMutations} from "vuex";
-import {getEduTask} from "@/api/core/edu/eduTask";
-import {getDrillTask} from "@/api/core/drill/drillTask";
-import {initList} from "@/api/core/drill/drillDictionary";
+import { mapState, mapMutations } from "vuex";
+import { getEduTask } from "@/api/core/edu/eduTask";
+import { getDrillTask } from "@/api/core/drill/drillTask";
+import { initList } from "@/api/core/drill/drillDictionary";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import { getLabel } from "@/views/commonOption";
 export default {
-  components: {KFileUpload},
-  dicts: ['drill_task_status', 'core_drill_type'],
+  components: { KFileUpload },
+  dicts: ["drill_task_status", "core_drill_type"],
   data() {
     const params = this.$route.params;
     return {
@@ -166,7 +242,19 @@ export default {
       formData: this.reset(),
       drillTypeOptions: [],
       formFileListDefualtValue: [],
-      iconClasses: ['icon-rate-face-1', 'icon-rate-face-2', 'icon-rate-face-3'] // 等同于 { 2: 'icon-rate-face-1', 4: { value: 'icon-rate-face-2', excluded: true }, 5: 'icon-rate-face-3' }
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
+      iconClasses: ["icon-rate-face-1", "icon-rate-face-2", "icon-rate-face-3"], // 等同于 { 2: 'icon-rate-face-1', 4: { value: 'icon-rate-face-2', excluded: true }, 5: 'icon-rate-face-3' }
     };
   },
   props: {},
@@ -199,12 +287,12 @@ export default {
       if (!id) {
         this.reset(other);
       } else {
-        getDrillTask(id).then(response => {
+        getDrillTask(id).then((response) => {
           this.formData = response.data;
-          this.formFileListDefualtValue=response.data.fileList;
+          this.formFileListDefualtValue = response.data.fileList;
           this.formData.signImageList = this.getSingImageList();
           this.loading = false;
-        })
+        });
       }
     },
     async show(id, other = {}) {
@@ -223,9 +311,13 @@ export default {
       });
     },
     getSingImageList() {
-      let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
-        .map((v) => v.signImage).join(",") : null;
-      console.log("getSingImage", res)
+      let res = this.formData.taskUserList
+        ? this.formData.taskUserList
+            .filter((x) => x.type === 1 && x.sign == 1)
+            .map((v) => v.signImage)
+            .join(",")
+        : null;
+      console.log("getSingImage", res);
       return res;
     },
     getBlob(url, cb) {
@@ -240,15 +332,14 @@ export default {
       xhr.send();
     },
     initDrillTypeOptions() {
-      initList().then(response => {
+      initList().then((response) => {
         this.drillTypeOptions = response;
-      })
-    }
+      });
+    },
     // 事件
     //apimark//
   },
-  mounted() {
-  },
+  mounted() {},
 };
 </script>
 

src/views/core/outIn/outInLog/dialog.outIn.detail.vue

@@ -7,7 +7,65 @@
       width="1000px"
     >
       <div class="page-body">
-        <el-form
+        <el-descriptions
+          :column="2"
+          class="margin-top"
+          size="medium"
+          border
+          :label-style="labelStyle"
+          :contentStyle="content_style"
+        >
+          <el-descriptions-item label="介绍信类型">
+            <dict-tag :options="dict.type.out_in_type" :value="formData.type" />
+          </el-descriptions-item>
+          <el-descriptions-item label="介绍信编号">{{
+            formData.letterNo
+          }}</el-descriptions-item>
+          <el-descriptions-item label="接待机构">{{
+            formData.orgName
+          }}</el-descriptions-item>
+          <el-descriptions-item label="来访事由">{{
+            formData.reasons
+          }}</el-descriptions-item>
+          <el-descriptions-item label="开具日期">{{
+            formData.startTime
+          }}</el-descriptions-item>
+          <el-descriptions-item label="有效天数">{{
+            formData.effectiveDays
+          }}</el-descriptions-item>
+          <el-descriptions-item label="来访单位">{{
+            formData.companyName
+          }}</el-descriptions-item>
+          <el-descriptions-item label="来访人员">{{
+            formData.userName
+          }}</el-descriptions-item>
+          <el-descriptions-item label="证件类型">
+            <dict-tag
+              :options="dict.type.letter_id_type"
+              :value="formData.idType"
+            />
+          </el-descriptions-item>
+          <el-descriptions-item label="证件号码">{{
+            formData.idCard
+          }}</el-descriptions-item>
+          <el-descriptions-item label="进入时间">{{
+            formData.arrivalTime
+          }}</el-descriptions-item>
+          <el-descriptions-item label="离开时间">{{
+            formData.departureTime
+          }}</el-descriptions-item>
+          <el-descriptions-item label="介绍信附件">
+            <K-file-upload
+              ref="upload"
+              :isShowUploadBtn="false"
+              :defaultValue="formData.letterFile"
+            />
+          </el-descriptions-item>
+          <el-descriptions-item label="核验结果">{{
+            formData.checkImage
+          }}</el-descriptions-item>
+        </el-descriptions>
+        <!-- <el-form
           ref="form"
           :model="formData"
           :rules="formDataRules"
@@ -77,13 +135,7 @@
                 {{formData.departureTime}}
               </el-form-item>
             </el-col>  
-            <!-- <el-col :span="12">
-              <el-form-item label="证件照">
-                <template>
-                      <ImageListPreview v-model="formData.imgFile"></ImageListPreview>
-                    </template> 
-              </el-form-item>
-            </el-col> -->
+          
             <el-col :span="12">
               <el-form-item label="介绍信附件">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
@@ -105,7 +157,7 @@
             
            
           </el-row>
-        </el-form>
+        </el-form> -->
       </div>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="primary" @click="submitForm">确 定</el-button> -->
@@ -116,30 +168,39 @@
 </template>
 <script>
 import { mapState, mapMutations } from "vuex";
-import {
-  getLetter,
-  outInRecordDetail,
-} from "@/api/core/letter";
+import { getLetter, outInRecordDetail } from "@/api/core/letter";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import dayjs from "dayjs";
 import imgUpload from "@/components/ImageUpload";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
-  components: { KFileUpload, imgUpload,DataRangePicker },
+  components: { KFileUpload, imgUpload, DataRangePicker },
   data() {
     const params = this.$route.params;
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       id: params ? params.id : null,
       isShow: false,
       title: "来访核验登记详情",
       formData: this.reset(),
       formDataRules: {
-        approveStatus: [{ required: true, message: "请勾选审批结果" }],        
+        approveStatus: [{ required: true, message: "请勾选审批结果" }],
       },
       formFileListDefualtValue: [],
     };
   },
-  dicts: ['out_in_type','letter_id_type'],
+  dicts: ["out_in_type", "letter_id_type"],
   props: {},
   watch: {},
   created() {},
@@ -151,15 +212,15 @@ export default {
     reset(other = {}) {
       return {
         reasons: null,
-        letterNo:null,
+        letterNo: null,
         receptionOrgIds: [],
-        range:[],
+        range: [],
         description: null,
         letterFile: [],
         userInfos: [],
-        type:null,
-        approveRemark:null,
-        approveStatus:null,
+        type: null,
+        approveRemark: null,
+        approveStatus: null,
         ...other,
       };
     },
@@ -169,13 +230,13 @@ export default {
     //   console.log("checkApprove value",value);
     //   console.log("checkApprove callback",callback);
     // },
-    async show(id, other = {}) {    
-        // this.title = "出入情况详情";   
-        this.isShow = true;
-        outInRecordDetail(id).then((response) => {
-          this.formData = response.data;
-          this.formFileListDefualtValue=this.formData.letterFile;
-        });      
+    async show(id, other = {}) {
+      // this.title = "出入情况详情";
+      this.isShow = true;
+      outInRecordDetail(id).then((response) => {
+        this.formData = response.data;
+        this.formFileListDefualtValue = this.formData.letterFile;
+      });
     },
     handleAddUser() {
       this.open = true;
@@ -214,28 +275,24 @@ export default {
       this.formData = this.reset();
       this.$refs["upload"].clearFiles();
     },
-    
+
     submitForm() {
       this.$refs["form"].validate((valid) => {
-        if (valid) {         
-          let  {approveRemark,approveStatus,approveLog} = this.formData;
-          let tempRquest={approveRemark,approveStatus,id:approveLog.id};
+        if (valid) {
+          let { approveRemark, approveStatus, approveLog } = this.formData;
+          let tempRquest = { approveRemark, approveStatus, id: approveLog.id };
 
-          console.log("================",tempRquest );          
+          console.log("================", tempRquest);
           approveLetter(tempRquest).then((response) => {
-              this.$modal.msgSuccess("提交成功");
-              this.isShow = false;
-              this.formData = this.reset();
-              this.$emit("success", this.formData);
-            });
+            this.$modal.msgSuccess("提交成功");
+            this.isShow = false;
+            this.formData = this.reset();
+            this.$emit("success", this.formData);
+          });
         }
       });
-    },   
+    },
   },
   mounted() {},
 };
 </script>
-
-
-
-

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

@@ -1,157 +1,234 @@
 <template>
-    <div class="edu-training-edit">
-        <DialogCom title="调阅任务详情" :visible.sync="isShow" width="960px">
-            <div class="page-body">
-                <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
-                    label-suffix=":">
-                    <el-row>
+  <div class="edu-training-edit">
+    <DialogCom title="调阅任务详情" :visible.sync="isShow" width="960px">
+      <div class="page-body">
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          size="medium"
+          border
+          :label-style="labelStyle"
+          :contentStyle="content_style"
+        >
+          <el-descriptions-item labelClassName="gx_info_label" label="任务名称">
+            {{ formData.taskName }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="任务进度">
+            <dict-tag
+              :options="dict.type.retrieval_task_status"
+              :value="formData.status"
+            />
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="任务时间">
+            {{ formData.planStartTime }}-{{ formData.planEndTime }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="调阅机构">
+           {{ formData.orgName}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="调阅人员">
+           {{ formData.roleName}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="登记人">
+           {{ formData.retrievalUserName}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="调阅开始时间">
+           {{ formData.startTime}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="调阅结束时间">
+           {{ formData.endTime}}
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-form
+          :model="formData"
+          size="small"
+          ref="form"
+          label-position="right"
+          label-width="120px"
+          label-suffix=":"
+        >
+          <!-- <el-row>
+            <el-col :span="12">
+              <el-form-item prop="type" label="任务名称">{{
+                formData.taskName
+              }}</el-form-item>
+            </el-col>
 
-                         <el-col :span="12">
-                            <el-form-item prop="type" label="任务名称">{{
-                                formData.taskName
-                            }}</el-form-item>
-                        </el-col>
+            <el-col :span="12">
+              <el-form-item label="任务进度">
+                <template>
+                  <dict-tag
+                    :options="dict.type.retrieval_task_status"
+                    :value="formData.status"
+                  />
+                </template>
+              </el-form-item>
+            </el-col>
 
-                        <el-col :span="12">
-                            <el-form-item label="任务进度">
-                                <template>
-                                    <dict-tag :options="dict.type.retrieval_task_status" :value="formData.status"/>
-                                </template>
-                            </el-form-item>
-                        </el-col>
+            <el-col :span="12">
+              <el-form-item prop="trainingStartDateTime" label="任务时间"
+                >{{ formData.planStartTime }}-{{
+                  formData.planEndTime
+                }}</el-form-item
+              >
+            </el-col>
 
-                           <el-col :span="12">
-                            <el-form-item prop="trainingStartDateTime" label="任务时间">{{
-                                formData.planStartTime
-                            }}-{{ formData.planEndTime}}</el-form-item>
-                        </el-col>
+            <el-col :span="12">
+              <el-form-item prop="dueCount" label="调阅机构">{{
+                formData.orgName
+              }}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="dueCount" label="调阅人员">{{
+                formData.roleName
+              }}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="dueCount" label="登记人">{{
+                formData.retrievalUserName
+              }}</el-form-item>
+            </el-col>
+           
+            <el-col :span="12">
+              <el-form-item prop="trainingEndDateTime" label="调阅开始时间">{{
+                formData.startTime
+              }}</el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="trainingEndDateTime" label="调阅结束时间">{{
+                formData.endTime
+              }}</el-form-item>
+            </el-col>
+          </el-row> -->
+          <el-table
+            v-loading="loading"
+            :data="formData.taskDataVoList"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column label="序号" type="index" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.$index + 1 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="硬盘录像机"
+              align="center"
+              prop="hostName"
+            />
+            <el-table-column
+              label="通道名称"
+              align="center"
+              prop="channelName"
+            />
+            <el-table-column label="调阅项目" align="center" prop="project">
+              <template slot-scope="scope">
+                <dict-tag
+                  :options="dict.type.core_registration_project"
+                  :value="scope.row.project"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="检查情况" align="center" prop="situation">
+              <template slot-scope="scope">
+                <dict-tag
+                  :options="dict.type.core_check_type"
+                  :value="scope.row.situation"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="说明" align="center" prop="remark" />
+          </el-table>
+        </el-form>
+      </div>
 
-                      <el-col :span="12">
-                        <el-form-item prop="dueCount" label="调阅机构">{{
-                            formData.orgName
-                          }}</el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item prop="dueCount" label="调阅人员">{{
-                            formData.roleName
-                          }}</el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item prop="dueCount" label="登记人">{{
-                            formData.retrievalUserName
-                          }}</el-form-item>
-                      </el-col>
-                          <!-- 培训截止时间 -->
-                          <el-col :span="12">
-                            <el-form-item prop="trainingEndDateTime" label="调阅开始时间">{{
-                                formData.startTime
-                            }}</el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                          <el-form-item prop="trainingEndDateTime" label="调阅结束时间">{{
-                              formData.endTime
-                            }}</el-form-item>
-                        </el-col>
-
-
-                    </el-row>
-                  <el-table v-loading="loading" :data="formData.taskDataVoList" @selection-change="handleSelectionChange">
-                    <el-table-column label="序号" type="index" align="center">
-                      <template slot-scope="scope">
-                        <span>{{scope.$index + 1}}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="硬盘录像机" align="center" prop="hostName" />
-                    <el-table-column label="通道名称" align="center" prop="channelName" />
-                    <el-table-column label="调阅项目" align="center" prop="project" >
-                      <template slot-scope="scope">
-                        <dict-tag :options="dict.type.core_registration_project" :value="scope.row.project"/>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="检查情况" align="center" prop="situation" >
-                      <template slot-scope="scope">
-                      <dict-tag :options="dict.type.core_check_type" :value="scope.row.situation"/>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="说明" align="center" prop="remark" />
-                  </el-table>
-                </el-form>
-            </div>
-
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="onHide">关闭</el-button>
-            </div>
-        </DialogCom>
-    </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="onHide">关闭</el-button>
+      </div>
+    </DialogCom>
+  </div>
 </template>
 
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getEduTask } from "@/api/core/edu/eduTask";
-import { getTask} from "@/api/core/task";
+import { getTask } from "@/api/core/task";
 export default {
-    components: {},
-  dicts: ['core_registration_project', 'core_check_type','retrieval_task_status'],
-    data() {
-        const params = this.$route.params;
-        return {
-            id: params ? params.id : null,
-            isShow: false,
-            formData: this.reset(),
-        };
+  components: {},
+  dicts: [
+    "core_registration_project",
+    "core_check_type",
+    "retrieval_task_status",
+  ],
+  data() {
+    const params = this.$route.params;
+    return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
+      id: params ? params.id : null,
+      isShow: false,
+      formData: this.reset(),
+    };
+  },
+  props: {},
+  watch: {},
+  computed: {
+    ...mapState(["loginUser"]),
+  },
+  methods: {
+    ...mapMutations([]),
+    reset(other = {}) {
+      return {
+        id: null,
+        taskName: null,
+        status: null,
+        planStartTime: null,
+        planEndTime: null,
+        orgName: null,
+        roleName: null,
+        retrievalUserName: null,
+        startTime: null,
+        endTime: null,
+        taskDataVoList: [],
+        ...other,
+      };
+    },
+    async refresh(id, other) {
+      if (!id) {
+        this.reset(other);
+      } else {
+        getTask(id).then((response) => {
+          this.formData = response.data;
+          this.open = true;
+          this.title = "调阅详情";
+        });
+      }
     },
-    props: {},
-    watch: {},
-    computed: {
-        ...mapState(["loginUser"]),
+    async show(id, other = {}) {
+      this.id = id;
+      await this.refresh(id, other);
+      this.isShow = true;
     },
-    methods: {
-        ...mapMutations([]),
-        reset(other = {}) {
-            return {
-              id: null,
-              taskName: null,
-              status: null,
-              planStartTime: null,
-              planEndTime: null,
-              orgName: null,
-              roleName: null,
-              retrievalUserName: null,
-              startTime: null,
-              endTime:null,
-              taskDataVoList:[],
-                ...other,
-            };
-        },
-        async refresh(id, other) {
-            if (!id) {
-                this.reset(other);
-            }
-            else {
-              getTask(id).then(response => {
-                this.formData = response.data;
-                this.open = true;
-                this.title = "调阅详情";
-              });
-            }
-        },
-        async show(id, other = {}) {
-            this.id = id;
-            await this.refresh(id, other);
-            this.isShow = true;
-        },
-        // 事件
-        onHide() {
-            this.isShow = false;
-        },
-        // 事件
-        //apimark//
+    // 事件
+    onHide() {
+      this.isShow = false;
     },
-    mounted() { },
+    // 事件
+    //apimark//
+  },
+  mounted() {},
 };
 </script>
 
-<!-- <style lang="less">
+<style lang="scss">
 .edu-training-edit {
 }
-</style> -->
+</style>

src/views/question/list/dialog.vue

@@ -2,12 +2,19 @@
   <DialogCom
     :title="title"
     :visible.sync="open"
-    width="800px"
+    width="1200px"
     append-to-body
     @close="cancel"
   >
-    <div class="question-dialog-body">
-      <el-descriptions :column="2" class="contentArea">
+    <div class="page-body">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+      >
         <el-descriptions-item label="机构名称">{{
           data.orgName
         }}</el-descriptions-item>
@@ -47,7 +54,15 @@
             </el-image></div
         ></el-descriptions-item>
       </el-descriptions>
-      <el-descriptions :column="2" class="contentArea" v-if="data.confirm">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+        v-if="data.confirm"
+      >
         <el-descriptions-item label="确认结果">{{
           data.confirm.executeStatus == 0 ? "确认" : "提出异议"
         }}</el-descriptions-item>
@@ -64,7 +79,11 @@
 
       <el-descriptions
         :column="2"
-        class="contentArea"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
         v-if="data.confirmDissent"
       >
         <el-descriptions-item label="审核结果">{{
@@ -81,7 +100,15 @@
         >
       </el-descriptions>
 
-      <el-descriptions :column="2" class="contentArea" v-if="data.reform">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+        v-if="data.reform"
+      >
         <el-descriptions-item label="整改时间">{{
           dayjs(data.reform.executeTime).format("YYYY-MM-DD")
         }}</el-descriptions-item>
@@ -176,6 +203,18 @@ import imgUpload from "@/components/ImageUpload/index.vue";
 export default {
   data() {
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层

src/views/question/reform/dialog.vue

@@ -2,12 +2,19 @@
   <DialogCom
     :title="title"
     :visible.sync="open"
-    width="800px"
+    width="1200px"
     append-to-body
     @close="cancel"
   >
-    <div class="question-dialog-body">
-      <el-descriptions :column="2" class="contentArea">
+    <div class="page-body">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+      >
         <el-descriptions-item label="机构名称">{{
           data.orgName
         }}</el-descriptions-item>
@@ -47,7 +54,15 @@
             </el-image></div
         ></el-descriptions-item>
       </el-descriptions>
-      <el-descriptions :column="2" class="contentArea" v-if="data.confirm">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+        v-if="data.confirm"
+      >
         <el-descriptions-item label="确认结果">{{
           data.confirm.executeStatus == 0 ? "确认" : "提出异议"
         }}</el-descriptions-item>
@@ -81,7 +96,15 @@
         >
       </el-descriptions>
 
-      <el-descriptions :column="2" class="contentArea" v-if="data.reform">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+        v-if="data.reform"
+      >
         <el-descriptions-item label="整改时间">{{
           dayjs(data.reform.executeTime).format("YYYY-MM-DD")
         }}</el-descriptions-item>
@@ -150,6 +173,18 @@ import imgUpload from "@/components/ImageUpload/index.vue";
 export default {
   data() {
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       // 弹出层标题
       title: "",
       // 是否显示弹出层

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

@@ -7,8 +7,27 @@
       @close="close"
     >
       <div class="page-body">
-        <div>
-          <div style="margin-bottom: 20px">
+        <el-descriptions
+          class="margin-top"
+          :column="2"
+          size="medium"
+          border
+          :contentStyle="content_style"
+          :label-style="labelStyle"
+        >
+          <el-descriptions-item labelClassName="gx_info_label" label="所属机构：">
+            {{ protection.orgName }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="报警控制器名称：">
+            {{ protection.name }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="24小时报警控制器：">
+            {{ protection.allHour ? "是" : "否" }}
+          </el-descriptions-item>
+         
+        </el-descriptions>
+         <div>
+          <!-- <div style="margin-bottom: 20px">
             <span> 所属机构：</span>
             <span>{{ protection.orgName }}</span>
           </div>
@@ -19,7 +38,7 @@
           <div style="margin-bottom: 20px">
             <span> 24小时报警控制器：</span>
             <span>{{ protection.allHour ? "是" : "否" }}</span>
-          </div>
+          </div> -->
           <div style="margin-bottom: 20px">
             <span>上报时间范围：</span>
             <DataRangePicker
@@ -73,10 +92,10 @@
               @pagination="getList"
             />
           </div>
-        </div>
+        </div> 
       </div>
 
-      <div slot="footer" class="dialog-footer" style="margin-top:20px">
+      <div slot="footer" class="dialog-footer" style="margin-top: 20px">
         <el-button @click="onHide">关闭</el-button>
         <!--<el-button type="primary" @click="onSubmit">确定</el-button> -->
       </div>
@@ -98,6 +117,18 @@ export default {
       tableData: [],
       queryParams: this.resetSearch(),
       total: 1,
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
     };
   },
   props: {

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

@@ -7,34 +7,39 @@
       @close="onClose"
     >
       <el-descriptions
+      class="margin-top"
+      size="medium"
+      border
         :column="2"
         v-if="detail"
         style="width: 80%; margin-left: 10%"
+        :label-style="labelStyle"
+        :contentStyle="content_style"
       >
-        <el-descriptions-item label="任务名称">{{
+        <el-descriptions-item label="任务名称" labelClassName="gx_info_label">{{
           detail.taskName
         }}</el-descriptions-item>
-        <el-descriptions-item label="任务进度">{{
+        <el-descriptions-item label="任务进度" labelClassName="gx_info_label">{{
           getLabel(statusOptions, detail.status)
         }}</el-descriptions-item>
-        <el-descriptions-item label="任务时间"
+        <el-descriptions-item label="任务时间" labelClassName="gx_info_label"
           >{{ dayjs(detail.planStartTime).format("YYYY-MM-DD HH:mm") }}-{{
             dayjs(detail.planEndTime).format("YYYY-MM-DD HH:mm")
           }}</el-descriptions-item
         >
-        <el-descriptions-item label="履职机构"
+        <el-descriptions-item label="履职机构" labelClassName="gx_info_label"
           >{{ detail.orgName }}
         </el-descriptions-item>
-        <el-descriptions-item label="履职人员">{{
+        <el-descriptions-item label="履职人员" labelClassName="gx_info_label">{{
           detail.roleNames.join("、")
         }}</el-descriptions-item>
-        <el-descriptions-item label="登记人">{{
+        <el-descriptions-item label="登记人" labelClassName="gx_info_label">{{
           detail.submitorName
         }}</el-descriptions-item>
-        <el-descriptions-item label="隐患问题数">{{
+        <el-descriptions-item label="隐患问题数" labelClassName="gx_info_label">{{
           detail.exceptionCount
         }}</el-descriptions-item>
-        <el-descriptions-item label="登记时间">{{
+        <el-descriptions-item label="登记时间" labelClassName="gx_info_label">{{
           dayjs(detail.submitTime).format("YYYY-MM-DD HH:mm")
         }}</el-descriptions-item>
       </el-descriptions>
@@ -149,6 +154,18 @@ export default {
   data() {
     return {
       isShow: false,
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       title: "",
       tableData: [],
       detail: null,
@@ -176,9 +193,9 @@ export default {
     onHide() {
       this.isShow = false;
     },
-    onClose(){
-      this.detail=null;
-      this.tableData=[];
+    onClose() {
+      this.detail = null;
+      this.tableData = [];
     },
     imgPreviewSrcList(imgList) {
       let srcList = [];

src/views/resumptionEvaluate/evaluatePlan/editPlanEvaluate.vue

@@ -8,7 +8,31 @@
     >
       <!-- :visible.sync="isShow" -->
       <div class="page-body">
-        <el-form
+        <el-descriptions
+          :column="2"
+          class="margin-top"
+          size="medium"
+          border
+          :label-style="labelStyle"
+          :contentStyle="content_style"
+        >
+          <el-descriptions-item label="外包评价名称">{{
+            formData.evaluateName
+          }}</el-descriptions-item>
+          <el-descriptions-item label="评价机构">{{
+            formData.orgName
+          }}</el-descriptions-item>
+          <el-descriptions-item label="评价计划时间">
+            {{ formData.startTime + "-" }}{{ formData.endTime }}
+          </el-descriptions-item>
+          <el-descriptions-item label="状态">{{
+            formData.status | filterStatus
+          }}</el-descriptions-item>
+          <el-descriptions-item label="评价周期">{{
+            formData.evaluateCycle
+          }}</el-descriptions-item>
+        </el-descriptions>
+        <!-- <el-form
           :model="formData"
           size="small"
           ref="form"
@@ -45,7 +69,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
+        </el-form> -->
 
         <!-- tableData -->
         <div class="line_box">
@@ -144,7 +168,6 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        
         <el-button type="primary" @click="onSubmit" v-if="isEvaluate == '0'"
           >确定</el-button
         >
@@ -164,6 +187,18 @@ import {
 export default {
   data() {
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       isEvaluate: "",
       tableData: [],
       tableDataContentVOS: [],
@@ -241,7 +276,10 @@ export default {
 
     // 事件
     onHide() {
-      this.$refs.form.resetFields();
+      if(this.$refs.form){
+
+        this.$refs.form.resetFields();
+      }
       this.isShow = false;
       this.formData = {};
 
@@ -271,7 +309,7 @@ export default {
         let { code } = res;
         if (code == 200) {
           this.$emit("success");
-          this.$message.success('评价成功')
+          this.$message.success("评价成功");
           this.onHide();
         }
       });

src/views/scorestatistics/pointsDialog.vue

@@ -1,8 +1,34 @@
 <template>
   <div>
     <!-- //扣分明细弹框 -->
+    <!-- monthNum -->
     <DialogCom title="扣分明细" width="1200px" :visible.sync="monthNum">
-      <el-form :inline="true" class="demo-form-inline">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+      >
+        <el-descriptions-item label="上级机构1">{{
+          monthNumeData.firstOrgName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="上级机构2">{{
+          monthNumeData.secondOrgName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="营业场所">{{
+          monthNumeData.orgTypeText
+        }}</el-descriptions-item>
+        <el-descriptions-item label="年月">{{
+          monthNumeData.date
+        }}</el-descriptions-item>
+        <el-descriptions-item label="指标分类">{{
+          typeName
+        }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <!-- <el-form :inline="true" class="demo-form-inline">
         <el-row>
           <el-col :span="8">
             <el-form-item label="上级机构1">
@@ -33,7 +59,7 @@
             <el-form-item label=""> </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
+      </el-form> -->
       <el-table
         border
         height="650"
@@ -46,13 +72,14 @@
         <el-table-column label="事件单号" prop="id"> </el-table-column>
         <el-table-column label="事件名称" prop="taskName"> </el-table-column>
         <el-table-column label="执行机构" prop="orgName"> </el-table-column>
-<!--        <el-table-column label="执行人员" prop="execManName"> </el-table-column>-->
-        <el-table-column label="执行岗位" prop="execPostName"> </el-table-column>
+        <!--        <el-table-column label="执行人员" prop="execManName"> </el-table-column>-->
+        <el-table-column label="执行岗位" prop="execPostName">
+        </el-table-column>
         <el-table-column label="计划开始时间" prop="planTimeStart">
         </el-table-column>
         <el-table-column label="计划结束时间" prop="planTimeEnd">
         </el-table-column>
-<!--        <el-table-column label="执行开始时间" prop="execTimeStart">
+        <!--        <el-table-column label="执行开始时间" prop="execTimeStart">
         </el-table-column>
         <el-table-column label="执行结束时间" prop="execTimeEnd">
         </el-table-column>
@@ -74,9 +101,21 @@ export default {
   },
   data() {
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       monthNum: false,
-      typeName:'',
-      loading:false,
+      typeName: "",
+      loading: false,
       itemTableList: [],
     };
   },
@@ -86,23 +125,23 @@ export default {
   methods: {
     init(row) {
       this.monthNum = true;
-      this.typeName=row.typeName
-      this.loading=true
+      this.typeName = row.typeName;
+      this.loading = true;
       getBysingleData({
         orgId: this.monthNumeData.orgId,
         date: this.monthNumeData.date,
         typeCode: row.typeCode,
       }).then((res) => {
-        this.loading=false
+        this.loading = false;
         console.log(res);
-        let {code,data,msg}=res
-        this.itemTableList=data||[]
+        let { code, data, msg } = res;
+        this.itemTableList = data || [];
       });
     },
-    onHide(){
+    onHide() {
       this.monthNum = false;
-      this.itemTableList=[]
-    }
+      this.itemTableList = [];
+    },
   },
 };
 </script>

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -5,11 +5,25 @@
       title="查看"
       :visible.sync="isShow"
       width="1400px"
-     
       @open="openHandler"
     >
       <div class="pageNum-body">
-        <el-form
+        <el-descriptions
+          :column="2"
+          class="margin-top"
+          size="medium"
+          border
+          :label-style="labelStyle"
+          :contentStyle="content_style"
+        >
+          <el-descriptions-item label="年月">{{
+            queryParams.date
+          }}</el-descriptions-item>
+          <el-descriptions-item label="机构名称">{{
+            queryParams.orgName
+          }}</el-descriptions-item>
+        </el-descriptions>
+        <!-- <el-form
           :model="queryParams"
           size="small"
           ref="form"
@@ -22,7 +36,7 @@
           <el-form-item label="机构名称:"
             >{{ queryParams.orgName }}
           </el-form-item>
-        </el-form>
+        </el-form> -->
 
         <el-table
           v-loading="loading"
@@ -62,8 +76,53 @@
       <!-- 月度指数弹框 -->
     </DialogCom>
 
-    <DialogCom title="月度指数" width="1200px" :visible.sync="monthNum">
-      <el-form :inline="true" class="demo-form-inline">
+    <DialogCom title="月度指数" width="1400px" :visible.sync="monthNum">
+      <el-descriptions
+        :column="2"
+        class="margin-top"
+        size="medium"
+        border
+        :label-style="labelStyle"
+        :contentStyle="content_style"
+      >
+        <el-descriptions-item label="上级机构1">{{
+          monthNumeData.firstOrgName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="上级机构2">{{
+          monthNumeData.secondOrgName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="营业场所">{{
+          monthNumeData.orgTypeText
+        }}</el-descriptions-item>
+        <el-descriptions-item label="年月">{{
+          monthNumeData.date
+        }}</el-descriptions-item>
+        <el-descriptions-item label="安全指数">{{
+          monthNumeData.orgScore
+        }}</el-descriptions-item>
+        <el-descriptions-item label="安全等级">{{
+          monthNumeData.levelName
+        }}</el-descriptions-item>
+        <el-descriptions-item label="指标分类"
+          ><div v-if="zbTableList && zbTableList.dataList.length > 0">
+            <el-radio-group v-model="radio" class="bigbox_card">
+              <div
+                :key="index"
+                v-for="(item, index) in zbTableList.dataList"
+                @click="cardHandler(item)"
+              >
+                <el-card class="box-card">
+                  <el-radio :label="item.typeCode">
+                    <span>{{ item.typeName }}</span>
+                    <div>数量:{{ item.times }},扣分:{{ item.score }}</div>
+                  </el-radio>
+                </el-card>
+              </div>
+            </el-radio-group>
+          </div></el-descriptions-item
+        >
+      </el-descriptions>
+      <!-- <el-form :inline="true" class="demo-form-inline">
         <el-row>
           <el-col :span="8">
             <el-form-item label="上级机构1">
@@ -116,7 +175,7 @@
             </div>
           </el-form-item>
         </el-row>
-      </el-form>
+      </el-form> -->
       <el-table
         border
         height="650"
@@ -133,12 +192,13 @@
         <el-table-column label="数量">
           <template slot-scope="{ row }">
             <div>
-              <span class="text" v-if="row.typeCode!='1005'" @click="clickHandlerDialog(row)">{{
-                row.times
-              }}</span>
-              <span  v-else>{{
-                row.times
-              }}</span>
+              <span
+                class="text"
+                v-if="row.typeCode != '1005'"
+                @click="clickHandlerDialog(row)"
+                >{{ row.times }}</span
+              >
+              <span v-else>{{ row.times }}</span>
             </div>
           </template>
         </el-table-column>
@@ -161,13 +221,25 @@ import {
   detail,
   getBysingleOrg,
 } from "@/api/scorestatistics/scorestatistics.js";
-import points from './pointsDialog.vue'
+import points from "./pointsDialog.vue";
 export default {
-  components:{
-    points
+  components: {
+    points,
   },
   data() {
     return {
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
       tableData: [],
       zbTableList: { dataList: [] },
       itemTableList: [],
@@ -233,7 +305,9 @@ export default {
     },
     // 事件
     onHide() {
-      this.$refs.form.resetFields();
+      if (this.$refs.form) {
+        this.$refs.form.resetFields();
+      }
       this.isShow = false;
       this.queryParams = {
         pageNum: 1,
@@ -242,17 +316,17 @@ export default {
 
       this.tableData = [];
     },
-    closeHandler(){
-      this.monthNum=false
-      this.itemTableList=[]
-      this.monthNumeData={
+    closeHandler() {
+      this.monthNum = false;
+      this.itemTableList = [];
+      this.monthNumeData = {
         firstOrgName: "",
         secondOrgName: "",
         orgTypeText: "",
         date: "",
         levelName: "",
         dataScore: "",
-      }
+      };
     },
     monthNumInit(row) {
       this.monthNum = true;
@@ -272,9 +346,8 @@ export default {
           this.monthNumeData.orgScore = row.orgScore;
           this.monthNumeData.levelName = row.levelName;
           this.monthNumeData.date = row.date;
-          this.monthNumeData.orgId =row.orgId;
-      
-         
+          this.monthNumeData.orgId = row.orgId;
+
           this.monthNumeData.orgTypeText = data.orgTypeText;
           this.monthNumeData.secondOrgName = data.secondOrgName;
           this.monthNumeData.firstOrgName = data.firstOrgName;
@@ -310,7 +383,6 @@ export default {
     cardHandler(item) {
       this.radio = item.typeCode;
       this.itemTableList = item.detailList;
-      
     },
     //打开前的回调
     openHandler() {},