Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

.env.development

@@ -14,8 +14,8 @@ ENV = 'development'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超
-VUE_APP_BASE_API = 'http://10.87.11.173:8080'
-# VUE_APP_BASE_API = 'http://localhost:8080'
+# VUE_APP_BASE_API = 'http://10.87.11.173:8080'
+VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
 # VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 

.gitignore

@@ -18,7 +18,7 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
-
+*.env.development
 package-lock.json
 yarn.lock
 /web

src/api/system/user.js

@@ -25,6 +25,14 @@ export function dictionListUser(query) {
     params: query
   })
 }
+
+export function userListData(query) {
+  return request({
+    url: '/system/user/userListData',
+    method: 'get',
+    params: query
+  })
+}
 export function selectrolesByOrgId(query) {
   return request({
     url: '/system/user/selectrolesByOrgId',

src/components/common/userselect.vue

@@ -25,7 +25,7 @@
 <script>
 import sync from "../utils/computed.sync";
 import { groupBy } from "lodash";
-import { dictionListUser } from "@/api/system/user";
+import {dictionListUser, userListData} from "@/api/system/user";
 
 export default {
   data() {
@@ -125,7 +125,7 @@ export default {
       );
     },
     async refresh() {
-      dictionListUser(this.params).then(items=>{
+      userListData(this.params).then(items=>{
         // debugger
         if(items.data && Array.isArray(items.data)){
         items=items.data;

src/views/core/drill/plan/index.vue

@@ -33,14 +33,14 @@
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-         
+
           <!--          <el-form-item label="演练角色" prop="planRoleId">
                       <el-select v-model="queryParams.planRoleId" placeholder="请选择演练角色" clearable>
                         <el-option v-for="item in planRoleList" :key="item.roleId" :label="item.roleName"
                                    :value="item.roleId"></el-option>
                       </el-select>
                     </el-form-item>-->
-          
+
 
           <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -85,7 +85,7 @@
             <template slot-scope="scope">
               <dict-tag :options="dict.type.drill_plan_status" :value="scope.row.planStatus"/>
             </template>
-          </el-table-column>          
+          </el-table-column>
           <!-- <el-table-column label="备注" align="center" prop="remark"/> -->
           <!-- <el-table-column label="修改人" align="center" width="100" prop="updateBy"/> -->
           <el-table-column label="操作" align="left" header-align="center"  fixed="right" class-name="small-padding fixed-width">
@@ -131,7 +131,7 @@
                            :value="parseInt(dict.value)"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>          
+          </el-col>
           <el-col :span="12">
             <el-form-item label="任务次数" prop="execTimes">
               <template>
@@ -159,7 +159,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12" v-show="form.planCycle != 0">
+          <el-col :span="12" v-show="form.planCycle != 0&&form.planStatus!=2">
             <el-form-item label="立即生效" prop="buildTaskNow">
               <!--              <el-checkbox v-model="form.buildTaskNow">
                               默认从下个周期...
@@ -184,7 +184,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <!-- <el-row>
            <el-col :span="12">

src/views/core/edu/plan/index.vue

@@ -210,7 +210,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12" v-show="form.planCycle != 0">
+          <el-col :span="12" v-show="form.planCycle != 0&&form.planStatus!=2">
             <el-form-item label="立即生效" prop="buildTaskNow">
               <el-checkbox v-model="form.buildTaskNow">
                 默认从下个周期生成任务，

src/views/core/edu/task/dialog.newTask.vue

@@ -20,6 +20,7 @@
             <el-col :span="12">
               <el-form-item  prop="trainingStartDateTime" label="培训开始时间">
                 <el-date-picker required v-model="formData.trainingStartDateTime" :picker-options="startDatepickerOptions"
+                                format="yyyy-MM-dd HH:mm"
                                 type="datetime" placeholder="选择日期"  @change="startDateChanged">
                 </el-date-picker>
               </el-form-item>
@@ -27,6 +28,7 @@
             <el-col :span="12">
               <el-form-item prop="trainingEndDateTime" label="培训结束时间">
                 <el-date-picker required v-model="formData.trainingEndDateTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
+                                format="yyyy-MM-dd HH:mm"
                                 type="datetime" placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>

src/views/evaluateTable/index.vue

@@ -3,52 +3,57 @@
     <el-row slot="rightBar">
       <!--用户数据-->
       <el-col>
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item label="组织机构:" class="formTreeItem">
-            <tree-select
-              v-model="queryParams.orgId"
-              :options="deptOptions"
-              :show-count="true"
-              :normalizer="tenantIdnormalizer"
-              :props="{ checkStrictly: true, label: 'name' }"
-              placeholder="请选择归属机构"
-              clearValueText="清除"
-              :noChildrenText="''"
-              @select="changeSelect"
-              noOptionsText="没有数据"
-              noResultsText="没有搜索结果"
-            />
-          </el-form-item>
-          <el-form-item label="外包评价名称:">
-            <el-select v-model="queryParams.planId" @change="changeHandler">
-              <el-option
-                v-for="item in options"
-                :key="item.id"
-                :label="item.evaluateName"
-                :value="item.id"
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <!--    搜索条件    -->
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="100px"
+            >
+              <el-form-item label="组织机构:" class="formTreeItem">
+                <tree-select
+                  v-model="queryParams.orgId"
+                  :options="deptOptions"
+                  :show-count="true"
+                  :normalizer="tenantIdnormalizer"
+                  :props="{ checkStrictly: true, label: 'name' }"
+                  placeholder="请选择归属机构"
+                  clearValueText="清除"
+                  :noChildrenText="''"
+                  @select="changeSelect"
+                  noOptionsText="没有数据"
+                  noResultsText="没有搜索结果"
+                />
+              </el-form-item>
+              <el-form-item label="外包评价名称:">
+                <el-select v-model="queryParams.planId" @change="changeHandler">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.evaluateName"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="handleQuery"
+                >搜索</el-button
+              >
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
-        </el-form>
+            </el-form>
+          </div>
+        </div>
 
         <!-- 按纽    -->
         <!-- <el-row :gutter="10" class="mb8">
@@ -64,9 +69,12 @@
                 >
               </el-col>
             </el-row> -->
-        <div v-if="obj&&obj.length>0" class="securityEquipmentMonitoringtable ml-4 flex-1">
+        <div
+          v-if="obj && obj.length > 0"
+          class="securityEquipmentMonitoringtable ml-4 flex-1"
+        >
           <div class="title">{{ fullTableTitle }}</div>
-          <table ref="tb11" class="table-scroll" >
+          <table ref="tb11" class="table-scroll">
             <tr>
               <th colspan="1" rowspan="1">序号</th>
               <th colspan="1" rowspan="1" :key="item" v-for="item in obj">
@@ -75,8 +83,7 @@
             </tr>
             <tr v-for="(item, index) in targetList" :key="index">
               <td>{{ index }}</td>
-              <td v-for="i in obj" :key="i"> {{ item[i] }}</td>
-             
+              <td v-for="i in obj" :key="i">{{ item[i] }}</td>
             </tr>
           </table>
         </div>

src/views/evaluationRule/index.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="app-container">
-    <el-row slot="rightBar">
+    
       <!--用户数据-->
       <el-col>
         <!--    搜索条件    -->
-        <el-form
+        <div class="main-search-box">
+          <el-form
           :model="queryParams"
           ref="queryForm"
           size="small"
@@ -106,6 +107,8 @@
             >
           </el-col>
         </el-row>
+        </div>
+        
         <el-table
           border
           height="650"
@@ -143,13 +146,13 @@
                 size="mini"
                 @click="editHandler(row)"
                 type="text"
-                icon="el-icon-plus"
+                class="el-icon-edit-outline"
                 >编辑</el-button
               ><el-button
                 size="mini"
                 @click="deleteHandler(row)"
                 type="text"
-                icon="el-icon-plus"
+                class="el-icon-delete"
                 >删除</el-button
               >
             </template>
@@ -164,7 +167,7 @@
           @pagination="getList"
         />
       </el-col>
-    </el-row>
+   
 
     <editEvaluate ref="Evaluate" :targetList="targetList" @success="getList()"></editEvaluate>
   </div>

src/views/question/list/index.vue

@@ -11,203 +11,213 @@
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="关键字" prop="searchKey">
-            <el-input
-              v-model="queryParams.searchKey"
-              placeholder="请输入关键字"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item prop="confirmStatus" label="隐患状态">
-            <el-select
-              prop="confirmStatus"
-              label="隐患状态"
-              v-model="queryParams.confirmStatus"
-              placeholder="请选择隐患状态"
-              clearable
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
             >
-              <el-option
-                v-for="dict in dict.type.question_confirm_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item prop="reformStatus" label="整改状态">
-            <el-select
-              prop="reformStatus"
-              label="整改状态"
-              v-model="queryParams.reformStatus"
-              placeholder="请选择整改状态"
-              clearable
+              <el-form-item label="关键字" prop="searchKey">
+                <el-input
+                  v-model="queryParams.searchKey"
+                  placeholder="请输入关键字"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item prop="confirmStatus" label="隐患状态">
+                <el-select
+                  prop="confirmStatus"
+                  label="隐患状态"
+                  v-model="queryParams.confirmStatus"
+                  placeholder="请选择隐患状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.question_confirm_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <!-- <el-form-item prop="reformStatus" label="整改状态">
+              <el-select
+                prop="reformStatus"
+                label="整改状态"
+                v-model="queryParams.reformStatus"
+                placeholder="请选择整改状态"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.question_reform_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item> -->
+              <el-form-item label="发现时间" prop="submitRange">
+                <DataRangePicker
+                  clearable
+                  v-model="queryParams.submitRange"
+                  key="daterange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </DataRangePicker>
+              </el-form-item>
+              <el-form-item> </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button
+                type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  >导出</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+
+          <el-table v-loading="loading" :data="questionList" height="650">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="60px"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              label="所属机构"
+              prop="orgName"
+              v-if="columns[1].visible"
+            />
+            <el-table-column
+              label="隐患来源"
+              prop="srcTaskName"
+              v-if="columns[2].visible"
+            />
+            <el-table-column
+              label="检查标准"
+              prop="checkItem"
+              v-if="columns[3].visible"
+            />
+            <el-table-column
+              label="隐患描述"
+              prop="questionDesc"
+              v-if="columns[4].visible"
+            />
+            <el-table-column
+              label="提出人"
+              prop="submitorName"
+              width="100px"
+              v-if="columns[5].visible"
+            />
+            <el-table-column
+              label="发现时间"
+              prop="submitTime"
+              width="160px"
+              v-if="columns[6].visible"
             >
-              <el-option
-                v-for="dict in dict.type.question_reform_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item> -->
-          <el-form-item label="发现时间" prop="submitRange">
-            <el-date-picker
-              clearable
-              v-model="queryParams.submitRange"
-              type="daterange"
-              format="yyyy-MM-dd"
-              placeholder="请选择发现时间"
+              <template slot-scope="scope">
+                <span>{{
+                  dayjs(scope.row.submitTime).format("YYYY-MM-DD HH:mm:ss")
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="隐患状态"
+              align="center"
+              width="80px"
+              prop="confirmStatus"
+              v-if="columns[7].visible"
             >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-           
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              >导出</el-button
+              <template slot-scope="scope">
+                <span>{{
+                  getLabel(
+                    dict.type.question_confirm_status,
+                    scope.row.confirmStatus
+                  )
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
             >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-tickets"
+                  @click="handleDetail(scope.row)"
+                  v-hasPermi="['question:list:query']"
+                  >详情</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-s-check"
+                  @click="handleConfirm(scope.row)"
+                  v-hasPermi="['question:list:confirm']"
+                  v-if="
+                    scope.row.orgId == orgId && scope.row.confirmStatus == 0
+                  "
+                  >隐患确认</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-s-flag"
+                  @click="handleConfirmDissent(scope.row)"
+                  v-hasPermi="['question:list:confirmDissent']"
+                  v-if="
+                    scope.row.submitorId == userId &&
+                    scope.row.confirmStatus == 1
+                  "
+                  >异议审批</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
 
-        <el-table
-          v-loading="loading"
-          :data="questionList"
-
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            width="60px"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            label="所属机构"
-            prop="orgName"
-            v-if="columns[1].visible"
-          />
-          <el-table-column
-            label="隐患来源"
-            prop="srcTaskName"
-            v-if="columns[2].visible"
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
           />
-          <el-table-column
-            label="检查标准"
-            prop="checkItem"
-            v-if="columns[3].visible"
-          />
-          <el-table-column
-            label="隐患描述"
-            prop="questionDesc"
-            v-if="columns[4].visible"
-          />
-          <el-table-column
-            label="提出人"
-            prop="submitorName"
-            width="100px"
-            v-if="columns[5].visible"
-          />
-          <el-table-column
-            label="发现时间"
-            prop="submitTime"
-            width="150px"
-            v-if="columns[6].visible"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                dayjs(scope.row.submitTime).format("YYYY-MM-DD HH:mm:ss")
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="隐患状态"
-            align="center"
-            width="80px"
-            prop="confirmStatus"
-            v-if="columns[7].visible"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                getLabel(
-                  dict.type.question_confirm_status,
-                  scope.row.confirmStatus
-                )
-              }}</span>
-            </template>
-          </el-table-column>          
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-tickets"
-                @click="handleDetail(scope.row)"
-                v-hasPermi="['question:list:query']"
-                >详情</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-s-check"
-                @click="handleConfirm(scope.row)"
-                v-hasPermi="['question:list:confirm']"
-                v-if="scope.row.orgId==orgId && scope.row.confirmStatus==0"
-                >隐患确认</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-s-flag"
-                @click="handleConfirmDissent(scope.row)"
-                v-hasPermi="['question:list:confirmDissent']"
-                v-if="scope.row.submitorId==userId && scope.row.confirmStatus==1"
-                >异议审批</el-button
-              >             
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        </div>
       </el-col>
     </el-row>
     <Dialog ref="dialog" @success="getList()"></Dialog>
@@ -215,14 +225,13 @@
 </template>
 
 <script>
-import {
-  listQuestion,
-} from "@/api/question/list.js";
+import { listQuestion } from "@/api/question/list.js";
 import OrgTree from "@/components/orgTree";
 import Dialog from "./dialog.vue";
 import { mapGetters } from "vuex";
 import dayjs from "dayjs";
 import { getLabel } from "./../../commonOption";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   name: "Question",
   data() {
@@ -241,7 +250,7 @@ export default {
       total: 0,
       // 隐患问题清单表格数据
       questionList: [],
-      selectedOrgName:null,
+      selectedOrgName: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -265,9 +274,9 @@ export default {
     };
   },
   dicts: ["question_confirm_status"],
-  components: { OrgTree, Dialog },
+  components: { OrgTree, Dialog, DataRangePicker },
   computed: {
-    ...mapGetters(["orgId","userId"]),
+    ...mapGetters(["orgId", "userId"]),
   },
   created() {},
   methods: {
@@ -299,17 +308,17 @@ export default {
     //   this.single = selection.length !== 1;
     //   this.multiple = !selection.length;
     // },
-    handleDetail(row){
-      this.$refs.dialog.show(row,'detail')
+    handleDetail(row) {
+      this.$refs.dialog.show(row, "detail");
     },
-    handleConfirm(row){
-      this.$refs.dialog.show(row,'confirm')
+    handleConfirm(row) {
+      this.$refs.dialog.show(row, "confirm");
     },
-    handleConfirmDissent(row){
-      this.$refs.dialog.show(row,'confirmDissent')
+    handleConfirmDissent(row) {
+      this.$refs.dialog.show(row, "confirmDissent");
     },
-    handleReform(row){
-      this.$refs.dialog.show(row,'reform')
+    handleReform(row) {
+      this.$refs.dialog.show(row, "reform");
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -318,7 +327,9 @@ export default {
         {
           ...this.queryParams,
         },
-        `${this.selectedOrgName}_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`
+        `${
+          this.selectedOrgName
+        }_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`
       );
     },
     //单选框状态改变
@@ -328,13 +339,13 @@ export default {
     },
     getDefaultOrg(org) {
       this.queryParams.orgId = org.id;
-      this.selectedOrgName=org.shortName;
+      this.selectedOrgName = org.shortName;
       this.getList();
     },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
-      this.selectedOrgName=data.shortName;
+      this.selectedOrgName = data.shortName;
       this.getList();
     },
   },

src/views/question/reform/index.vue

@@ -11,164 +11,175 @@
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="关键字" prop="searchKey">
-            <el-input
-              v-model="queryParams.searchKey"
-              placeholder="请输入关键字"
-              clearable
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="68px"
+            >
+              <el-form-item label="关键字" prop="searchKey">
+                <el-input
+                  v-model="queryParams.searchKey"
+                  placeholder="请输入关键字"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item prop="reformStatus" label="整改状态">
+                <el-select
+                  prop="reformStatus"
+                  label="整改状态"
+                  v-model="queryParams.reformStatus"
+                  placeholder="请选择整改状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.question_reform_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="整改期限" prop="reformRange">
+                <DataRangePicker
+                  clearable
+                  v-model="queryParams.reformRange"
+                  key="daterange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </DataRangePicker>
+              </el-form-item>
+            </el-form>
+
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  >导出</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+
+          <el-table v-loading="loading" :data="questionList" height="650">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="60px"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              label="所属机构"
+              prop="orgName"
+              v-if="columns[1].visible"
             />
-          </el-form-item>          
-          <el-form-item prop="reformStatus" label="整改状态">
-            <el-select
-              prop="reformStatus"
-              label="整改状态"
-              v-model="queryParams.reformStatus"
-              placeholder="请选择整改状态"
-              clearable
+            <el-table-column
+              label="标准依据"
+              prop="checkContent"
+              v-if="columns[2].visible"
+            />
+            <el-table-column
+              label="隐患描述"
+              prop="questionDesc"
+              v-if="columns[3].visible"
+            />
+
+            <el-table-column
+              label="整改期限"
+              prop="submitTime"
+              width="120"
+              v-if="columns[4].visible"
             >
-              <el-option
-                v-for="dict in dict.type.question_reform_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="整改期限" prop="reformRange">
-            <el-date-picker
-              clearable
-              v-model="queryParams.reformRange"
-              type="daterange"
-              format="yyyy-MM-dd"
-              placeholder="请选择整改期限"
+              <template slot-scope="scope">
+                <span>{{
+                  dayjs(scope.row.reformDeadline).format("YYYY-MM-DD")
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="整改状态"
+              prop="reformStatus"
+              width="80px"
+              v-if="columns[5].visible"
             >
-            </el-date-picker>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button  type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              >导出</el-button
+              <template slot-scope="scope">
+                <span>{{
+                  getLabel(
+                    dict.type.question_reform_status,
+                    scope.row.reformStatus
+                  )
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
             >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-tickets"
+                  @click="handleDetail(scope.row)"
+                  v-hasPermi="['question:reform:query']"
+                  >详情</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-s-unfold"
+                  @click="handleReform(scope.row)"
+                  v-hasPermi="['question:reform:reform']"
+                  v-if="
+                    scope.row.orgId == orgId &&
+                    scope.row.confirmStatus == 2 &&
+                    scope.row.reformStatus != 11
+                  "
+                  >整改</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
 
-        <el-table
-          v-loading="loading"
-          :data="questionList"
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            width="60px"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            label="所属机构"
-            prop="orgName"
-            v-if="columns[1].visible"
-          />          
-          <el-table-column
-            label="标准依据"
-            prop="checkContent"
-            v-if="columns[2].visible"
-          />
-          <el-table-column
-            label="隐患描述"
-            prop="questionDesc"
-            v-if="columns[3].visible"
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
           />
-         
-          <el-table-column
-            label="整改期限"
-            prop="submitTime"
-            width="120"
-            v-if="columns[4].visible"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                dayjs(scope.row.reformDeadline).format("YYYY-MM-DD")
-              }}</span>
-            </template>
-          </el-table-column>          
-          <el-table-column
-            label="整改状态"
-            prop="reformStatus"
-            width="80px"
-            v-if="columns[5].visible"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                getLabel(
-                  dict.type.question_reform_status,
-                  scope.row.reformStatus
-                )
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-tickets"
-                @click="handleDetail(scope.row)"
-                v-hasPermi="['question:reform:query']"
-                >详情</el-button
-              >             
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-s-unfold"
-                @click="handleReform(scope.row)"
-                v-hasPermi="['question:reform:reform']"
-                v-if="scope.row.orgId==orgId && scope.row.confirmStatus==2 && scope.row.reformStatus!=11"
-                >整改</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+        </div>
       </el-col>
     </el-row>
     <Dialog ref="dialog" @success="getList()"></Dialog>
@@ -176,14 +187,13 @@
 </template>
 
 <script>
-import {
-  page,
-} from "@/api/question/reform.js";
+import { page } from "@/api/question/reform.js";
 import OrgTree from "@/components/orgTree";
 import Dialog from "./dialog.vue";
 import { mapGetters } from "vuex";
 import dayjs from "dayjs";
 import { getLabel } from "./../../commonOption";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   name: "QuestionReform",
   data() {
@@ -223,9 +233,9 @@ export default {
     };
   },
   dicts: ["question_reform_status"],
-  components: { OrgTree, Dialog },
+  components: { OrgTree, Dialog, DataRangePicker },
   computed: {
-    ...mapGetters(["orgId","userId"]),
+    ...mapGetters(["orgId", "userId"]),
   },
   created() {},
   methods: {
@@ -257,26 +267,28 @@ export default {
     //   this.single = selection.length !== 1;
     //   this.multiple = !selection.length;
     // },
-    handleDetail(row){
-      this.$refs.dialog.show(row,'detail')
+    handleDetail(row) {
+      this.$refs.dialog.show(row, "detail");
     },
-    handleConfirm(row){
-      this.$refs.dialog.show(row,'confirm')
+    handleConfirm(row) {
+      this.$refs.dialog.show(row, "confirm");
     },
-    handleConfirmDissent(row){
-      this.$refs.dialog.show(row,'confirmDissent')
+    handleConfirmDissent(row) {
+      this.$refs.dialog.show(row, "confirmDissent");
     },
-    handleReform(row){
-      this.$refs.dialog.show(row,'reform')
+    handleReform(row) {
+      this.$refs.dialog.show(row, "reform");
     },
-    /** 导出按钮操作 */ 
+    /** 导出按钮操作 */
     handleExport() {
       this.download(
         "core/questionreform/export",
         {
           ...this.queryParams,
         },
-        `${this.selectedOrgName}_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`
+        `${
+          this.selectedOrgName
+        }_${this.$tab.getCurrentTabName()}_${dayjs().format("YYYYMMDD")}.xlsx`
       );
     },
     //单选框状态改变
@@ -286,13 +298,13 @@ export default {
     },
     getDefaultOrg(org) {
       this.queryParams.orgId = org.id;
-      this.selectedOrgName=org.shortName;
+      this.selectedOrgName = org.shortName;
       this.getList();
     },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
-      this.selectedOrgName=data.shortName;
+      this.selectedOrgName = data.shortName;
       this.getList();
     },
   },

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

@@ -22,17 +22,16 @@
           </div>
           <div style="margin-bottom: 20px">
             <span>上报时间范围：</span>
-            <el-date-picker
+            <DataRangePicker
               v-model="queryParams.updateTime"
-              :default-time="defaultTime"
-              type="datetimerange"
-              range-separator="至"
+              key="daterange"
+              type="daterange"
               clearable
+              range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              @change="refresh"
             >
-            </el-date-picker>
+            </DataRangePicker>
           </div>
           <el-table :data="tableData" border style="width: 100%">
             <el-table-column type="index" label="序号"></el-table-column>
@@ -71,6 +70,7 @@
 <script>
 import * as api from "@/api/resumption/protection";
 import { getLabel } from "./../../commonOption";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   data() {
     const params = this.$route.params;
@@ -79,7 +79,6 @@ export default {
       isShow: false,
       protection: {},
       tableData: [],
-      defaultTime: ["00:00:00", "23:59:59"],
       queryParams: this.resetSearch(),
       total: 1,
     };
@@ -89,7 +88,14 @@ export default {
       type: Array,
     },
   },
-  watch: {},
+  watch: {
+    "queryParams.updateTime":{
+      deep:true,
+      handler(v){
+        this.refresh();
+      }
+    }
+  },
   computed: {},
   methods: {
     getLabel,
@@ -136,7 +142,7 @@ export default {
   },
   created() {},
   mounted() {},
-  components: {
+  components: {DataRangePicker
     // EditAttribute,
   },
 };

src/views/resumption/protection/index.vue

@@ -12,162 +12,170 @@
       </el-col>
 
       <el-col :span="20" :xs="24">
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="search"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="120px"
-        >
-          <el-form-item prop="key" label="报警控制器名称">
-            <el-input
-              v-model="queryParams.key"
-              :maxlength="50"
-              placeholder="请输入报警控制器名称"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item prop="status" label="报警控制器状态">
-            <el-select
-              label="报警控制器状态"
-              v-model="queryParams.status"
-              placeholder="请选择报警控制器状态"
-              clearable
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="120px"
             >
-              <el-option
-                v-for="dict in dict.type.protection_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
+              <el-form-item prop="key" label="报警控制器名称">
+                <el-input
+                  v-model="queryParams.key"
+                  :maxlength="50"
+                  placeholder="请输入报警控制器名称"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item prop="status" label="报警控制器状态">
+                <el-select
+                  label="报警控制器状态"
+                  v-model="queryParams.status"
+                  placeholder="请选择报警控制器状态"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.protection_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
 
-          <el-form-item prop="dateRange" label="布撤防登记时间">
-            <el-date-picker
-              v-model="queryParams.dateRange"
-              type="datetimerange"
-              format="yyyy-MM-dd HH:mm"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-form>
+              <el-form-item prop="dateRange" label="布撤防登记时间">
+                <DataRangePicker
+                  v-model="queryParams.dateRange"
+                  key="daterange"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </DataRangePicker>
+              </el-form-item>
+            </el-form>
 
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              v-hasPermi="['device:protection']"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['device:protection:add']"
-              >新增</el-button
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="getList"
+                  v-hasPermi="['device:protection']"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd()"
+                  v-hasPermi="['device:protection:add']"
+                  >新增</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport()"
+                  v-hasPermi="['device:protection']"
+                  >导出</el-button
+                >
+              </el-col>
+              <!-- <el-col :span="1.5">
+              <el-button
+                type="success"
+                plain
+                icon="el-icon-edit-outline"
+                size="mini"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['system:user:edit']"
+                >修改</el-button
+              >
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="danger"
+                plain
+                icon="el-icon-delete"
+                size="mini"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['system:user:remove']"
+                >删除</el-button
+              >
+            </el-col>-->
+
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            border
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+            height="650"
+          >
+            <el-table-column
+              type="index"
+              label="序号"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="orgName"
+              label="所属机构"
+              v-if="columns[1].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="name"
+              label="报警控制器名称"
+              v-if="columns[2].visible"
             >
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport()"
-              v-hasPermi="['device:protection']"
-              >导出</el-button
+            </el-table-column>
+            <el-table-column
+              prop="status"
+              label="报警控制器状态"
+              v-if="columns[3].visible"
             >
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit-outline"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-              >修改</el-button
+              <template slot-scope="r"
+                >{{
+                  getLabel(dict.type.protection_status, r.row.status, "未知")
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="statusUpdatorName"
+              label="登记人"
+              v-if="columns[4].visible"
             >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-              >删除</el-button
+            </el-table-column>
+            <el-table-column
+              prop="statusUpdateTime"
+              label="最近登记时间"
+              v-if="columns[5].visible"
             >
-          </el-col>-->
-
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
-
-        <el-table
-          border
-          v-loading="loading"
-          :data="pageData"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="所属机构"
-            v-if="columns[1].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="name"
-            label="报警控制器名称"
-            v-if="columns[2].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="status"
-            label="报警控制器状态"
-            v-if="columns[3].visible"
-          >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.protection_status, r.row.status, "未知") }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="statusUpdatorName"
-            label="登记人"
-            v-if="columns[4].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="statusUpdateTime"
-            label="最近登记时间"
-            v-if="columns[5].visible"
-          >
-          </el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="r">
-              <!-- <el-button
+            </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="r">
+                <!-- <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-edit-outline"
@@ -183,46 +191,47 @@
                 v-hasPermi="['device:protectionstatus:maintain']"
                 >撤防</el-button
               > -->
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="onEdit(r.row.id)"
-                v-hasPermi="['device:protection:edit']"
-                >编辑</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-document-copy"
-                @click="onHistory(r.row)"
-                v-hasPermi="['device:protection']"
-                >布撤防历史</el-button
-              >
-              <el-popconfirm
-                @confirm="onDel(r.row.id)"
-                title="点击确定删除报警控制器"
-              >
                 <el-button
                   size="mini"
                   type="text"
-                  icon="el-icon-delete"
-                  v-hasPermi="['device:protection:remove']"
-                  slot="reference"
-                  >删除</el-button
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['device:protection:edit']"
+                  >编辑</el-button
                 >
-              </el-popconfirm>
-            </template>
-          </el-table-column>
-        </el-table>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-document-copy"
+                  @click="onHistory(r.row)"
+                  v-hasPermi="['device:protection']"
+                  >布撤防历史</el-button
+                >
+                <el-popconfirm
+                  @confirm="onDel(r.row.id)"
+                  title="点击确定删除报警控制器"
+                >
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    v-hasPermi="['device:protection:remove']"
+                    slot="reference"
+                    >删除</el-button
+                  >
+                </el-popconfirm>
+              </template>
+            </el-table-column>
+          </el-table>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit
@@ -245,8 +254,8 @@ import DialogHistory from "./dialog.history";
 import * as api from "@/api/resumption/protection";
 import { getLabel } from "./../../commonOption";
 import { mapGetters } from "vuex";
-import dayjs from "dayjs"
-
+import dayjs from "dayjs";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   name: "protection",
   dicts: ["protection_status"],
@@ -254,6 +263,7 @@ export default {
     DialogEdit,
     OrgTree,
     DialogHistory,
+    DataRangePicker,
   },
   data() {
     const { params, query } = this.$route;
@@ -313,14 +323,13 @@ export default {
     },
     getDefaultKey(key) {
       this.queryParams.orgId = key;
-     this. selectedOrgName=this.orgName,
-      this.getList();
+      (this.selectedOrgName = this.orgName), this.getList();
     },
     handleAdd(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
-    handleExport(){
-      if (this.total==0) {
+    handleExport() {
+      if (this.total == 0) {
         this.$message.error({
           message: `无可用数据导出！`,
           type: "error",
@@ -380,8 +389,7 @@ export default {
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
-      this. selectedOrgName=data.name,
-      this.getList();
+      (this.selectedOrgName = data.name), this.getList();
     },
   },
   mounted() {},

src/views/resumption/rule/dialog.edit.vue

@@ -69,7 +69,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="isShow = false">取消</el-button>
+        <el-button @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
     </DialogCom>

src/views/resumption/rule/index.vue

@@ -13,147 +13,157 @@
       </el-col>
 
       <el-col :span="20" :xs="24" class="el-col-ex">
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="search"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item prop="name" label="履职库名称">
-            <el-input
-              v-model="queryParams.name"
-              :maxlength="50"
-              placeholder="请输入履职库名称"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item prop="orgType" label="履职机构类型">
-            <el-select
-              prop="orgType"
-              label="履职机构类型"
-              v-model="queryParams.orgType"
-              placeholder="请选择履职机构类型"
-              clearable
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <!--    搜索条件    -->
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="100px"
             >
-              <el-option
-                v-for="item in dict.type.sys_org_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            
-          </el-form-item>
-        </el-form>
+              <el-form-item prop="name" label="履职库名称">
+                <el-input
+                  v-model="queryParams.name"
+                  :maxlength="50"
+                  placeholder="请输入履职库名称"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item prop="orgType" label="履职机构类型">
+                <el-select
+                  prop="orgType"
+                  label="履职机构类型"
+                  v-model="queryParams.orgType"
+                  placeholder="请选择履职机构类型"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.sys_org_type"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item> </el-form-item>
+            </el-form>
 
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="refresh"
-              v-hasPermi="['resumption:rule:query']"
-              >搜索</el-button
-            >
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="refresh"
+                  v-hasPermi="['resumption:rule:query']"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd()"
+                  v-hasPermi="['resumption:rule:add']"
+                  >新增履职内容库</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+            height="650"
+          >
+            <el-table-column
+              type="index"
+              label="序号"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="name"
+              label="履职库名称"
+              v-if="columns[1].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="orgType"
+              label="履职机构类型"
+              v-if="columns[2].visible"
             >
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['resumption:rule:add']"
-              >新增</el-button
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.sys_org_type, r.row.orgType) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="orgName"
+              label="发布机构"
+              v-if="columns[3].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="status"
+              label="状态"
+              v-if="columns[4].visible"
             >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
-
-        <el-table
-          v-loading="loading"
-          :data="pageData"
-          @selection-change="handleSelectionChange"
-          max-height="calc(100% - 150px)"
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="name"
-            label="履职库名称"
-            v-if="columns[1].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="orgType"
-            label="履职机构类型"
-            v-if="columns[2].visible"
-          >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, r.row.orgType) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="发布机构"
-            v-if="columns[3].visible"
-          ></el-table-column>
-          <el-table-column prop="status" label="状态" v-if="columns[4].visible">
-            <template slot-scope="r">
-              <span>{{ getLabel(dict.type.plan_status, r.row.status) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="remark"
-            label="备注"
-            v-if="columns[5].visible"
-          ></el-table-column>
-          <el-table-column label="操作" class="small-padding fixed-width">
-            <template slot-scope="r">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="onEdit(r.row.id)"
-                v-hasPermi="['resumption:rule:edit']"
-                v-if="orgId == r.row.orgId"
-                >编辑</el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                slot="reference"
-                icon="el-icon-delete"
-                v-if="orgId == r.row.orgId"
-                v-hasPermi="['resumption:rule:remove']"
-                @click="onDel(r.row.id)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+              <template slot-scope="r">
+                <span>{{ getLabel(dict.type.plan_status, r.row.status) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              label="备注"
+              v-if="columns[5].visible"
+            ></el-table-column>
+            <el-table-column label="操作" class="small-padding fixed-width">
+              <template slot-scope="r">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['resumption:rule:edit']"
+                  v-if="orgId == r.row.orgId"
+                  >编辑</el-button
+                >
+                <el-button
+                  type="text"
+                  size="small"
+                  slot="reference"
+                  icon="el-icon-delete"
+                  v-if="orgId == r.row.orgId"
+                  v-hasPermi="['resumption:rule:remove']"
+                  @click="onDel(r.row.id)"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit
@@ -298,12 +308,11 @@ export default {
   display: flex;
   flex-direction: column;
 }
-  .el-row-ex{
-    height:100%;
+.el-row-ex {
+  height: 100%;
 
-    ::v-deep .el-col-ex{
-      height:100%;
-    }
+  ::v-deep .el-col-ex {
+    height: 100%;
   }
-
+}
 </style>

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -32,7 +32,7 @@
         </div>
         <div class="box">
           <div style="margin-bottom: 10px">
-            <el-button type="primary" @click="onEdit(-1)"
+            <el-button type="primary" icon="el-icon-plus" @click="onEdit(-1)"
               >新增履职内容</el-button
             >
           </div>
@@ -70,7 +70,7 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary"  @click="dialogVisible = false">取 消</el-button>
+        <el-button  @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
       </div>
     </DialogCom>

src/views/resumption/ruleManager/index.vue

@@ -2,105 +2,228 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="4" :xs="24">
-        <org-tree v-model="queryParams.orgId" @click="clicktreenode" :customRequest="treeData"
-          searchPlaceHolder="输入关键字进行过滤" :expand-on-click-node="true" node-key="id" :default-expanded-keys="topItemKeys"
-          accordion :defaultProps="defaultProps" :showLowerCheck="false" :renderContent="renderContent">
+        <org-tree
+          v-model="queryParams.orgId"
+          @click="clicktreenode"
+          :customRequest="treeData"
+          searchPlaceHolder="输入关键字进行过滤"
+          :expand-on-click-node="true"
+          node-key="id"
+          :default-expanded-keys="topItemKeys"
+          accordion
+          :defaultProps="defaultProps"
+          :showLowerCheck="false"
+          :renderContent="renderContent"
+        >
         </org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="search" size="small" :inline="true" v-show="showSearch && rule" label-width="100px">
-          <el-form-item prop="itemName" label="履职项" class="search_itemname">
-            <el-input v-model="queryParams.itemName" placeholder="请输入履职项" maxlength="50" clearable></el-input>
-          </el-form-item>
-          <el-form-item prop="pointName" label="履职内容">
-            <el-input v-model="queryParams.pointName" placeholder="请输入履职内容" maxlength="50" clearable></el-input>
-          </el-form-item>         
-        </el-form>
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="refresh"
-              v-hasPermi="['resumption:ruleManager']">搜索</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button type="primary" size="mini" icon="el-icon-plus" @click="onAddItem()" :disabled="rule ? false : true"
-              v-hasPermi="['resumption:ruleManager:add']"
-              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0">新增</el-button>
-            <!-- <el-button
-              type="primary"
-              @click="onSelect()"
-              >选择</el-button
-            > -->
-            <el-button type="primary" :icon="expandAll ?'el-icon-arrow-up':'el-icon-arrow-down'" @click="dakai" size="mini" :disabled="rule ? false : true">{{ expandAll ? "收起所有行" :
-              "展开所有行" }}</el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit-outline"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-              >修改</el-button
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box" v-show="showSearch && rule">
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              
+              label-width="100px"
             >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-              >删除</el-button
-            >
-          </el-col>-->
+              <el-form-item
+                prop="itemName"
+                label="履职项"
+                class="search_itemname"
+              >
+                <el-input
+                  v-model="queryParams.itemName"
+                  placeholder="请输入履职项"
+                  maxlength="50"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item prop="pointName" label="履职内容">
+                <el-input
+                  v-model="queryParams.pointName"
+                  placeholder="请输入履职内容"
+                  maxlength="50"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-form>
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="refresh"
+                  v-hasPermi="['resumption:ruleManager']"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-plus"
+                  @click="onAddItem()"
+                  :disabled="rule ? false : true"
+                  v-hasPermi="['resumption:ruleManager:add']"
+                  v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+                  >新增履职项</el-button
+                >
+                <!-- <el-button
+                  type="primary"
+                  @click="onSelect()"
+                  >选择</el-button
+                > -->
+                <el-button
+                  type="primary"
+                  :icon="expandAll ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
+                  @click="dakai"
+                  size="mini"
+                  :disabled="rule ? false : true"
+                  >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
+                >
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="el-icon-edit-outline"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleUpdate"
+                  v-hasPermi="['system:user:edit']"
+                  >修改</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  icon="el-icon-delete"
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleDelete"
+                  v-hasPermi="['system:user:remove']"
+                  >删除</el-button
+                >
+              </el-col>-->
 
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-        <el-table :data="tableData" border :default-expand-all="expandAll" v-if="fresh" style="width: 100%"
-          v-loading="loading">
-          <el-table-column type="expand">
-            <template slot-scope="props">
-              <el-table :data="props.row.pointDtoList" border style="width: 100%">
-                <el-table-column prop="name" label="履职内容" v-if="columns[3].visible">
-                </el-table-column>
-                <el-table-column prop="areaName" label="履职区域" v-if="columns[4].visible">
-                </el-table-column>
-                <el-table-column prop="checkName" label="履职点位">
-                </el-table-column>
-                <!-- <el-table-column prop="dataTypeName" label="数据类型">
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            :data="tableData"
+            border
+            :default-expand-all="expandAll"
+            v-if="fresh"
+            style="width: 100%"
+            v-loading="loading"
+            height="650"
+          >
+            <el-table-column type="expand">
+              <template slot-scope="props">
+                <el-table
+                  :data="props.row.pointDtoList"
+                  border
+                  style="width: 100%"
+                >
+                  <el-table-column
+                    prop="name"
+                    label="履职内容"
+                    v-if="columns[3].visible"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="areaName"
+                    label="履职区域"
+                    v-if="columns[4].visible"
+                  >
+                  </el-table-column>
+                  <el-table-column prop="checkName" label="履职点位">
+                  </el-table-column>
+                  <!-- <el-table-column prop="dataTypeName" label="数据类型">
                 </el-table-column>
                 <el-table-column prop="degreeRiskName" label="风险等级">
                 </el-table-column> -->
-              </el-table>
-            </template>
-          </el-table-column>
-          <el-table-column type="index" label="序号" width="80" v-if="columns[0].visible">
-          </el-table-column>
-          <el-table-column prop="name" label="履职项" v-if="columns[1].visible">
-          </el-table-column>
-          <!-- <el-table-column prop="itemDesc" label="标准及要求">
+                </el-table>
+              </template>
+            </el-table-column>
+            <el-table-column
+              type="index"
+              label="序号"
+              width="80"
+              v-if="columns[0].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="履职项"
+              v-if="columns[1].visible"
+            >
+            </el-table-column>
+            <!-- <el-table-column prop="itemDesc" label="标准及要求">
           </el-table-column> -->
-          <el-table-column prop="pointNums" label="履职内容数量" v-if="columns[2].visible">
-          </el-table-column>
-          <el-table-column label="操作" width="140" v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0">
-            <template slot-scope="scope">
-              <el-button type="text" size="small" icon="el-icon-edit-outline" @click="onEditItem(scope.row.id)"
-                v-hasPermi="['resumption:ruleManager:edit']">编辑</el-button>
-              <el-button type="text" size="small" slot="reference" icon="el-icon-delete" @click="deldata(scope.row.id)"
-                v-hasPermi="['resumption:ruleManager:remove']">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+            <el-table-column
+              prop="pointNums"
+              label="履职内容数量"
+              v-if="columns[2].visible"
+            >
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              width="140"
+              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  icon="el-icon-edit-outline"
+                  @click="onEditItem(scope.row.id)"
+                  v-hasPermi="['resumption:ruleManager:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  type="text"
+                  size="small"
+                  slot="reference"
+                  icon="el-icon-delete"
+                  @click="deldata(scope.row.id)"
+                  v-hasPermi="['resumption:ruleManager:remove']"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
-    <dialog-edit ref="dialogEdit" :rule="rule" :pointDataSource="dict.type.point_data_source"
-      @success="onSuccess"></dialog-edit>
+    <dialog-edit
+      ref="dialogEdit"
+      :rule="rule"
+      :pointDataSource="dict.type.point_data_source"
+      @success="onSuccess"
+    ></dialog-edit>
   </div>
 </template>
 
@@ -180,7 +303,7 @@ export default {
     // await this.getassetlist();
   },
 
-  mounted() { },
+  mounted() {},
 
   methods: {
     treeData,

src/views/resumption/taskManager/index.vue

@@ -12,168 +12,181 @@
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="queryParams"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item label="任务名称" prop="planId">
-            <el-select
-              v-model="queryParams.planId"
-              filterable
-              placeholder="请选择任务名称"
-              clearable
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="queryParams"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="100px"
             >
-              <el-option
-                v-for="item in planList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="履职人员" prop="executeRole">
-            <el-select
-              v-model="queryParams.executeRole"
-              placeholder="请选择履职人员"
-              clearable
+              <el-form-item label="任务名称" prop="planId">
+                <el-select
+                  v-model="queryParams.planId"
+                  filterable
+                  placeholder="请选择任务名称"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in planList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="履职人员" prop="executeRole">
+                <el-select
+                  v-model="queryParams.executeRole"
+                  placeholder="请选择履职人员"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in roleList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="任务进度" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="请选择任务进度"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.resumption_status"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item class="searchTitle" label="任务时间">
+                <DataRangePicker
+                  v-model="queryParams.range"
+                  key="daterange"
+                  type="daterange"
+                  :clearable="timeClearable"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+            </el-form>
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="getList"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="exportExcel()"
+                  v-hasPermi="['resumption:taskManager:export']"
+                  >导出</el-button
+                >
+              </el-col>
+
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            border
+            height="600"
+            size="small"
+            v-loading="loading"
+            :data="pageData"
+          >
+            <el-table-column
+              type="index"
+              fixed
+              min-width="50"
+              label="序号"
+              v-if="columns[0].visible"
             >
-              <el-option
-                v-for="item in roleList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="任务进度" prop="status">
-            <el-select
-              v-model="queryParams.status"
-              placeholder="请选择任务进度"
-              clearable
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="任务名称"
+              min-width="120"
+              v-if="columns[1].visible"
             >
-              <el-option
-                v-for="item in dict.type.resumption_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item class="searchTitle" label="任务时间">
-            <DataRangePicker
-              v-model="queryParams.range"
-              key="daterange"
-              type="daterange"
-              :clearable="timeClearable"
-            />
-          </el-form-item>
-        </el-form>
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</el-button
+            </el-table-column>
+            <el-table-column
+              prop="orgName"
+              label="履职机构"
+              min-width="120"
+              v-if="columns[2].visible"
             >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+            </el-table-column>
+            <el-table-column
+              prop="roleName"
+              label="履职人员"
+              min-width="120"
+              v-if="columns[3].visible"
             >
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="exportExcel()"
-              v-hasPermi="['resumption:taskManager:export']"
-              >导出</el-button
+            </el-table-column>
+            <el-table-column
+              prop="status"
+              label="任务进度"
+              width="100px"
+              v-if="columns[4].visible"
             >
-          </el-col>
-
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
-        <el-table
-          border
-          height="600"
-          size="small"
-          v-loading="loading"
-          :data="pageData"
-        >
-          <el-table-column
-            type="index"
-            fixed
-            min-width="50"
-            label="序号"
-            v-if="columns[0].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务名称"
-            min-width="120"
-            v-if="columns[1].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="履职机构"
-            min-width="120"
-            v-if="columns[2].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="roleName"
-            label="履职人员"
-            min-width="120"
-            v-if="columns[3].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="status"
-            label="任务进度"
-            width="100px"
-            v-if="columns[4].visible"
-          >
-            <template slot-scope="r">
-              {{ getLabel(dict.type.resumption_status, r.row.status) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="planStartTime"
-            label="任务时间"
-            width="200px"
-            v-if="columns[5].visible"
-          >
-          <template slot-scope="r">
-            {{dayjs(r.row.planStartTime).format("YYYY年MM月DD日")}}-{{dayjs(r.row.planEndTime).format("YYYY年MM月DD日")}}
-          </template>
-        </el-table-column>
-          <el-table-column
-            prop="abnormalDataNums"
-            label="隐患数量"
-            min-width="80"
-            v-if="columns[6].visible"
-          >
-          <template slot-scope="r">
-            <span v-if="r.row.status==2 || r.row.status==3">{{r.row.abnormalDataNums}}</span>
-          </template>
-          </el-table-column>
+              <template slot-scope="r">
+                {{ getLabel(dict.type.resumption_status, r.row.status) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="planStartTime"
+              label="任务时间"
+              width="200px"
+              v-if="columns[5].visible"
+            >
+              <template slot-scope="r">
+                {{ dayjs(r.row.planStartTime).format("YYYY年MM月DD日") }}-{{
+                  dayjs(r.row.planEndTime).format("YYYY年MM月DD日")
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="abnormalDataNums"
+              label="隐患数量"
+              min-width="80"
+              v-if="columns[6].visible"
+            >
+              <template slot-scope="r">
+                <span v-if="r.row.status == 2 || r.row.status == 3">{{
+                  r.row.abnormalDataNums
+                }}</span>
+              </template>
+            </el-table-column>
 
-          <el-table-column label="操作" fixed="right" min-width="120px">
-            <template slot-scope="r">
-              <!-- <el-button v-if="
+            <el-table-column label="操作" fixed="right" min-width="120px">
+              <template slot-scope="r">
+                <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&
                             queryParams.type == 'QUARTER'
                         " type="text" @click="onEdit(r.row.id)">履职</el-button>
@@ -182,36 +195,40 @@
                             r.row.status != 'NOT' &&
                             r.row.status != 'WAIT'
                         " type="text" @click="onEdit(r.row.id, { isRead: true })">查看</el-button> -->
-              <el-button
-                type="text"
-                icon="el-icon-view"
-                @click="showDetail(r.row)"
-                v-show="r.row.status == 2 || r.row.status == 3"
-                v-hasPermi="['resumption:taskManager:query']"
-                >详情</el-button
-              >
-              <el-button
-                type="text"
-                icon="el-icon-document-copy"
-                @click="showscanRecord(r.row)"
-                v-show="r.row.status == 2 || r.row.status == 3"
-                v-hasPermi="['resumption:taskManager:query']"
-                >扫描记录</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+                <el-button
+                  type="text"
+                  icon="el-icon-view"
+                  @click="showDetail(r.row)"
+                  v-show="r.row.status == 2 || r.row.status == 3"
+                  v-hasPermi="['resumption:taskManager:query']"
+                  >详情</el-button
+                >
+                <el-button
+                  type="text"
+                  icon="el-icon-document-copy"
+                  @click="showscanRecord(r.row)"
+                  v-show="r.row.status == 2 || r.row.status == 3"
+                  v-hasPermi="['resumption:taskManager:query']"
+                  >扫描记录</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <!-- 详情 -->
-    <dialog-detail ref="detaildialog" :statusOptions="dict.type.resumption_status"></dialog-detail>
+    <dialog-detail
+      ref="detaildialog"
+      :statusOptions="dict.type.resumption_status"
+    ></dialog-detail>
     <dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
   </div>
 </template>
@@ -318,9 +335,9 @@ export default {
         {
           ...this.queryParams,
         },
-        `${this.selectedOrgName}-${this.$tab.getCurrentTabName()}-${dayjs(new Date()).format(
-          "YYYYMMDD"
-        )}.xlsx`
+        `${this.selectedOrgName}-${this.$tab.getCurrentTabName()}-${dayjs(
+          new Date()
+        ).format("YYYYMMDD")}.xlsx`
       );
 
       // await api.exportResumptionRecord(this.queryParams);

src/views/resumptionEvaluate/evaluate/index.vue

@@ -1,111 +1,118 @@
 <template>
   <div class="app-container">
-    <layoutCom>
-      <org-tree
-        slot="leftBar"
-        v-model="queryParams.orgId"
-        @defaultKey="getDefaultKey"
-        @checkChange="checkChange"
-        @click="clickTreeNode"
-      ></org-tree>
-      <el-row slot="rightBar">
+    <el-row :gutter="10">
+      <el-col :span="4" :xs="24">
+        <org-tree
+          v-model="queryParams.orgId"
+          @defaultKey="getDefaultKey"
+          @checkChange="checkChange"
+          @click="clickTreeNode"
+        ></org-tree>
+      </el-col>
+      <el-col :span="20" :xs="24">
         <!--用户数据-->
-        <el-col>
+        <div class="main-right-box">
           <!--    搜索条件    -->
-          <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="100px"
-          >
-            <el-form-item label="外包评价名称" prop="evaluateName">
-              <el-input
-                :maxlength="20"
-                v-model="queryParams.evaluateName"
-                placeholder="请输入外包评价名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="请选择状态"
-                clearable
-              >
-                <el-option
-                  v-for="dict in dict.type.plan_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+          <div class="main-search-box">
+            <!--    搜索条件    -->
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="100px"
+            >
+              <el-form-item label="外包评价名称" prop="evaluateName">
+                <el-input
+                  :maxlength="20"
+                  v-model="queryParams.evaluateName"
+                  placeholder="请输入外包评价名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
                 />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="评价机构类型">
-              <el-select
-                @change="cleanExecOrgList"
-                prop="orgType"
-                label="评价机构类型"
-                v-model="queryParams.orgType"
-                placeholder="请选择评价机构类型"
-                clearable
-              >
-                <el-option
-                  v-for="item in dict.type.sys_org_type"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+              </el-form-item>
+              <el-form-item label="状态" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="请选择状态"
+                  clearable
                 >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-form-item prop="roleId" label="评价角色">
+                  <el-option
+                    v-for="dict in dict.type.plan_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="评价机构类型">
                 <el-select
-                  @visible-change="getRolesByOrg"
-                  label="评价角色"
-                  v-model="queryParams.roleId"
-                  placeholder="请选择评价角色"
-                  filterable
-                  @change="handleRolesChange"
+                  @change="cleanExecOrgList"
+                  prop="orgType"
+                  label="评价机构类型"
+                  v-model="queryParams.orgType"
+                  placeholder="请选择评价机构类型"
+                  clearable
                 >
                   <el-option
-                    v-for="item in planRoles"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
+                    v-for="item in dict.type.sys_org_type"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   >
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-            </el-form-item>
-          </el-form>
+              <el-form-item>
+                <el-form-item prop="roleId" label="评价角色">
+                  <el-select
+                    @visible-change="getRolesByOrg"
+                    label="评价角色"
+                    v-model="queryParams.roleId"
+                    placeholder="请选择评价角色"
+                    filterable
+                    @change="handleRolesChange"
+                  >
+                    <el-option
+                      v-for="item in planRoles"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+              </el-form-item>
+            </el-form>
 
-          <!--    按纽    -->
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:user:add']"
-                >新增</el-button
-              >
-            </el-col>
-          </el-row>
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['system:user:add']"
+                  >新增</el-button
+                >
+              </el-col>
+            </el-row>
+          </div>
           <el-table
             border
             height="650"
@@ -156,19 +163,19 @@
                   @click="publishHandler(row)"
                   type="text"
                   icon="el-icon-plus"
-                  >{{row.isDistribute=='0'? '':'取消'}}发布</el-button
+                  >{{ row.isDistribute == "0" ? "" : "取消" }}发布</el-button
                 >
                 <el-button
                   size="mini"
                   @click="editHandler(row)"
                   type="text"
-                  icon="el-icon-plus"
+                  class="el-icon-edit-outline"
                   >编辑</el-button
                 ><el-button
                   size="mini"
                   @click="deleteHandler(row)"
                   type="text"
-                  icon="el-icon-plus"
+                  class="el-icon-delete"
                   >删除</el-button
                 >
               </template>
@@ -182,9 +189,10 @@
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
           />
-        </el-col>
-      </el-row>
-    </layoutCom>
+        </div>
+      </el-col>
+    </el-row>
+
     <editEvaluate ref="Evaluate" @success="getList()"></editEvaluate>
   </div>
 </template>
@@ -273,41 +281,38 @@ export default {
     },
     //发布
     publishHandler(row) {
-       //0未 //1已
-      if(row.isDistribute=='1'){
+      //0未 //1已
+      if (row.isDistribute == "1") {
         this.$modal
-        .confirm("是否取消发布？")
-        .then(function () {})
-        .then(() => {
-          withdraw(row.id).then((res) => {
-            let { code, msg } = res;
-            if (code == 200) {
-              this.getList();
-              this.$modal.msgSuccess("取消发布成功");
-            } else {
-              this.$modal.msgSuccess(msg);
-            }
+          .confirm("是否取消发布？")
+          .then(function () {})
+          .then(() => {
+            withdraw(row.id).then((res) => {
+              let { code, msg } = res;
+              if (code == 200) {
+                this.getList();
+                this.$modal.msgSuccess("取消发布成功");
+              } else {
+                this.$modal.msgSuccess(msg);
+              }
+            });
           });
-        });
-      }else{
+      } else {
         this.$modal
-        .confirm("是否确认发布？")
-        .then(function () {})
-        .then(() => {
-          publishEvaluate(row.id).then((res) => {
-            let { code, msg } = res;
-            if (code == 200) {
-              this.getList();
-              this.$modal.msgSuccess("发布成功");
-            } else {
-              this.$modal.msgSuccess(msg);
-            }
+          .confirm("是否确认发布？")
+          .then(function () {})
+          .then(() => {
+            publishEvaluate(row.id).then((res) => {
+              let { code, msg } = res;
+              if (code == 200) {
+                this.getList();
+                this.$modal.msgSuccess("发布成功");
+              } else {
+                this.$modal.msgSuccess(msg);
+              }
+            });
           });
-        });
       }
-      
-    
-      
     },
     deleteHandler(row) {
       this.$modal

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -1,140 +1,152 @@
 <template>
   <div class="app-container">
-    <layoutCom>
-      <org-tree
-        slot="leftBar"
-        v-model="queryParams.orgId"
-        @defaultKey="getDefaultKey"
-        @checkChange="checkChange"
-        @click="clickTreeNode"
-      ></org-tree>
-      <el-row slot="rightBar">
+    <el-row :gutter="10">
+      <el-col :span="4" :xs="24">
+        <org-tree
+          v-model="queryParams.orgId"
+          @defaultKey="getDefaultKey"
+          @checkChange="checkChange"
+          @click="clickTreeNode"
+        ></org-tree>
+      </el-col>
+      <el-col :span="20" :xs="24">
         <!--用户数据-->
-        <el-col>
+        <div class="main-right-box">
           <!--    搜索条件    -->
-          <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="100px"
-          >
-            <el-form-item label="外包评价名称" prop="evaluateName">
-              <el-input
-                :maxlength="20"
-                v-model="queryParams.evaluateName"
-                placeholder="请输入外包评价名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="请选择状态"
-                clearable
-              >
-                <el-option
-                  v-for="dict in dict.type.evaluate_task_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+          <div class="main-search-box">
+            <!--    搜索条件    -->
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="100px"
+            >
+              <el-form-item label="外包评价名称" prop="evaluateName">
+                <el-input
+                  :maxlength="20"
+                  v-model="queryParams.evaluateName"
+                  placeholder="请输入外包评价名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
                 />
-              </el-select>
-            </el-form-item>
-
-            <el-form-item>
-              <el-form-item prop="roleId" label="计划时间">
-                <el-date-picker
-                  v-model="queryParams.dataTime"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  format="yyyy-MM-DD"
-                  value-format="yyyy-MM-DD"
+              </el-form-item>
+              <el-form-item label="状态" prop="status">
+                <el-select
+                  v-model="queryParams.status"
+                  placeholder="请选择状态"
+                  clearable
                 >
-                </el-date-picker>
+                  <el-option
+                    v-for="dict in dict.type.evaluate_task_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
               </el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
-            </el-form-item>
-          </el-form>
 
-          <el-table
-            border
-            height="650"
-            size="small"
-            v-loading="loading"
-            :data="dataList"
-            align="center"
-            fixed
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column
-              label="序号"
-              type="index"
-              width="50"
-            ></el-table-column>
-            <el-table-column label="评价机构" prop="orgName" />
-            <el-table-column label="评价角色" prop="roleName" />
-            <el-table-column label="外包评价名称" prop="evaluateName" />
-            <el-table-column label="计划开始时间" prop="startTime" />
-            <el-table-column label="计划结束时间" prop="endTime" />
-            <el-table-column label="评价人" prop="evaluateBy" />
-            <el-table-column label="评价时间" prop="evaluateName" />
-            <el-table-column
-              label="状态"
-              prop="status"
-              :formatter="statusChange"
-            />
-
-            <el-table-column
-              label="操作"
-              width="180"
-              fixed="right"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="{ row }">
-               
+              <el-form-item>
+                <el-form-item prop="roleId" label="计划时间">
+                  <el-date-picker
+                    v-model="queryParams.dataTime"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    format="yyyy-MM-DD"
+                    value-format="yyyy-MM-DD"
+                  >
+                  </el-date-picker>
+                </el-form-item>
                 <el-button
+                  type="primary"
+                  icon="el-icon-search"
                   size="mini"
-                  v-if="isEvaluateHandler(row)"
-                  @click="evaluateHandler(row)"
-                  type="text"
-                  icon="el-icon-plus"
-                  >评价</el-button
+                  @click="handleQuery"
+                  >搜索</el-button
                 >
                 <el-button
+                  icon="el-icon-refresh"
                   size="mini"
-                  @click="editHandler(row)"
-                  type="text"
-                  icon="el-icon-plus"
-                  >详情</el-button
+                  @click="resetQuery"
+                  >重置</el-button
                 >
-              </template>
-            </el-table-column>
-          </el-table>
+              </el-form-item>
+            </el-form>
+          </div>
+
+      
+            <!--用户数据-->
+
+            <el-table
+              border
+              height="650"
+              size="small"
+              v-loading="loading"
+              :data="dataList"
+              align="center"
+              fixed
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column
+                label="序号"
+                type="index"
+                width="50"
+              ></el-table-column>
+              <el-table-column label="评价机构" prop="orgName" />
+              <el-table-column label="评价角色" prop="roleName" />
+              <el-table-column label="外包评价名称" prop="evaluateName" />
+              <el-table-column label="计划开始时间" prop="startTime" />
+              <el-table-column label="计划结束时间" prop="endTime" />
+              <el-table-column label="评价人" prop="evaluateBy" />
+              <el-table-column label="评价时间" prop="evaluateName" />
+              <el-table-column
+                label="状态"
+                prop="status"
+                :formatter="statusChange"
+              />
+
+              <el-table-column
+                label="操作"
+                width="180"
+                fixed="right"
+                class-name="small-padding fixed-width"
+              >
+                <template slot-scope="{ row }">
+                  <el-button
+                    size="mini"
+                    v-if="isEvaluateHandler(row)"
+                    @click="evaluateHandler(row)"
+                    type="text"
+                    icon="el-icon-plus"
+                    >评价</el-button
+                  >
+                  <el-button
+                    size="mini"
+                    @click="editHandler(row)"
+                    type="text"
+                    
+                    class="el-icon-view"
+                    >详情</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <pagination
+              v-show="total > 0"
+              :total="total"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              @pagination="getList"
+            />
+        
+        </div>
+      </el-col>
+    </el-row>
 
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-      </el-row>
-    </layoutCom>
     <editEvaluate ref="Evaluate" @success="getList()"></editEvaluate>
   </div>
 </template>
@@ -158,9 +170,9 @@ export default {
       queryParams: {
         orgId: null,
         checkSub: true,
-        status: '',
+        status: "",
         dataTime: [],
-        evaluateName:'',
+        evaluateName: "",
         pageNum: 1,
         pageSize: 10,
       },
@@ -173,7 +185,7 @@ export default {
   created() {},
   mounted() {},
   computed: {
-    ...mapGetters(["orgId",'roleList']),
+    ...mapGetters(["orgId", "roleList"]),
   },
   methods: {
     statusChange(row) {
@@ -211,24 +223,23 @@ export default {
     handleSelectionChange(selection) {},
 
     editHandler(row) {
-      this.$refs.Evaluate.show(row.id,1);
+      this.$refs.Evaluate.show(row.id, 1);
     },
     //判断是否能评价
-    isEvaluateHandler(row){
-     
-      let falg=false
-      row.roleName?.split(',').forEach(item => {
-        this.roleList.forEach(i=>{
-          if(i.roleName==item){
-            falg=true
+    isEvaluateHandler(row) {
+      let falg = false;
+      row.roleName?.split(",").forEach((item) => {
+        this.roleList.forEach((i) => {
+          if (i.roleName == item) {
+            falg = true;
           }
-        })
+        });
       });
-     return falg
+      return falg;
       // row
     },
-    evaluateHandler(row){
-      this.$refs.Evaluate.show(row.id,0);
+    evaluateHandler(row) {
+      this.$refs.Evaluate.show(row.id, 0);
     },
 
     //单选框状态改变

src/views/safetycheck/rule/index.vue

@@ -13,142 +13,155 @@
       </el-col>
 
       <el-col :span="20" :xs="24">
-        <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="search"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item prop="name" label="检查库名称">
-            <el-input
-              v-model="queryParams.name"
-              :maxlength="50"
-              placeholder="请输入检查库名称"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item prop="orgType" label="受检机构类型">
-            <el-select
-              prop="orgType"
-              label="受检机构类型"
-              v-model="queryParams.orgType"
-              placeholder="请选择受检机构类型"
-              clearable
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+              label-width="100px"
             >
-              <el-option
-                v-for="item in dict.type.sys_org_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
+              <el-form-item prop="name" label="检查库名称">
+                <el-input
+                  v-model="queryParams.name"
+                  :maxlength="50"
+                  placeholder="请输入检查库名称"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item prop="orgType" label="受检机构类型">
+                <el-select
+                  prop="orgType"
+                  label="受检机构类型"
+                  v-model="queryParams.orgType"
+                  placeholder="请选择受检机构类型"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in dict.type.sys_org_type"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
 
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="refresh"
-              v-hasPermi="['safetycheck:rule:query']"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd()"
-              v-hasPermi="['safetycheck:rule:add']"
-              >新增</el-button
-            >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="refresh"
+                  v-hasPermi="['safetycheck:rule:query']"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd()"
+                  v-hasPermi="['safetycheck:rule:add']"
+                  >新增检查内容库</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
 
-        <el-table
-          v-loading="loading"
-          :data="pageData"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            v-if="columns[0].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="name"
-            label="检查库名称"
-            v-if="columns[1].visible"
-          ></el-table-column>
-          <el-table-column
-            prop="orgType"
-            label="受检机构类型"
-            v-if="columns[2].visible"
+          <el-table
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+            height="650"
           >
-            <template slot-scope="r"
-              >{{ getLabel(dict.type.sys_org_type, r.row.orgType) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="发布机构"
-            v-if="columns[3].visible"
-          ></el-table-column>
-          <el-table-column prop="status" label="状态" v-if="columns[4].visible">
-            <template slot-scope="r">
-              <span>{{ getLabel(dict.type.plan_status, r.row.status) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="remark"
-            label="备注"
-            v-if="columns[5].visible"
-          ></el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="r" v-if="orgId == r.row.orgId">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="onEdit(r.row.id)"
-                v-hasPermi="['safetycheck:rule:edit']"
-                >编辑</el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                slot="reference"
-                icon="el-icon-delete"
-                @click="onDel(r.row.id)"
-                v-if="orgId == r.row.orgId"
-                v-hasPermi="['safetycheck:rule:remove']"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              type="index"
+              label="序号"
+              v-if="columns[0].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="name"
+              label="检查库名称"
+              v-if="columns[1].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="orgType"
+              label="受检机构类型"
+              v-if="columns[2].visible"
+            >
+              <template slot-scope="r"
+                >{{ getLabel(dict.type.sys_org_type, r.row.orgType) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="orgName"
+              label="发布机构"
+              v-if="columns[3].visible"
+            ></el-table-column>
+            <el-table-column
+              prop="status"
+              label="状态"
+              v-if="columns[4].visible"
+            >
+              <template slot-scope="r">
+                <span>{{ getLabel(dict.type.plan_status, r.row.status) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              label="备注"
+              v-if="columns[5].visible"
+            ></el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="r" v-if="orgId == r.row.orgId">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="onEdit(r.row.id)"
+                  v-hasPermi="['safetycheck:rule:edit']"
+                  >编辑</el-button
+                >
+                <el-button
+                  type="text"
+                  size="small"
+                  slot="reference"
+                  icon="el-icon-delete"
+                  @click="onDel(r.row.id)"
+                  v-if="orgId == r.row.orgId"
+                  v-hasPermi="['safetycheck:rule:remove']"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
 
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit

src/views/safetycheck/ruleManager/dialog.editItem.vue

@@ -29,7 +29,7 @@
         <div class="box">
           <p>检查内容</p>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" @click="onEdit(-1)"
+            <el-button type="primary" icon="el-icon-plus" @click="onEdit(-1)"
               >新增检查内容</el-button
             >
           </div>

src/views/safetycheck/ruleManager/index.vue

@@ -19,151 +19,168 @@
         </org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <el-form
-          :model="queryParams"
-          ref="search"
-          size="small"
-          :inline="true"
-          v-show="showSearch && rule"
-          label-width="100px"
-        >
-          <el-form-item prop="itemName" label="检查项" class="search_itemname">
-            <el-input
-              v-model="queryParams.itemName"
-              placeholder="请输入内容"
-              maxlength="50"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item prop="pointName" label="检查内容">
-            <el-input
-              v-model="queryParams.pointName"
-              placeholder="请输入检查内容"
-              maxlength="50"
-              clearable
-            ></el-input>
-          </el-form-item>
-        </el-form>
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8"  v-show="showSearch && rule">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="refresh"
-              v-hasPermi="['safetycheck:ruleManager']"
-              >搜索</el-button
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box" v-show="showSearch && rule">
+            <el-form
+              :model="queryParams"
+              ref="search"
+              size="small"
+              :inline="true"
+              label-width="100px"
             >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
+              <el-form-item
+                prop="itemName"
+                label="检查项"
+                class="search_itemname"
+              >
+                <el-input
+                  v-model="queryParams.itemName"
+                  placeholder="请输入内容"
+                  maxlength="50"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item prop="pointName" label="检查内容">
+                <el-input
+                  v-model="queryParams.pointName"
+                  placeholder="请输入检查内容"
+                  maxlength="50"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-form>
+            <!--    按纽    -->
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="refresh"
+                  v-hasPermi="['safetycheck:ruleManager']"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="onAddItem()"
+                  :disabled="rule ? false : true"
+                  v-hasPermi="['safetycheck:ruleManager:add']"
+                  v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+                  >新增检查项</el-button
+                >
+                <!-- <el-button
+                type="primary".
+                @click="onSelect()"
+                >选择</el-button
+              > -->
+                <el-button
+                  type="primary"
+                  @click="dakai"
+                  size="mini"
+                  :disabled="rule ? false : true"
+                  >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+                :columns="columns"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            :data="tableData"
+            border
+            :default-expand-all="expandAll"
+            v-if="fresh"
+            style="width: 100%"
+            v-loading="loading"
+            height="650"
+          >
+            <el-table-column type="expand">
+              <template slot-scope="props">
+                <el-table
+                  :data="props.row.pointDtoList"
+                  border
+                  style="width: 100%"
+                >
+                  <el-table-column
+                    prop="name"
+                    label="检查内容"
+                    v-if="columns[3].visible"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    prop="areaName"
+                    label="检查区域"
+                    v-if="columns[4].visible"
+                  >
+                  </el-table-column>
+                </el-table>
+              </template>
+            </el-table-column>
+            <el-table-column
+              type="index"
+              label="序号"
+              width="80"
+              v-if="columns[0].visible"
             >
-            <el-button
-              type="primary"
-              size="mini"
-              @click="onAddItem()"
-              :disabled="rule ? false : true"
-              v-hasPermi="['safetycheck:ruleManager:add']"
-              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
-              >新 增</el-button
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="检查项"
+              v-if="columns[1].visible"
             >
-            <!-- <el-button
-              type="primary".
-              @click="onSelect()"
-              >选择</el-button
-            > -->
-            <el-button
-              type="warning"
-              @click="dakai"
-              size="mini"
-              :disabled="rule ? false : true"
-              >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
+            </el-table-column>
+            <el-table-column
+              prop="pointNums"
+              label="检查内容数量"
+              v-if="columns[2].visible"
             >
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
-        <el-table
-          :data="tableData"
-          border
-          :default-expand-all="expandAll"
-          v-if="fresh"
-          style="width: 100%"
-          v-loading="loading"
-        >
-          <el-table-column type="expand">
-            <template slot-scope="props">
-              <el-table
-                :data="props.row.pointDtoList"
-                border
-                style="width: 100%"
-              >
-                <el-table-column
-                  prop="name"
-                  label="检查内容"
-                  v-if="columns[3].visible"
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              width="140"
+              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  icon="el-icon-edit-outline"
+                  @click="onEditItem(scope.row.id)"
+                  v-hasPermi="['safetycheck:ruleManager:edit']"
+                  >编辑</el-button
                 >
-                </el-table-column>
-                <el-table-column
-                  prop="areaName"
-                  label="检查区域"
-                  v-if="columns[4].visible"
+                <el-button
+                  type="text"
+                  size="small"
+                  slot="reference"
+                  icon="el-icon-delete"
+                  @click="deldata(scope.row.id)"
+                  v-hasPermi="['safetycheck:ruleManager:remove']"
+                  >删除</el-button
                 >
-                </el-table-column>
-              </el-table>
-            </template>
-          </el-table-column>
-          <el-table-column
-            type="index"
-            label="序号"
-            width="80"
-            v-if="columns[0].visible"
-          >
-          </el-table-column>
-          <el-table-column prop="name" label="检查项" v-if="columns[1].visible">
-          </el-table-column>
-          <el-table-column
-            prop="pointNums"
-            label="检查内容数量"
-            v-if="columns[2].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="140"
-            v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
-          >
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="small"
-                icon="el-icon-edit-outline"
-                @click="onEditItem(scope.row.id)"
-                v-hasPermi="['safetycheck:ruleManager:edit']"
-                >编辑</el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                slot="reference"
-                icon="el-icon-delete"
-                @click="deldata(scope.row.id)"
-                v-hasPermi="['safetycheck:ruleManager:remove']"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
     <dialog-edit

src/views/scorestatistics/index.vue

@@ -3,7 +3,8 @@
     <el-row slot="rightBar">
       <!--用户数据-->
       <el-col>
-        <!--    搜索条件    -->
+        <div class="main-search-box">
+           <!--    搜索条件    -->
         <el-form
           :model="queryParams"
           ref="queryForm"
@@ -46,21 +47,10 @@
             >重置</el-button
           >
         </el-form>
+        </div>
+       
 
-        <!-- 按纽   
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:user:add']"
-                >新增</el-button
-              >
-            </el-col>
-          </el-row> -->
+      
         <el-table
           border
           height="650"
@@ -100,13 +90,13 @@
                 size="mini"
                 @click="editHandler(row)"
                 type="text"
-                icon="el-icon-plus"
+                class="el-icon-view"
                 >查看</el-button
               ><el-button
                 size="mini"
                 @click="anewHandler(row)"
                 type="text"
-                icon="el-icon-plus"
+                class="el-icon-edit-outline"
                 >重新计算</el-button
               >
             </template>

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -24,17 +24,14 @@
           </el-form-item>
         </el-form>
 
-        <el-table :data="tableData" style="width: 100%" height="400px">
+        <el-table v-loading="loading" :data="tableData" style="width: 100%" height="400px">
           <el-table-column label="序号" type="index" width="50">
           </el-table-column>
-          <el-table-column prop="orgName" label="营业场所">
-          </el-table-column>
+          <el-table-column prop="orgName" label="营业场所"> </el-table-column>
           <el-table-column prop="orgTypeText" label="场所分类">
           </el-table-column>
-          <el-table-column prop="orgScore" label="安全指数">
-          </el-table-column>
-          <el-table-column prop="levelName" label="安全等级">
-          </el-table-column>
+          <el-table-column prop="orgScore" label="安全指数"> </el-table-column>
+          <el-table-column prop="levelName" label="安全等级"> </el-table-column>
         </el-table>
         <pagination
           v-show="total > 0"
@@ -54,24 +51,18 @@
 </template>
 
 <script>
-import dayjs from "dayjs";
 import { mapGetters } from "vuex";
 import { detail } from "@/api/scorestatistics/scorestatistics.js";
-import { guid } from "@/utils/index.js";
-import {
-  addTargetEvaluate,
-  getEvaluateById,
-  editTargetEvaluate,
-} from "@/api/evaluateRule/rule.js";
+
 
 export default {
-  dicts: ["evaluate_cycle", "sys_org_type"],
   data() {
     return {
       tableData: [],
       id: null,
       isShow: false,
       total: 0,
+      loading:false,
       queryParams: {
         page: 1,
         size: 10,
@@ -93,9 +84,9 @@ export default {
   methods: {
     onOrgTypeChanged() {},
     show(row) {
-     
-      let month=row.dataMonth+''
-      this.queryParams.date = row.dataYear + "-" + (row.dataMonth<10? '0'+month:month);
+      let month = row.dataMonth + "";
+      this.queryParams.date =
+        row.dataYear + "-" + (row.dataMonth < 10 ? "0" + month : month);
       this.queryParams.orgName = row.orgName;
       this.queryParams.orgId = row.orgId;
       this.queryParams.levelId = row.levelId;
@@ -105,14 +96,17 @@ export default {
     },
     //获取分页数据
     getDetailList() {
+      this.loading=true
       detail(this.queryParams).then((res) => {
-        let { code, msg, rows } = res;
+        let { code, msg, rows,total } = res;
         if (code == 200) {
-          this.tableData = rows||[];
+          this.tableData = rows || [];
+          this.total=total||0
           this.isShow = true;
         } else {
           this.$message.error(msg);
         }
+        this.loading=false
       });
     },
     // 事件