修改bug

src/assets/styles/dialog.scss

@@ -1,13 +1,23 @@
+.detail,
 .details {
-    ::v-deep .el-form-item__label,
-    ::v-deep .el-form-item__content {
-      font-size: 16px;
-      color: #86909C;
-      font-weight: 500;
+  ::v-deep .el-form-item__label,
+  ::v-deep .el-form-item__content {
+    font-size: 16px;
+    color: #86909c;
+    font-weight: 500;
+  }
+
+  ::v-deep .el-form-item__content {
+    font-size: 14px;
+    color: #444444 !important;
+  }
+}
+  .detail-style{
+    ::v-deep .el-row {
+      border-bottom: 1px solid #eaeef0 !important;
+      margin-bottom: 10px !important;
     }
-  
-    ::v-deep .el-form-item__content {
-      font-size: 14px;
-      color: #444444 !important;
+    ::v-deep .el-dialog__header {
+      background: #e1e9f4 !important;
     }
   }

src/components/handleSelectedOrg/index.vue

@@ -7,7 +7,9 @@
                 :show-overflow-tooltip="true" />
             <el-table-column label="用户昵称" align="center" key="nickname" prop="nickname" v-if="columns[2].visible"
                 :show-overflow-tooltip="true" />
-            <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible"
+            <!-- <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible"
+                :show-overflow-tooltip="true" /> -->
+            <el-table-column label="单位" align="center" key="orgName" prop="orgName" v-if="columns[5].visible"
                 :show-overflow-tooltip="true" />
             <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
             <el-table-column label="是否已读" width="120">
@@ -43,8 +45,8 @@
             </el-table-column> -->
         </el-table>
         <!-- 分页组件 -->
-        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-            @pagination="getOrgList(userId)" /> -->
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+            @pagination="getOrgList(userId)" />
     </div>
 </template>
 
@@ -191,14 +193,12 @@ export default {
                     })
                 } else if (this.type === 'comInfo') {
                     // this.queryParams.taskId = userId
-                    getselfComuser({ comId: userId }).then(response => {
-                        this.orgList = response.data ? response.data : []
+                    this.queryParams.comId=userId
+                    getselfComuser(this.queryParams).then(response => {
+                        this.orgList = response.data.records ? response.data.records : []
                         this.total = response.data ? response.data.length : 0
-
                         this.loading = false
                     })
-                } else {
-
                 }
             }
 

src/views/backend/activeInspect/index.vue

@@ -55,7 +55,7 @@
             <!-- <el-table-column label="主键编号" align="center" prop="id" /> -->
             <el-table-column label="检查项ID" align="center" prop="inspId" />
             <el-table-column label="检查项名称" align="center" prop="inspName" />
-            <el-table-column label="检查项代码" align="center" prop="inspCode" />
+            <!-- <el-table-column label="检查项代码" align="center" prop="inspCode" /> -->
             <el-table-column label="检查项类型" align="center" prop="inspType">
                 <template v-slot="scope">
                     <dict-tag :type="DICT_TYPE.DICT_INSPECT_TYPE" :value="scope.row.inspType" />
@@ -76,15 +76,15 @@
                     <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isreport" />
                 </template>
             </el-table-column> -->
-            <el-table-column label="所属单位" align="center" prop="orgId" />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="所属单位" align="center" prop="orgName" />
+            <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template v-slot="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['backend:active-inspect:update']">修改</el-button>
                     <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                         v-hasPermi="['backend:active-inspect:delete']">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <!-- 分页组件 -->
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"

src/views/backend/comInfo/index.vue

@@ -79,7 +79,7 @@
                 icon="el-icon-circle-check">发布</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button size="mini" type="text" icon="el-icon-help" @click="lookMes(scope.row)">查看详情</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-help" @click="lookMes(scope.row)">查看详情</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -146,6 +146,12 @@
         <el-button type="primary" @click="openSelectedOrg = false">关 闭</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="已分配单位" :visible.sync="comInfoOrg" width="85vw" append-to-body>
+      <handleSelectedOrg ref="choiceSelect" :userId="form.id" :type="'comInfoOrg'"></handleSelectedOrg>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="comInfoOrg = false">关 闭</el-button>
+      </div>
+    </el-dialog>
     <!-- 查看下达的单位 -->
     <el-dialog title="下达单位" :visible.sync="downHouse" width="50%">
       <!-- <el-button plain icon="el-icon-download" size="mini" @click="nowExcel" type="warning" style="margin-bottom: 10px;">导出</el-button> -->
@@ -227,7 +233,8 @@ export default {
       orgType: undefined,
       downHouse: false,//查看人员
       totals: 0,
-      downList:[]
+      downList:[],
+      comInfoOrg:false
     }
   },
   mounted() {
@@ -459,6 +466,17 @@ export default {
       // 打开弹窗
       this.openSelectedOrg = true;
     },
+    lookMes(row) {
+      if (row.id) {
+        this.form.id = row.id
+      }
+      this.comInfoOrg=true
+      // getNewsList({ ids: row.id }).then(res => {
+      //   console.log(res.data[0].comBroadDOList, '111');
+      //   this.downList = res.data[0].comBroadDOList
+      //   this.downHouse = true
+      // })
+    },
     // -==========发布======================
     handPublish(row) {
       if (row.id) {
@@ -468,14 +486,8 @@ export default {
           this.getList()
         });
       }
-    },
-    lookMes(row) {
-      getNewsList({ ids: row.id }).then(res => {
-        console.log(res.data[0].comBroadDOList, '111');
-        this.downList = res.data[0].comBroadDOList
-        this.downHouse = true
-      })
     }
+
   },
 }
 </script>

src/views/backend/fireSpecial/index.vue

@@ -159,6 +159,10 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="所属单位" prop="orgName">
+          <template slot="label">
+                <span style="color: #ff4949;margin-right: 4px;">*</span>
+                <span>所属单位:</span>
+              </template>
           <el-input
             v-model="form.orgName"
             @focus="handleChoice"

src/views/backend/fireWork/index.vue

@@ -148,6 +148,10 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="所属单位" prop="orgName">
+          <template slot="label">
+                <span style="color: #ff4949;margin-right: 4px;">*</span>
+                <span>所属单位:</span>
+              </template>
           <el-input
             v-model="form.orgName"
             @focus="handleChoice"

src/views/backend/hiddenDanger/index.vue

@@ -2,19 +2,42 @@
   <div class="app-container">
     <div ref="sousuH">
       <!-- 搜索工作栏 -->
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
         <el-form-item label="隐患状态" prop="dengerStatus">
           <!-- <el-input v-model="queryParams.denger_status" placeholder="请输入隐患状态" clearable
             @keyup.enter.native="handleQuery" /> -->
-          <el-select v-model="queryParams.dengerStatus" placeholder="请选择状态" clearable size="small">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DENGER_STATUS)" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
+          <el-select
+            v-model="queryParams.dengerStatus"
+            placeholder="请选择状态"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.DENGER_STATUS)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="检查时间" prop="inspectTime">
-          <el-date-picker v-model="queryParams.inspectTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-            type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-            :default-time="['00:00:00', '23:59:59']" />
+          <el-date-picker
+            v-model="queryParams.inspectTime"
+            style="width: 240px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+          />
         </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
@@ -23,14 +46,21 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="隐患描述" prop="description">
-          <el-input v-model="queryParams.description" placeholder="请输入隐患描述" clearable @keyup.enter.native="handleQuery" />
+          <el-input
+            v-model="queryParams.description"
+            placeholder="请输入隐患描述"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
           <!-- <el-select v-model="queryParams.handleMethod" placeholder="请选择处理方式" clearable size="small">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DENGER_HANDLE)" :key="dict.value" :label="dict.label"
               :value="dict.value" /> -->
           <!-- </el-select> -->
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+            >搜索</el-button
+          >
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -44,38 +74,72 @@
                       <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                         :loading="exportLoading" v-hasPermi="['backend:hidden-danger:export']">导出</el-button>
                     </el-col> -->
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
       </el-row>
     </div>
     <!-- 列表 -->
     <!-- <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'"> -->
-    <el-table v-loading="loading" :data="list" class-name="small-padding fixed-width">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      class-name="small-padding fixed-width"
+    >
       <el-table-column label="ID" align="center" prop="id" width="60px" />
       <el-table-column label="任务名称" align="center" prop="task_name" />
-      <el-table-column label="任务类型" align="center" prop="task_type" width="120px">
+      <el-table-column
+        label="任务类型"
+        align="center"
+        prop="task_type"
+        width="120px"
+      >
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="scope.row.task_type" />
+          <dict-tag
+            :type="DICT_TYPE.TASK_STATUS"
+            :value="scope.row.task_type"
+          />
         </template>
       </el-table-column>
       <el-table-column label="检查项名称" align="center" prop="insp_name" />
       <el-table-column label="检查项类型" align="center" prop="insp_type">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DICT_INSPECT_TYPE" :value="scope.row.insp_type" />
+          <dict-tag
+            :type="DICT_TYPE.DICT_INSPECT_TYPE"
+            :value="scope.row.insp_type"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="单位名称" align="center" prop="org_name" width="150px" />
+      <el-table-column
+        label="单位名称"
+        align="center"
+        prop="org_name"
+        width="150px"
+      />
       <el-table-column label="单位类型" align="center" prop="dwlx">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BACKEND_ORG_TYPE" :value="scope.row.dwlx" />
+          <dict-tag
+            :type="DICT_TYPE.BACKEND_ORG_TYPE"
+            :value="scope.row.dwlx"
+          />
         </template>
       </el-table-column>
       <el-table-column label="隐患状态" align="center" prop="denger_status">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.DENGER_STATUS" :value="scope.row.denger_status" />
+          <dict-tag
+            :type="DICT_TYPE.DENGER_STATUS"
+            :value="scope.row.denger_status"
+          />
         </template>
       </el-table-column>
       <el-table-column label="隐患描述" align="center" prop="description" />
-      <el-table-column label="检查时间" align="center" prop="inspect_time" width="150px">
+      <el-table-column
+        label="检查时间"
+        align="center"
+        prop="inspect_time"
+        width="150px"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.inspect_time) }}</span>
         </template>
@@ -85,9 +149,21 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+        width="140"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)">查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleSee(scope.row)"
+            >查看</el-button
+          >
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                         v-hasPermi="['backend:hidden-danger:update']">修改</el-button>
                       <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -96,17 +172,34 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      v-dialogDrag
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="处理结果" prop="handleResult">
           <el-input v-model="form.handleResult" placeholder="请输入处理结果" />
         </el-form-item>
         <el-form-item label="处理时间" prop="handleTime">
-          <el-date-picker clearable v-model="form.handleTime" type="date" value-format="timestamp" placeholder="选择处理时间"
-            style="width: 100%" />
+          <el-date-picker
+            clearable
+            v-model="form.handleTime"
+            type="date"
+            value-format="timestamp"
+            placeholder="选择处理时间"
+            style="width: 100%"
+          />
         </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status" style="width: 100%;">
@@ -115,9 +208,17 @@
           </el-radio-group>
         </el-form-item> -->
         <el-form-item label="处理方式" prop="handleMethod">
-          <el-select v-model="form.handleMethod" placeholder="请选择处理方式" style="width: 100%">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DENGER_HANDLE)" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
+          <el-select
+            v-model="form.handleMethod"
+            placeholder="请选择处理方式"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in this.getDictDatas(DICT_TYPE.DENGER_HANDLE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
       </el-form>
@@ -126,16 +227,30 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="详细信息查看" :visible.sync="openSeedialog" width="85vw" class="detail">
-      <el-form ref="form" :model="deatilData" label-width="auto" label-position="left">
+    <el-dialog
+      title="详细信息查看"
+      :visible.sync="openSeedialog"
+      width="85vw"
+      class="detail detail-style"
+    >
+      <el-form
+        ref="form"
+        :model="deatilData"
+        label-width="auto"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item label="任务名称:" prop="inspName">
               <div>{{ deatilData.task_name }}</div>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
           <el-col :span="14">
             <el-form-item label="任务类型:" prop="dwdz">
-              <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="deatilData.task_type" />
+              <dict-tag
+                :type="DICT_TYPE.TASK_STATUS"
+                :value="deatilData.task_type"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -143,10 +258,14 @@
           <el-col :span="10">
             <el-form-item label="检查项名称:" prop="insp_name">
               <div>{{ deatilData.insp_name }}</div>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
           <el-col :span="14">
             <el-form-item label="检查项类型:" prop="insp_type">
-              <dict-tag :type="DICT_TYPE.DICT_INSPECT_TYPE" :value="deatilData.insp_type" />
+              <dict-tag
+                :type="DICT_TYPE.DICT_INSPECT_TYPE"
+                :value="deatilData.insp_type"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -154,10 +273,14 @@
           <el-col :span="10">
             <el-form-item label="单位名称:" prop="org_name">
               <div>{{ deatilData.org_name }}</div>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
           <el-col :span="14">
             <el-form-item label="单位类型:" prop="dwlx">
-              <dict-tag :type="DICT_TYPE.BACKEND_ORG_TYPE" :value="deatilData.dwlx" />
+              <dict-tag
+                :type="DICT_TYPE.BACKEND_ORG_TYPE"
+                :value="deatilData.dwlx"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -165,7 +288,8 @@
           <el-col :span="10">
             <el-form-item label="隐患状态:" prop="denger_status">
               <div>{{ deatilData.denger_status }}</div>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
           <el-col :span="14">
             <el-form-item label="隐患描述:" prop="description">
               <div>{{ deatilData.description }}</div>
@@ -176,22 +300,44 @@
           <el-col :span="10">
             <el-form-item label="检查项时间:" prop="insp_name">
               <span>{{ parseTime(deatilData.inspect_time) }}</span>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
             <el-form-item label="现场照片:" prop="insp_name">
-              <div v-if="imgDeatilData.imgUrlList"><img v-for="(item, index) in imgDeatilData.imgUrlList" :key="index"
-                  :src="item.imgUrl" style="width:120px;height:120px;margin-right: 30px;"></div>
-              <div v-else style="justify-content:space-around;margin-top:10px;">
-                <img v-if="imgDeatilData.imgUrl1" :showLoading="true" :src="imgDeatilData.imgUrl1"
-                  style="width:120px;height:120px;margin-right: 30px;" />
-                <img v-if="imgDeatilData.imgUrl2" :showLoading="true" :src="imgDeatilData.imgUrl2"
-                  style="width:120px;height:120px;margin-right: 30px;" />
-                <img v-if="imgDeatilData.imgUrl3" :showLoading="true" :src="imgDeatilData.imgUrl3"
-                  style="width:120px;height:120px;" />
+              <div v-if="imgDeatilData.imgUrlList">
+                <img
+                  v-for="(item, index) in imgDeatilData.imgUrlList"
+                  :key="index"
+                  :src="item.imgUrl"
+                  style="width: 120px; height: 120px; margin-right: 30px"
+                />
               </div>
-            </el-form-item></el-col>
+              <div
+                v-else
+                style="justify-content: space-around; margin-top: 10px"
+              >
+                <img
+                  v-if="imgDeatilData.imgUrl1"
+                  :showLoading="true"
+                  :src="imgDeatilData.imgUrl1"
+                  style="width: 120px; height: 120px; margin-right: 30px"
+                />
+                <img
+                  v-if="imgDeatilData.imgUrl2"
+                  :showLoading="true"
+                  :src="imgDeatilData.imgUrl2"
+                  style="width: 120px; height: 120px; margin-right: 30px"
+                />
+                <img
+                  v-if="imgDeatilData.imgUrl3"
+                  :showLoading="true"
+                  :src="imgDeatilData.imgUrl3"
+                  style="width: 120px; height: 120px"
+                />
+              </div> </el-form-item
+          ></el-col>
         </el-row>
       </el-form>
 
@@ -431,7 +577,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -450,8 +596,11 @@ export default {
           this.$download.excel(response, "隐患列表.xls");
           this.exportLoading = false;
         })
-        .catch(() => { });
+        .catch(() => {});
     },
   },
 };
 </script>
+<style lang="scss" scoped>
+@import "~@/assets/styles/dialog.scss";
+</style>

src/views/backend/inspectHis/index.vue

@@ -2,17 +2,40 @@
   <div class="app-container">
     <div ref="sousuH">
       <!-- 搜索工作栏 -->
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="90px"
+      >
         <el-form-item label="任务名称" prop="taskName">
-          <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
+          <el-input
+            v-model="queryParams.taskName"
+            placeholder="请输入任务名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
         <el-form-item label="任务类型" prop="taskType">
           <!-- <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TASK_TYPE)" :key="dict.value" :label="dict.label"
               :value="dict.value" />
           </el-select> -->
-          <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
-            <el-option v-for="dict in this.filteredDataType" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-select
+            v-model="queryParams.taskType"
+            placeholder="请选择任务类型"
+            clearable
+            size="small"
+            @change="typeChange"
+          >
+            <el-option
+              v-for="dict in this.filteredDataType"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="任务状态" prop="taskStatus">
@@ -25,9 +48,16 @@
           <el-input v-model="queryParams.taskScore" placeholder="请输入任务积分" clearable @keyup.enter.native="handleQuery" />
         </el-form-item> -->
         <el-form-item label="检查日期" prop="inspectTime">
-          <el-date-picker v-model="queryParams.inspectTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
-            type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-            :default-time="['00:00:00', '23:59:59']" />
+          <el-date-picker
+            v-model="queryParams.inspectTime"
+            style="width: 240px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+          />
         </el-form-item>
         <!-- <el-form-item label="所属单位" prop="orgId">
                             <el-input v-model="queryParams.orgId" placeholder="请输入所属单位" clearable @keyup.enter.native="handleQuery" />
@@ -52,13 +82,19 @@
                           </el-form-item> -->
         <el-form-item prop="inspName">
           <template #label>
-            <div style="min-width: auto;">检查项名称</div>
+            <div style="min-width: auto">检查项名称</div>
           </template>
-          <el-input v-model="queryParams.inspName" placeholder="请输入检查项名称" clearable
-            @keyup.enter.native="handleQuery" />
+          <el-input
+            v-model="queryParams.inspName"
+            placeholder="请输入检查项名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery"
+            >搜索</el-button
+          >
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
@@ -72,33 +108,64 @@
               <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                 :loading="exportLoading" v-hasPermi="['backend:inspect-his:export']">导出</el-button>
             </el-col> -->
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
       </el-row>
     </div>
     <!-- 列表 -->
     <!-- <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'"> -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="检查项名称" align="center" prop="insp_name" width="150" />
-      <el-table-column label="任务名称" align="center" prop="task_name" width="130" />
+      <el-table-column
+        label="检查项名称"
+        align="center"
+        prop="insp_name"
+        width="150"
+      />
+      <el-table-column
+        label="任务名称"
+        align="center"
+        prop="task_name"
+        width="130"
+      />
       <el-table-column label="任务类型" align="center" prop="task_type">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.task_type" />
         </template>
       </el-table-column>
       <el-table-column label="任务内容" align="center" prop="description" />
-      <el-table-column label="任务状态" align="center" prop="taskStatus" width="120">
+      <el-table-column
+        label="任务状态"
+        align="center"
+        prop="taskStatus"
+        width="120"
+      >
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="scope.row.taskStatus" />
+          <dict-tag
+            :type="DICT_TYPE.TASK_STATUS"
+            :value="scope.row.taskStatus"
+          />
         </template>
       </el-table-column>
       <!-- <el-table-column label="任务积分" align="center" prop="taskScore" /> -->
-      <el-table-column label="检查日期" align="center" prop="inspect_time" width="180">
+      <el-table-column
+        label="检查日期"
+        align="center"
+        prop="inspect_time"
+        width="180"
+      >
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.inspect_time) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="所属单位" align="center" prop="org_name" width="150" />
+      <el-table-column
+        label="所属单位"
+        align="center"
+        prop="org_name"
+        width="150"
+      />
       <!-- <el-table-column label="检查结果" align="center" prop="inspResult">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DENGER_HANDLE" :value="scope.row.inspResult" />
@@ -111,7 +178,10 @@
       </el-table-column> -->
       <el-table-column label="是否隐患" align="center" prop="isdenger">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isdenger" />
+          <dict-tag
+            :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+            :value="scope.row.isdenger"
+          />
         </template>
       </el-table-column>
       <!-- <el-table-column label="状态" align="center" prop="status">
@@ -119,10 +189,22 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+        width="180"
+      >
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleSee(scope.row)"
-            v-hasPermi="['backend:inspect-his:update']">查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleSee(scope.row)"
+            v-hasPermi="['backend:inspect-his:update']"
+            >查看</el-button
+          >
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasPermi="['backend:inspect-his:update']">修改</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -131,28 +213,59 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" v-dialogDrag append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="800px"
+      v-dialogDrag
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="任务名称" prop="taskName">
-              <el-input v-model="form.taskName" placeholder="请输入任务名称" /> </el-form-item></el-col>
-          <el-col :span="12"><el-form-item label="任务类型" prop="taskType">
-              <el-select v-model="form.taskType" placeholder="请选择任务类型" style="width: 100%">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TASK_TYPE)" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select> </el-form-item></el-col>
+              <el-input
+                v-model="form.taskName"
+                placeholder="请输入任务名称"
+              /> </el-form-item
+          ></el-col>
+          <el-col :span="12"
+            ><el-form-item label="任务类型" prop="taskType">
+              <el-select
+                v-model="form.taskType"
+                placeholder="请选择任务类型"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in this.getDictDatas(DICT_TYPE.TASK_TYPE)"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select> </el-form-item
+          ></el-col>
         </el-row>
         <el-row>
-          <el-col :span="12"><el-form-item label="任务状态" prop="taskStatus">
+          <el-col :span="12"
+            ><el-form-item label="任务状态" prop="taskStatus">
               <el-radio-group v-model="form.taskStatus" style="width: 100%">
-                <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
-                  :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio
+                  v-for="dict in this.getDictDatas(DICT_TYPE.TASK_STATUS)"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
           <!-- <el-col :span="12">
             <el-form-item label="任务积分" prop="taskScore">
               <el-input v-model="form.taskScore" placeholder="请输入任务积分" /> </el-form-item></el-col> -->
@@ -160,11 +273,22 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="检查日期" prop="inspectTime">
-              <el-date-picker clearable v-model="form.inspectTime" type="date" value-format="timestamp"
-                placeholder="选择检查日期" style="width: 100%" /> </el-form-item></el-col>
+              <el-date-picker
+                clearable
+                v-model="form.inspectTime"
+                type="date"
+                value-format="timestamp"
+                placeholder="选择检查日期"
+                style="width: 100%"
+              /> </el-form-item
+          ></el-col>
           <el-col :span="12">
             <el-form-item label="所属单位" prop="orgId">
-              <el-input v-model="form.orgId" placeholder="请输入所属单位" /> </el-form-item></el-col>
+              <el-input
+                v-model="form.orgId"
+                placeholder="请输入所属单位"
+              /> </el-form-item
+          ></el-col>
         </el-row>
         <!-- <el-row>
           <el-col :span="12">
@@ -183,13 +307,28 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="单位类型" prop="orgType">
-              <el-select v-model="form.orgType" placeholder="请选择单位类型" style="width: 100%">
-                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMPANY_inspectitem_kind)" :key="dict.value"
-                  :label="dict.label" :value="dict.value" />
-              </el-select> </el-form-item>
+              <el-select
+                v-model="form.orgType"
+                placeholder="请选择单位类型"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in this.getDictDatas(
+                    DICT_TYPE.COMPANY_inspectitem_kind
+                  )"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
-          <el-col :span="12"><el-form-item label="检查项名称" prop="inspectName">
-              <el-input v-model="form.inspectName" placeholder="请输入检查项名称" />
+          <el-col :span="12"
+            ><el-form-item label="检查项名称" prop="inspectName">
+              <el-input
+                v-model="form.inspectName"
+                placeholder="请输入检查项名称"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -197,9 +336,14 @@
           <el-col :span="12">
             <el-form-item label="是否隐患" prop="isdenger">
               <el-radio-group v-model="form.isdenger" style="width: 100%">
-                <el-radio v-for="dict in this.getDictDatas(
-                  DICT_TYPE.INFRA_BOOLEAN_STRING
-                )" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio
+                  v-for="dict in this.getDictDatas(
+                    DICT_TYPE.INFRA_BOOLEAN_STRING
+                  )"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -213,9 +357,14 @@
           </el-col> -->
         </el-row>
         <el-row>
-          <el-col :span="24"><el-form-item label="任务内容">
-              <editor v-model="form.taskContent" :min-height="192" style="width: 100%" />
-            </el-form-item></el-col>
+          <el-col :span="24"
+            ><el-form-item label="任务内容">
+              <editor
+                v-model="form.taskContent"
+                :min-height="192"
+                style="width: 100%"
+              /> </el-form-item
+          ></el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -224,51 +373,86 @@
       </div>
     </el-dialog>
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog title="查看" :visible.sync="opensee" width="800px" v-dialogDrag append-to-body class="detail">
-      <el-form ref="form" :model="form" label-width="auto" label-position="left" :rules="rules">
+    <el-dialog
+      title="查看"
+      :visible.sync="opensee"
+      width="800px"
+      v-dialogDrag
+      append-to-body
+      class="detail detail-style"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        label-width="auto"
+        label-position="left"
+        :rules="rules"
+      >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="检查项名称" prop="inspName">
-              <strong>{{ form.inspName }}</strong>
-            </el-form-item></el-col>
+            <el-form-item label="检查项名称" prop="insp_name">
+              <div>{{ form.insp_name }}</div>
+            </el-form-item></el-col
+          >
           <el-col :span="12">
-            <el-form-item label="任务名称" prop="taskName">
-              <strong>{{ form.taskName }}</strong>
-            </el-form-item></el-col>
+            <el-form-item label="任务名称" prop="task_name">
+              <div>{{ form.task_name }}</div>
+            </el-form-item></el-col
+          >
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="任务类型" prop="taskType">
-              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="form.taskType" />
-            </el-form-item></el-col>
+            <el-form-item label="任务类型" prop="task_type">
+              <dict-tag
+                :type="DICT_TYPE.TASK_TYPE"
+                :value="form.task_type"
+              /> </el-form-item
+          ></el-col>
           <el-col :span="12">
             <el-form-item label="任务状态" prop="taskStatus">
-              <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="form.taskStatus" />
-            </el-form-item></el-col>
+              <dict-tag
+                :type="DICT_TYPE.TASK_STATUS"
+                :value="form.taskStatus"
+              /> </el-form-item
+          ></el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="任务内容">
-              <strong>{{ form.taskContent }}</strong>
-            </el-form-item></el-col>
+              <div>{{ form.taskStatus }}</div>
+            </el-form-item></el-col
+          >
           <!-- <el-col :span="12">
             <el-form-item label="任务积分" prop="taskScore">
               <strong>{{ form.taskScore }}</strong>
             </el-form-item></el-col> -->
           <el-col :span="12">
-            <el-form-item label="检查日期" prop="inspectTime">
-              <strong>{{ parseTime(form.inspectTime) }}</strong>
-            </el-form-item></el-col>
+            <el-form-item label="检查日期" prop="inspect_time">
+              <div>{{ parseTime(form.inspect_time) }}</div>
+            </el-form-item></el-col
+          >
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="所属单位" prop="orgId">
-              <strong>{{ form.orgId }}</strong>
-            </el-form-item></el-col>
+            <el-form-item
+              label="所属单位"
+              prop="org_name
+"
+            >
+              <div>{{ form.org_name }}</div>
+            </el-form-item></el-col
+          >
           <el-col :span="12">
+            <el-form-item label="是否隐患" prop="isdenger">
+              <dict-tag
+                :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+                :value="form.isdenger"
+              /> </el-form-item
+          ></el-col>
+          <!-- <el-col :span="12">？？？后端未返回该字段暂时屏蔽
             <el-form-item label="单位类型" prop="orgType">
               <dict-tag :type="DICT_TYPE.COMPANY_inspectitem_kind" :value="form.orgType" /> </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <!-- <el-row>
           <el-col :span="12">
@@ -280,17 +464,14 @@
               <dict-tag :type="DICT_TYPE.DENGER_HANDLE" :value="form.inspResult" />
             </el-form-item></el-col>
         </el-row> -->
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="是否隐患" prop="isdenger">
-              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="form.isdenger" />
-            </el-form-item></el-col>
-          <!-- <el-col :span="12">
+        <!-- <el-row> -->
+
+        <!-- <el-col :span="12">
             <el-form-item label="状态" prop="status">
               <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="form.status" />
             </el-form-item>
           </el-col> -->
-        </el-row>
+        <!-- </el-row> -->
         <!-- <el-row>
         
         </el-row> -->
@@ -303,13 +484,6 @@
 </template>
 
 <script>
-
-
-
-
-
-
-
 import {
   createInspectHis,
   updateInspectHis,
@@ -357,12 +531,12 @@ export default {
         isdenger: null,
         status: null,
         inspectName: null,
-        inspName:null
+        inspName: null,
       },
       // 表单参数
       // 表单参数
       form: {
-        status: 0
+        status: 0,
       },
       // 表单校验
       rules: {
@@ -377,16 +551,17 @@ export default {
       searchType: "",
       // searchName:"",
       // searchMisson:'',
-      filteredDataType:[]
+      filteredDataType: [],
     };
   },
   props: ["orgId", "taskType"],
   watch: {
-    orgId: { //深度监听，可监听到对象、数组的变化
+    orgId: {
+      //深度监听，可监听到对象、数组的变化
       handler(newV, oldV) {
-        this.getList()
+        this.getList();
       },
-      deep: true
+      deep: true,
     },
     // taskType: { //深度监听，可监听到对象、数组的变化
 
@@ -404,7 +579,7 @@ export default {
         label == "隐患复查" ||
         label == "消防巡查"
     );
-    console.log(typeof 'this.taskType :>> ', typeof this.taskType);
+    console.log(typeof "this.taskType :>> ", typeof this.taskType);
     //挂载window.onresize事件(动态设置table高度)
     window.addEventListener("resize", () => {
       this.$nextTick(() => {
@@ -429,7 +604,7 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
-      this.queryParams.orgId = this.orgId
+      this.queryParams.orgId = this.orgId;
       // this.queryParams.taskType = this.taskType
       // 执行查询
       getInspectHisPage(this.queryParams).then((response) => {
@@ -462,15 +637,14 @@ export default {
         inspectName: undefined,
       };
 
-      this.form.orgId = this.orgId
-      this.form.taskType = this.taskType
+      this.form.orgId = this.orgId;
+      this.form.taskType = this.taskType;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
       this.getList();
-
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -488,11 +662,11 @@ export default {
     handleSee(row) {
       this.reset();
       const id = row.id;
-      getInspectHis(id).then((response) => {
-        this.form = response.data;
-        this.opensee = true;
-        this.title = "查看检查项历史";
-      });
+      // getInspectHis(id).then((response) => {
+      this.form = row;
+      this.opensee = true;
+      this.title = "查看检查项历史";
+      // });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -539,7 +713,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -558,33 +732,20 @@ export default {
           this.$download.excel(response, "API 访问日志.xls");
           this.exportLoading = false;
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     typeChange(e) {
       // console.log(e,'change');
-      this.searchType = e
-      this.queryParams.taskType=e
+      this.searchType = e;
+      this.queryParams.taskType = e;
       // getInspectHisPage({ pageNo: 1, pageSize: 10, taskType: e }).then(res => {
       //   this.list = res.data.list
       //   // console.log(res,'ooo');
       // })
-    }
+    },
   },
 };
 </script>
 <style lang="scss" scoped>
-.detail {
-
-  ::v-deep .el-form-item__label,
-  ::v-deep .el-form-item__content {
-    font-size: 16px;
-    color: #86909C;
-    font-weight: 500;
-  }
-
-  ::v-deep .el-form-item__content {
-    color: #444444 !important;
-    font-size: 14px;
-  }
-}
+@import "~@/assets/styles/dialog.scss";
 </style>

src/views/backend/meeting/index.vue

@@ -142,6 +142,9 @@
               :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="附件id" prop="meetingAtt">
+          <fileUpload v-model="form.meetingAtt" />
+        </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status" style="width: 100%;">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
@@ -221,11 +224,11 @@ import { createMeetingParticipants, updateMeetingParticipants, deleteMeetingPart
 import handleSelectedOrg from '@/components/handleSelectedOrg';
 import meetPage from '../meetingParticipants/index.vue'
 import { getTableHeight } from "@/utils/ruoyi.js";
-
+import FileUpload from '@/components/FileUpload'
 export default {
   name: "Meeting",
   components: {
-    choiceSelect, handleSelectedOrg, meetPage
+    choiceSelect, handleSelectedOrg, meetPage,FileUpload
   },
   data() {
     return {

src/views/backend/org/index.vue

@@ -871,7 +871,7 @@
       title="详细信息查看"
       :visible.sync="openSeedialog"
       width="85vw"
-      class="detail"
+      class="detail detail-style"
     >
       <el-form
         ref="form"
@@ -1546,20 +1546,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.detail,
-.details {
-  ::v-deep .el-form-item__label,
-  ::v-deep .el-form-item__content {
-    font-size: 16px;
-    color: #86909c;
-    font-weight: 500;
-  }
-
-  ::v-deep .el-form-item__content {
-    font-size: 14px;
-    color: #444444 !important;
-  }
-}
+@import "~@/assets/styles/dialog.scss";
 
 ::v-deep .el-dialog__body {
   margin-left: 60px !important;
@@ -1578,4 +1565,5 @@ export default {
   //   margin-left: 20px !important;
   // }
 }
+
 </style>

src/views/backend/org2/index.vue

@@ -871,7 +871,7 @@
       title="详细信息查看"
       :visible.sync="openSeedialog"
       width="85vw"
-      class="detail"
+      class="detail detail-style"
     >
       <el-form
         ref="form"
@@ -1546,21 +1546,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.detail,
-.details {
-  ::v-deep .el-form-item__label,
-  ::v-deep .el-form-item__content {
-    font-size: 16px;
-    color: #86909c;
-    font-weight: 500;
-  }
-
-  ::v-deep .el-form-item__content {
-    font-size: 14px;
-    color: #444444 !important;
-  }
-}
-
+@import "~@/assets/styles/dialog.scss";
 ::v-deep .el-dialog__body {
   margin-left: 60px !important;
 }

src/views/backend/street/index.vue

@@ -57,8 +57,8 @@
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="600px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-form-item label="区域id" prop="quid">
           <el-input v-model="form.quid" placeholder="请输入区域id" />
         </el-form-item>

src/views/backend/taskInfo/index.vue

@@ -61,22 +61,22 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                ? scope.row.taskName
                 : ""
               }}</template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
             <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO == null
+              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row == null
                   ? 0
-                  : scope.row.taskInfoDO.taskType
+                  : scope.row.taskType
                 " />
             </template>
           </el-table-column>
           <el-table-column label="任务内容" align="center">
             <template slot-scope="scope">
-              <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+              <div v-html="scope.row ? scope.row.taskContent : ''
                 "></div>
             </template>
           </el-table-column>
@@ -177,21 +177,21 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                ? scope.row.taskName
                 : ""
               }}
             </template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
             <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskType : ''
+              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row ? scope.row.taskType : ''
                 " />
             </template>
           </el-table-column>
           <el-table-column label="任务内容" align="center">
             <template slot-scope="scope">
-              <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+              <div v-html="scope.row ? scope.row.taskContent : ''
                 "></div>
             </template>
           </el-table-column>
@@ -279,23 +279,23 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                ? scope.row.taskName
                 : ""
               }}
             </template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
             <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO == null
+              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row == null
                   ? 0
-                  : scope.row.taskInfoDO.taskType
+                  : scope.row.taskType
                 " />
             </template>
           </el-table-column>
           <el-table-column label="任务内容" align="center">
             <template slot-scope="scope">
-              <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+              <div v-html="scope.row ? scope.row.taskContent : ''
                 "></div>
             </template>
           </el-table-column>
@@ -377,23 +377,23 @@
           <el-table-column label="任务名称" align="center">
             <template v-slot="scope">
               {{
-                scope.row.taskInfoDO != null
-                ? scope.row.taskInfoDO.taskName
+                scope.row != null
+                ? scope.row.taskName
                 : ""
               }}
             </template>
           </el-table-column>
           <el-table-column label="任务类型" align="center">
             <template v-slot="scope">
-              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.taskInfoDO == null
+              <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row == null
                   ? 0
-                  : scope.row.taskInfoDO.taskType
+                  : scope.row.taskType
                 " />
             </template>
           </el-table-column>
           <el-table-column label="任务内容" align="center">
             <template slot-scope="scope">
-              <div v-html="scope.row.taskInfoDO ? scope.row.taskInfoDO.taskContent : ''
+              <div v-html="scope.row ? scope.row.taskContent : ''
                 "></div>
             </template>
           </el-table-column>
@@ -651,7 +651,7 @@
         <el-button type="primary" @click="openSelectedInsp = false">关 闭</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="详细信息查看" :visible.sync="openSeedialog" width="85vw" class="detail">
+    <el-dialog title="详细信息查看" :visible.sync="openSeedialog" width="85vw" class="detail detail-style">
       <el-form ref="form" :model="deatilData" label-width="auto" label-position="left">
         <el-row :gutter="20">
           <el-col :span="10">
@@ -664,7 +664,7 @@
             </el-form-item></el-col>
           <el-col :span="14">
             <el-form-item label="任务类型:">
-              <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="deatilData.taskInfoDO ? deatilData.taskInfoDO.taskType : ''
+              <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="deatilData ? deatilData.taskType : ''
                 " />
             </el-form-item>
           </el-col>
@@ -1393,3 +1393,6 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+@import "~@/assets/styles/dialog.scss";
+</style>

src/views/unitorg/buildingInfo/index.vue

@@ -112,7 +112,7 @@
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
-    <el-dialog title="详细信息查看" :visible.sync="openSeedialog" width="85vw" class="detail">
+    <el-dialog title="详细信息查看" :visible.sync="openSeedialog" width="85vw" class="detail detail-style">
       <el-form ref="form" :model="form" label-width="auto" label-position="left">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -305,7 +305,11 @@
               <el-input v-model="form.buildingName" placeholder="请输入" clearable /> </el-form-item></el-col>
               <el-col :span="12" >
             <!-- <div  @click="handleChoice" v-if="!orgshow">所属单位</div> v-else-if="orgshow" -->
-            <el-form-item label="所属单位:" prop="orgIds">
+            <el-form-item  prop="orgIds">
+              <template slot="label">
+                <span style="color: #ff4949;margin-right: 4px;">*</span>
+                <span>所属单位:</span>
+              </template>
               <el-input v-model="form.orgIds" @focus="handleChoice" placeholder="请选择" clearable/> </el-form-item>
             </el-col>
 
@@ -717,20 +721,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.detail {
-
-  ::v-deep .el-form-item__label,
-  ::v-deep .el-form-item__content {
-    font-size: 16px;
-    color: #86909C;
-    font-weight: 500;
-  }
-
-  ::v-deep .el-form-item__content {
-    font-size: 14px;
-    color: #444444 !important;
-  }
-}
+@import "~@/assets/styles/dialog.scss";
 
 ::v-deep .el-dialog__body {
   margin-left: 60px !important;

src/views/unitorg/emp/index.vue

@@ -245,7 +245,7 @@
           <el-col :span="12">
             <el-form-item label="所属机构:" prop="sjjgs">
               <template slot="label">
-                <span style="color: #ff4949;margin-right: 4px;">*</span>
+                <span style="color: #ff4949; margin-right: 4px">*</span>
                 <span>所属机构</span>
               </template>
               <el-input
@@ -305,21 +305,42 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="专业" prop="empZy">
+              <el-input
+                v-model="form.empZy"
+                placeholder="请输入专业"
+              /> </el-form-item
+          ></el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="民族代码" prop="mzdm">
+              <el-input v-model="form.mzdm" placeholder="请输入民族代码" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+        <!-- <el-row>
+          <el-col :span="12">
             <el-form-item label="代码" prop="zzmmdm">
               <el-input
                 v-model="form.zzmmdm"
                 placeholder="请输入政治面貌代码"
               /> </el-form-item
-          ></el-col>
-        </el-row>
+          ></el-col> 
+        </el-row> -->
         <el-row>
           <el-col :span="12">
+            <el-form-item label="区域编码" prop="qybm">
+              <el-input
+                v-model="form.qybm"
+                placeholder="请输入区域编码"
+              /> </el-form-item
+          ></el-col>
+          <!-- <el-col :span="12">
             <el-form-item label="籍贯代码" prop="jgdm">
               <el-input
                 v-model="form.jgdm"
                 placeholder="请输入籍贯代码"
               /> </el-form-item
-          ></el-col>
+          ></el-col> -->
           <el-col :span="12">
             <el-form-item label="人员性别" prop="empGender">
               <el-select v-model="form.empGender" placeholder="请选择性别">
@@ -379,10 +400,10 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="专业" prop="empZy">
+            <el-form-item label="身份证号" prop="sfzid">
               <el-input
-                v-model="form.empZy"
-                placeholder="请输入专业"
+                v-model="form.sfzid"
+                placeholder="请输入身份证号"
               /> </el-form-item
           ></el-col>
           <!--          <el-col :span="12">-->
@@ -420,12 +441,19 @@
         </el-row>
         <el-row>
           <el-col :span="12">
+            <el-form-item label="通讯地址" prop="txdz">
+              <el-input
+                v-model="form.txdz"
+                placeholder="请输入通讯地址"
+              /> </el-form-item
+          ></el-col>
+          <!-- <el-col :span="12">
             <el-form-item label="警官证号" prop="jgzh">
               <el-input
                 v-model="form.jgzh"
                 placeholder="请输入警官证号"
               /> </el-form-item
-          ></el-col>
+          ></el-col> -->
           <el-col :span="12">
             <el-form-item label="执法身份证" prop="zfsfzid">
               <el-input
@@ -434,36 +462,6 @@
               /> </el-form-item
           ></el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="区域编码" prop="qybm">
-              <el-input
-                v-model="form.qybm"
-                placeholder="请输入区域编码"
-              /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="民族代码" prop="mzdm">
-              <el-input v-model="form.mzdm" placeholder="请输入民族代码" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="身份证号" prop="sfzid">
-              <el-input
-                v-model="form.sfzid"
-                placeholder="请输入身份证号"
-              /> </el-form-item
-          ></el-col>
-          <el-col :span="12">
-            <el-form-item label="通讯地址" prop="txdz">
-              <el-input
-                v-model="form.txdz"
-                placeholder="请输入通讯地址"
-              /> </el-form-item
-          ></el-col>
-        </el-row>
         <!-- <el-row> -->
 
         <!-- <el-col :span="12">
@@ -503,7 +501,7 @@
       title="人员信息查看"
       :visible.sync="openSeedialog"
       width="70vw"
-      class="detail"
+      class="detail detail-style"
     >
       <el-form
         ref="form"
@@ -544,18 +542,11 @@
               <div>{{ form.mzdm }}</div>
             </el-form-item></el-col
           >
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="代码" prop="zzmmdm">
               <div>{{ form.sjzzmmdmjgs }}</div>
             </el-form-item></el-col
-          >
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="籍贯代码" prop="jgdm">
-              <div>{{ form.jgdm }}</div>
-            </el-form-item></el-col
-          >
+          > -->
           <el-col :span="12">
             <el-form-item label="人员性别" prop="empGender">
               <dict-tag
@@ -564,6 +555,14 @@
               /> </el-form-item
           ></el-col>
         </el-row>
+        <!-- <el-row>
+          <el-col :span="12">
+            <el-form-item label="籍贯代码" prop="jgdm">
+              <div>{{ form.jgdm }}</div>
+            </el-form-item></el-col
+          >
+          
+        </el-row> -->
         <el-row>
           <el-col :span="12">
             <el-form-item label="现在单位" prop="xzdw">
@@ -624,18 +623,7 @@
             </el-form-item></el-col
           >
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="警官证号" prop="jgzh">
-              <div>{{ form.jgzh }}</div>
-            </el-form-item></el-col
-          >
-          <el-col :span="12">
-            <el-form-item label="执法身份证" prop="zfsfzid">
-              <div>{{ form.zfsfzid }}</div>
-            </el-form-item></el-col
-          >
-        </el-row>
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="区域编码" prop="qybm">
@@ -660,6 +648,18 @@
             </el-form-item></el-col
           >
         </el-row>
+        <el-row>
+          <!-- <el-col :span="12">
+            <el-form-item label="警官证号" prop="jgzh">
+              <div>{{ form.jgzh }}</div>
+            </el-form-item></el-col
+          > -->
+          <el-col :span="12">
+            <el-form-item label="执法身份证" prop="zfsfzid">
+              <div>{{ form.zfsfzid }}</div>
+            </el-form-item></el-col
+          >
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="openSeedialog = false">关 闭</el-button>
@@ -953,19 +953,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.detail {
-  ::v-deep .el-form-item__label,
-  ::v-deep .el-form-item__content {
-    font-size: 16px;
-    color: #86909c;
-    font-weight: 500;
-  }
-
-  ::v-deep .el-form-item__content {
-    font-size: 14px;
-    color: #444444 !important;
-  }
-}
+@import "~@/assets/styles/dialog.scss";
 .el-select {
   width: 100%;
 }

src/views/unitorg/fpd/index.vue

@@ -151,7 +151,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="消防设施查看" :visible.sync="openSeedialog" width="60vw" class="detail">
+    <el-dialog title="消防设施查看" :visible.sync="openSeedialog" width="60vw" class="detail detail-style">
       <el-form ref="form" :model="form" label-width="auto" label-position="left">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -548,6 +548,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import "~@/assets/styles/dialog.scss";
 .detail {
   display: flex;
   justify-content: center;

src/views/unitorg/org/index.vue

@@ -871,7 +871,7 @@
       title="详细信息查看"
       :visible.sync="openSeedialog"
       width="85vw"
-      class="detail"
+      class="detail detail-style"
     >
       <el-form
         ref="form"
@@ -896,11 +896,11 @@
             <!-- <el-form-item label="单位拼音简称:" prop="dwpyjc">
               <div>{{ form.dwpyjc }}</div>
             </el-form-item> -->
-             <el-form-item label="上级消防管辖单位:" prop="sjxfgxdw">
+            <el-form-item label="上级消防管辖单位:" prop="sjxfgxdw">
               <div>{{ deptOptionsTrans(form.sjxfgxdw) }}</div>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="14">
             <el-form-item label="监管单位类别:" prop="dwlx">
               <div>
@@ -1546,21 +1546,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.detail,
-.details {
-  ::v-deep .el-form-item__label,
-  ::v-deep .el-form-item__content {
-    font-size: 16px;
-    color: #86909c;
-    font-weight: 500;
-  }
-
-  ::v-deep .el-form-item__content {
-    font-size: 14px;
-    color: #444444 !important;
-  }
-}
-
+@import "~@/assets/styles/dialog.scss";
 ::v-deep .el-dialog__body {
   margin-left: 60px !important;
 }
@@ -1569,13 +1555,5 @@ export default {
   margin-left: 0 !important;
 }
 
-.details {
-  ::v-deep .el-col-12 {
-    padding-left: 60px !important;
-  }
 
-  // ::v-deep .el-form-item__label-wrap {
-  //   margin-left: 20px !important;
-  // }
-}
 </style>