Merge remote-tracking branch 'origin/V0.0.2' 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/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

@@ -86,6 +86,7 @@
                   >搜索</el-button
                 >
                 <el-button
+                type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -93,7 +94,6 @@
                 >
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
@@ -108,7 +108,7 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="questionList">
+          <el-table v-loading="loading" :data="questionList" height="650">
             <el-table-column
               type="index"
               label="序号"

src/views/question/reform/index.vue

@@ -77,7 +77,6 @@
                 >
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
@@ -92,7 +91,7 @@
             </el-row>
           </div>
 
-          <el-table v-loading="loading" :data="questionList">
+          <el-table v-loading="loading" :data="questionList" height="650">
             <el-table-column
               type="index"
               label="序号"

src/views/resumption/protection/index.vue

@@ -72,6 +72,7 @@
                   >搜索</el-button
                 >
                 <el-button
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -87,7 +88,6 @@
                 >
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport()"
@@ -132,6 +132,7 @@
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
+            height="650"
           >
             <el-table-column
               type="index"

src/views/resumption/rule/index.vue

@@ -91,7 +91,7 @@
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
-            max-height="calc(100% - 150px)"
+            height="650"
           >
             <el-table-column
               type="index"

src/views/resumption/ruleManager/index.vue

@@ -20,13 +20,13 @@
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
-          <div class="main-search-box">
+          <div class="main-search-box" v-show="showSearch && rule">
             <el-form
               :model="queryParams"
               ref="search"
               size="small"
               :inline="true"
-              v-show="showSearch && rule"
+              
               label-width="100px"
             >
               <el-form-item
@@ -131,6 +131,7 @@
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
+            height="650"
           >
             <el-table-column type="expand">
               <template slot-scope="props">

src/views/resumption/taskManager/index.vue

@@ -90,6 +90,7 @@
                   >搜索</el-button
                 >
                 <el-button
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -97,7 +98,6 @@
                 >
                 <el-button
                   type="primary"
-                  plain
                   icon="el-icon-download"
                   size="mini"
                   @click="exportExcel()"

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

@@ -63,6 +63,7 @@
                   >搜索</el-button
                 >
                 <el-button
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -89,6 +90,7 @@
             v-loading="loading"
             :data="pageData"
             @selection-change="handleSelectionChange"
+            height="650"
           >
             <el-table-column
               type="index"

src/views/safetycheck/ruleManager/index.vue

@@ -21,13 +21,12 @@
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
-          <div class="main-search-box">
+          <div class="main-search-box" v-show="showSearch && rule">
             <el-form
               :model="queryParams"
               ref="search"
               size="small"
               :inline="true"
-              v-show="showSearch && rule"
               label-width="100px"
             >
               <el-form-item
@@ -52,7 +51,7 @@
               </el-form-item>
             </el-form>
             <!--    按纽    -->
-            <el-row :gutter="10" class="mb8" v-show="showSearch && rule">
+            <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button
                   type="primary"
@@ -63,6 +62,7 @@
                   >搜索</el-button
                 >
                 <el-button
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -71,7 +71,6 @@
                 <el-button
                   type="primary"
                   size="mini"
-                  icon="el-icon-plus"
                   @click="onAddItem()"
                   :disabled="rule ? false : true"
                   v-hasPermi="['safetycheck:ruleManager:add']"
@@ -84,7 +83,7 @@
                 >选择</el-button
               > -->
                 <el-button
-                  type="warning"
+                  type="primary"
                   @click="dakai"
                   size="mini"
                   :disabled="rule ? false : true"
@@ -105,6 +104,7 @@
             v-if="fresh"
             style="width: 100%"
             v-loading="loading"
+            height="650"
           >
             <el-table-column type="expand">
               <template slot-scope="props">

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
       });
     },
     // 事件