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

# Conflicts:
#	src/views/check/task/index.vue

.gitignore

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

src/App.vue

@@ -22,8 +22,8 @@ export default {
 };
 </script>
 <style scoped>
-#app{
-  font-size: 14px;
+#app {
+  font-size: 16px;
 }
 #app .theme-picker {
   display: none;

src/assets/styles/index.scss

@@ -8,28 +8,27 @@
 //@font-face {
 //  font-family: SYExtraLight;
 //  font-style: normal;
-//  font-weight: 300;
 //  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-VF.ttf");
 //}
 
-//@font-face {
-//  font-family: SYExtraLight;
-//  font-style: normal;
-//  font-weight: 300;
-//  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-ExtraLight.otf");
-//}
-//
-//@font-face {
-//  font-family: SYLight;
-//  font-style: normal;
-//  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Light.otf");
-//}
-//
-//@font-face {
-//  font-family: SYNormal;
-//  font-style: normal;
-//  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
-//}
+@font-face {
+  font-family: SYBold;
+  font-style: normal;
+  font-weight: 300;
+  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-Bold.otf");
+}
+
+@font-face {
+  font-family: SYHeavy;
+  font-style: normal;
+  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Heavy.otf");
+}
+
+@font-face {
+  font-family: SYNormal;
+  font-style: normal;
+  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
+}
 
 body {
   height: 100%;
@@ -37,7 +36,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   color: #000;
-  //font-family: SYExtraLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
   /*框架自带字体*/
   //font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
   //  Microsoft YaHei, Arial, sans-serif;
@@ -45,9 +44,11 @@ body {
 
 .el-button{
   //font-weight: 400;
-  //font-family: SYLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: SYBold,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+.el-button--text{
+  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
-
 .el-table__header-wrapper{
   //font-weight: normal;
   //font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;

src/assets/styles/ruoyi.scss

@@ -289,21 +289,45 @@
    font-size: 12px;
  }
  .el-button--mini{
-   font-size: 13px!important;
+   font-size: 16px!important;
+ }
+ .el-table--small{
+    font-size: 16px!important;
  }
 .el-table thead{
   >tr{
     >th{
+      font-family: SYHeavy,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+      font-size: 16px!important;
       background-color: #d1e0f1 !important;
     }
   }
 }
 .el-tree-node__content{
-    font-size: 13px;
-    height: 32px!important;
-  }
- .el-submenu__title,.el-menu-item{
-   font-size: 13px!important;
+   font-size: 16px;
+  height: 36px!important;
+  line-height: 36px!important;
+}
+.el-submenu__title,.el-menu-item{
+   font-size: 16px!important;
    height: 42px!important;
    line-height: 42px!important;
+}
+
+ .el-form-item__label{
+    font-size: 16px!important;
  }
+
+ .tags-view-item{
+   line-height: 23px!important;
+   font-size: 16px!important;
+ }
+ .el-pagination button, .el-pagination span:not([class*=suffix]){
+   font-size: 16px!important;
+ }
+.el-checkbox__label{
+  font-size: 16px!important;
+}
+.el-input__inner{
+  font-size: 14px!important;
+}

src/views/check/dialog.edit.vue

@@ -74,7 +74,7 @@
                 v-if="NowBuild()"
                 ><div class="checkbox-wrapper">
                   <el-checkbox
-                    :disabled="isChildren()"
+                    :disabled="isbuildTaskNow()"
                     v-model="formData.buildTaskNow"
                     size="medium"
                     @change="handleCheckboxChange"
@@ -326,8 +326,9 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
+        
       </div>
     </DialogCom>
     <DialogSelect
@@ -371,6 +372,7 @@ export default {
       execOrgType: null,
       roleNames: null,
       planExec: null,
+      defbuildTaskNow:false,
       count: 0,
       description: null,
       selectedRows: [],
@@ -408,6 +410,18 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    isbuildTaskNow(){
+      if (
+        (this.formData.planCreateOrgId == this.orgId &&
+          this.formData.hasEdit != 1) ||
+        (this.formData.planOfOrgType != 3 && this.formData.hasEdit != 1) ||
+        this.id == null
+      &&(this.id==null||this.id==undefined||this.formData.planStatus==0)) {
+        return false;
+      } else return true;
+
+
+    },
     handleSelectable(row) {
       // 在这里根据特定条件判断是否禁用多选框行
       return this.getshenglianshe(row); // 返回 true 禁用，返回 false 不禁用
@@ -449,8 +463,9 @@ export default {
       } else return true;
     },
     NowBuild() {
-      if (this.formData.planCycle == 6) return false;
-      else return true;
+      //如果新增或者是草稿状态的立即生效的编辑
+      if ((this.id==null||this.id==undefined)||(this.defbuildTaskNow &&this.formData.planStatus==0)) return true;
+      else return false;
     },
     getLabel(options, value) {
       return getLabel(options, value);
@@ -527,6 +542,7 @@ export default {
     async refresh(id, other) {
       if (id != null && id != undefined) {
         await api.get(id).then((res) => {
+          this.defbuildTaskNow=res.data.buildTaskNow;
           this.parentCount = res.data.parentCount;
           this.formData = res.data;
           this.formData.buildTaskNow;

src/views/check/index.vue

@@ -21,150 +21,153 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="70px"
+          label-width="90px"
         >
-        <el-form-item prop="checkType" label="任务类型" >
-            <el-select
-              prop="checkType"
-              label="任务类型"
-              v-model="queryParams.checkType"
-              placeholder="请选择任务类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.check_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
-            <el-select
-              prop="execOrgType"
-              label="检查机构类型"
-              v-model="queryParams.execOrgType"
-              placeholder="请选择检查机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
-            <el-select
-              prop="checkOrgType"
-              label="受检机构类型"
-              v-model="queryParams.checkOrgType"
-              placeholder="请选择受检机构类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.sys_org_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-form-item prop="checkType" label="任务类型">
+              <el-select
+                prop="checkType"
+                label="任务类型"
+                v-model="queryParams.checkType"
+                placeholder="请选择任务类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.check_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="execOrgType" label="检查机构类型" v-if="false">
+              <el-select
+                prop="execOrgType"
+                label="检查机构类型"
+                v-model="queryParams.execOrgType"
+                placeholder="请选择检查机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="checkOrgType" label="受检机构类型" v-if="false">
+              <el-select
+                prop="checkOrgType"
+                label="受检机构类型"
+                v-model="queryParams.checkOrgType"
+                placeholder="请选择受检机构类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_org_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="checkRole" label="检查人员">
-            <el-select
-              @visible-change="getRolesByOrg"
-              prop="checkRole"
-              label="检查人员"
-              v-model="queryParams.checkRole"
-              placeholder="请选择用户角色"
-              clearable
-            >
-              <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
+            <el-form-item prop="checkRole" label="检查人员">
+              <el-select
+                @visible-change="getRolesByOrg"
+                prop="checkRole"
+                label="检查人员"
+                v-model="queryParams.checkRole"
+                placeholder="请选择用户角色"
+                clearable
+              >
+                <el-option
+                  v-for="dict in resumptionRoles"
+                  :key="dict.index"
+                  :label="dict.roleName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="planCycle" label="任务周期">
+              <el-select
+                prop="planCycle"
+                label="任务周期"
+                v-model="queryParams.planCycle"
+                placeholder="请选择任务周期"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.check_cycle"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item prop="planStatus" label="任务状态">
+              <el-select
+                prop="planStatus"
+                label="任务状态"
+                v-model="queryParams.planStatus"
+                placeholder="请选择任务状态"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.check_status"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="planName" label="任务名称">
+              <el-input
+                v-model="queryParams.planName"
+                :maxlength="50"
+                name="planName"
+                placeholder="请输入关键字"
+                clearable
               />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planCycle" label="任务周期">
-            <el-select
-              prop="planCycle"
-              label="任务周期"
-              v-model="queryParams.planCycle"
-              placeholder="请选择任务周期"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.check_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planStatus" label="任务状态">
-            <el-select
-              prop="planStatus"
-              label="任务状态"
-              v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              <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="['core:checkplan:add']"
+                >新增任务</el-button
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planName" label="任务名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入关键字"
-              clearable
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</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="['core:checkplan:add']"
-              >新增任务</el-button
-            >
-          </el-form-item>
+            </el-form-item>
+          </el-row>
         </el-form>
 
-        <!--    按纽    -->
+        <!-- 按纽   
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            
-          </el-col>
+          <el-col :span="1.5"> </el-col>
           <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
             :columns="columns"
           ></right-toolbar>
-        </el-row>
+        </el-row> -->
 
         <el-table
           border
@@ -177,6 +180,7 @@
           :tree-props="{ children: 'children' }"
         >
           <el-table-column
+            align="center"
             type="index"
             label="序号"
             width="80px"
@@ -187,7 +191,7 @@
             label="任务名称"
             v-if="columns[1].visible"
           ></el-table-column>
-         
+
           <el-table-column
             prop="checkType"
             label="任务类型"
@@ -210,20 +214,13 @@
           >
           </el-table-column>
 
-          <el-table-column
-            prop="execOrgType"
-            label="检查主体"
-          >
+          <el-table-column prop="execOrgType" label="检查主体">
             <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, `${r.row.execOrgType}`) }}
             </template>
           </el-table-column>
 
-          <el-table-column
-            prop="checkOrgType"
-            label="受检机构"
-            width="120px"
-          >
+          <el-table-column prop="checkOrgType" label="受检机构" width="120px">
             <template slot-scope="r"
               >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
             </template>
@@ -252,6 +249,7 @@
           </el-table-column>
 
           <el-table-column
+            align="center"
             prop="count"
             label="任务次数"
             v-if="columns[6].visible"
@@ -326,7 +324,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-arrow-down"
+                icon="el-icon-top-left"
                 v-if="chehui(r.row)"
                 @click="chhuile(r.row)"
                 v-hasPermi="['core:checkplan:distribute']"
@@ -469,8 +467,8 @@ export default {
         (row.planOfOrgType == 3 &&
           row.planStatus != 1 &&
           row.planCreateOrgId == this.orgId) ||
-        (row.planStatus == 2 && row.parentId != -1 && row.planOfOrgType == 1)||
-        (row.planStatus != 1&&(row.execOrgType == 1||row.execOrgType == 2))
+        (row.planStatus == 2 && row.parentId != -1 && row.planOfOrgType == 1) ||
+        (row.planStatus != 1 && (row.execOrgType == 1 || row.execOrgType == 2))
       ) {
         return true;
       }
@@ -573,11 +571,21 @@ export default {
     },
     //开始撤回
     chhuile(row) {
-      this.loading = true;
-      api.cheHui(row.id).then((response) => {
-        this.getList();
-        this.loading = false;
-      });
+      this.$modal
+        .confirm("撤回计划会清除本周期所有任务!", "提示")
+        .then(() => {
+          // 用户点击了确认按钮
+          // console.log("执行操作...");
+          this.loading = true;
+          api.cheHui(row.id).then((response) => {
+            this.getList();
+            this.loading = false;
+          });
+        })
+        .catch(() => {
+          // 用户点击了取消按钮
+          // console.log("取消操作...");
+        });
     },
     //已下发的显示撤回
     chehui(row) {
@@ -595,7 +603,7 @@ export default {
         .confirm('是否确认删除名称为"' + name + '"的数据项？')
         .then(() => {
           // 用户点击了确认按钮
-          console.log("执行操作...");
+          // console.log("执行操作...");
           this.loading = true;
           api
             .delelte(id)
@@ -610,7 +618,7 @@ export default {
         })
         .catch(() => {
           // 用户点击了取消按钮
-          console.log("取消操作...");
+          // console.log("取消操作...");
         });
     },
     // 多选框选中数据

src/views/check/task/index.vue

@@ -116,7 +116,7 @@
             label="任务时间"
             prop="planStartTime"
           >
-            <el-date-picker
+            <DataRangePicker
               type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss"
               :default-time="['00:00:00', '23:59:59']"
@@ -125,7 +125,7 @@
               v-model="queryParams.range"
               :picker-options="pickerOptions"
             >
-            </el-date-picker>
+            </DataRangePicker>
           </el-form-item>
           <el-row>
             <el-form-item style="margin-left: 35px">
@@ -146,25 +146,7 @@
           </el-row>
         </el-form>
         <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              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>
+       
         <el-table
           border
           height="600"
@@ -173,6 +155,7 @@
           :data="pageData"
         >
           <el-table-column
+            align="center"
             type="index"
             fixed
             min-width="50"
@@ -216,8 +199,8 @@
               <span>
                 <!-- <i class="circle" :style="statusColor(r.row.status, true)" /> -->
                 <!-- <label :style="statusColor(r.row.status, false)"> -->
-                  <label >
-                 {{
+                <label>
+                  {{
                     getLabel(dict.type.safety_check_status, r.row.status)
                   }}</label
                 >
@@ -263,36 +246,26 @@
             </template></el-table-column
           >
 
-  
-
           <el-table-column
             prop="submitBy"
             label="检查人"
             min-width="100"
             v-if="false"
           ></el-table-column>
-          <el-table-column 
-            label="检查时间"
-            min-width="120"
-            v-if="false"
-          >
+          <el-table-column label="检查时间" min-width="120" v-if="false">
             <template slot-scope="r">{{
               r.row.submitTime | dateTime
             }}</template>
           </el-table-column>
           <el-table-column
+            align="center"
             prop="exceptionCount"
             label="隐患问题数"
             min-width="80"
             v-if="columns[9].visible"
           >
           </el-table-column>
-          <el-table-column
-            prop="des"
-            label="备注"
-            min-width="80"
-            v-if="false"
-          >
+          <el-table-column prop="des" label="备注" min-width="80" v-if="false">
           </el-table-column>
           <el-table-column label="操作" fixed="right" min-width="200">
             <template slot-scope="r">
@@ -315,7 +288,7 @@
                 type="text"
                 @click="showscanRecord(r.row)"
                 v-hasPermi="['resumption:taskManager:query']"
-                >检查登记簿</el-button
+                >扫描记录</el-button
               >
               <el-button
                 type="text"
@@ -338,7 +311,7 @@
     <!-- 详情 -->
     <dialog-detail ref="detaildialog"></dialog-detail>
     <dialog-scan-record ref="scanrecorddialog"></dialog-scan-record>
-    <dialog-temporary-task  ref="dialogtemporarytask" @success="getList"></dialog-temporary-task>
+
   </div>
 </template>
 
@@ -387,7 +360,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
-        range:[],
+        range: [],
       },
       selectedOrgName: null,
       pageData: [],
@@ -497,7 +470,7 @@ export default {
     },
     resetQuery() {
       this.queryParams.checkOrgIds = [];
-      this.queryParams.range=[];
+      this.queryParams.range = [];
       this.resetForm("queryParams");
       this.getList();
     },

src/views/core/accessPlan/index.vue

@@ -154,14 +154,12 @@
           <el-input type="number"  :min="1" oninput="if(value<0)value=1"
                     v-model.number="form.planFrequency" placeholder="请输入调阅次数" :disabled="form.isComplete"/>
         </el-form-item>
-        <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
+        <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0&&this.issue==null">
               <el-checkbox v-model="form.immediately" :disabled="form.isEdit||form.isComplete">
                 默认从下个周期生成任务，
                 <br/>
                 勾选后从当前周期立即生成任务
-                <!-- <el-popover placement="top-start" title="" width="200" trigger="hover"
-                            content="" :disabled="form.isEdit">
-                </el-popover> -->
+                
               </el-checkbox>
             </el-form-item> 
         <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
@@ -277,14 +275,11 @@
             {required: true, message: '请选择调阅频次', trigger: 'change'},
           ],
         },
-        initNum:null
+        initNum:null,
+        issue:null
       };
     },
     created() {
-      // this.getList();
-      // listRole().then(response => {
-      //   this.roleList = response.rows;
-      // });
       allRole().then(response => {
         this.roleList = response.data;
       });
@@ -429,6 +424,7 @@
         getPlan(id).then(response => {
           this.form = response.data;
           this.initNum = response.data.parentFrequency; 
+this.issue=response.data.updateBy;
           this.open = true;
           this.title = "编辑监控调阅任务";
           findRoleByType(this.form.orgType).then(response => {

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

@@ -1,12 +1,14 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
                   @click="clickTreeNode" wholeTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
+        <div class="main-right-box">
+          <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <!-- <el-form-item label="编号" prop="id">
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
@@ -61,8 +63,8 @@
           </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table border height="555px" v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
+          </div>
+        <el-table border height="650px" v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="60"/>
           <el-table-column label="机构名称" align="left" header-align="center" width="250" prop="orgName" />
 
@@ -112,11 +114,12 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改预案演练库对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="演练项目" prop="drillType" style="width:100%;">
           <el-select v-model="form.drillType" placeholder="请选择演练项目" style="width:100%;">
             <el-option

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -8,7 +8,8 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
-        <div class="main-search-box">
+        <div class="main-right-box">
+          <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="任务名称" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
@@ -32,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>
@@ -62,7 +63,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         </div>
-        <el-table height="640px" border :data="planList" @selection-change="handleSelectionChange"
+        <el-table height="650px" border :data="planList" @selection-change="handleSelectionChange"
                   row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" width="60" prop="no"/>
@@ -84,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">
@@ -105,9 +106,10 @@
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <pagination :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
@@ -129,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>
@@ -157,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">
                               默认从下个周期...
@@ -182,7 +184,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <!-- <el-row>
            <el-col :span="12">

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

@@ -1,11 +1,13 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
+        <div class="main-right-box">
+          <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
           <el-form-item label="任务名称" prop="title">
             <el-input v-model="queryParams.title" placeholder="请输入关键字" clearable/>
@@ -30,13 +32,21 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="任务时间" prop="rangen">
+          <!-- <el-form-item label="任务时间" prop="rangen">
             <el-date-picker
               v-model="queryParams.range"
               type="daterange"
               value-format="yyyy-MM-dd"
               placeholder="请选择开始日期">
             </el-date-picker>
+          </el-form-item> -->
+          <el-form-item class="searchTitle" prop="rangen" label="任务时间">
+            <DataRangePicker
+              v-model="queryParams.range"
+              key="daterange"
+              type="daterange"
+              :clearable="timeClearable"
+            />
           </el-form-item>
           <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -61,8 +71,8 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table border height="555px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
+          </div>
+        <el-table border height="650px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="60"/>
           <el-table-column label="任务名称" width="250" align="left" header-align="center" prop="title"/>
           <el-table-column label="演练机构" width="200" align="left" header-align="center" prop="orgName"/>
@@ -154,6 +164,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
@@ -165,6 +176,7 @@
 
 <script>
 import {listEduTask, addEduTask, updateEduTask} from "@/api/core/drill/drillTask";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import DialogPerform from "./dialog.perform";
@@ -181,7 +193,8 @@ export default {
     DialogNewTask,
     DialogEvaluate,
     OrgTree,
-    dayjs
+    dayjs,
+    DataRangePicker
   },
   data() {
     return {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.belongOrgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -8,6 +8,8 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
+        <div class="main-right-box">
+          <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="培训主题" prop="planName">
@@ -54,7 +56,7 @@
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -84,10 +86,10 @@
                    </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
+          </div>
         <el-table
           border
-          height="550"
+          height="650"
           size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id">
           <!-- :tree-props="{ children: 'children' }" -->
           <el-table-column label="序号" align="center" prop="no" width="60"/>
@@ -114,20 +116,20 @@
                         </template>
                       </template>
                     </el-table-column>-->
-          <el-table-column label="任务周期" align="center" width="100" prop="planCycle">
+          <el-table-column label="任务周期" align="center" width="90" prop="planCycle">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="任务次数" align="center" width="100" prop="execTimes"/>
-          <el-table-column label="任务状态" align="center" width="100" prop="planStatus">
+          <el-table-column label="任务次数" align="center" width="90" prop="execTimes"/>
+          <el-table-column label="任务状态" align="center" width="90" prop="planStatus">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_plan_status" :value="parseInt(scope.row.planStatus)"/>
             </template>
           </el-table-column>
 
 <!--          <el-table-column label="备注" align="center" prop="remark"/>-->
-          <el-table-column label="操作" width="180" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="200" align="left" header-align="center" fixed="right" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-arrow-down"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:plan:edit']">下发
@@ -148,6 +150,7 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
@@ -207,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

@@ -8,11 +8,11 @@
 
             <!-- 培训主题 -->
             <el-col :span="24">
-              <el-form-item prop="title" label="培训主题">
+              <el-form-item prop="title" label="任务名称">
                 <el-input
                   v-model="formData.title"
                   :maxlength="32"
-                  placeholder="请输入培训主题"
+                  placeholder="请输入任务名称"
                   clearable
                 />
               </el-form-item>
@@ -85,6 +85,13 @@
           </el-row>
 
           <el-row>
+           
+            <el-col :span="24">
+              <el-form-item prop="imageList" label="培训图片">
+                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
+                           @input="imageListChanged"></imgUpload>
+              </el-form-item>
+            </el-col>
             <el-col :span="10">
               <el-form-item label="培训资料" prop="fileList">
                 <K-file-upload ref="upload" :defaultValue="formFileListDefualtValue" v-model="formData.fileList"/>
@@ -95,12 +102,7 @@
                 <el-button type="primary" @click="showSelectFile">选取知识库文件</el-button>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
-                           @input="imageListChanged"></imgUpload>
-              </el-form-item>
-            </el-col>
+            
           </el-row>
         </el-form>
       </div>
@@ -140,14 +142,14 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        title: [{required: true, message: "请输入培训主题"}],
+        title: [{required: true, message: "请输入任务名称"}],
         content: [{required: true, message: "请输入培训内容"}],
         absenceList: [{required: true, type: "array", message: "请选择参会人员"}],
         startDate: [{required: true, message: "请输入培训开始时间"}],
         endDate: [{required: true, message: "请输入培训结束时间"}],
         note: [{required: true, message: "请输入培训总结"}],
         imageList: [{required: true, message: "请上传培训图片"}],
-        fileList: [{required: true, message: "请上传培训文件"}],
+        // fileList: [{required: true, message: "请上传培训文件"}],
       },
       startDatepickerOptions: {
         disabledDate(time) {

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

@@ -1,14 +1,16 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                   @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
+        <div class="main-right-box">
+          <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-          <el-form-item label="培训主题" prop="title">
+          <el-form-item label="任务名称" prop="title">
             <el-input
               v-model="queryParams.title"
               placeholder="请输入关键字"
@@ -27,13 +29,21 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="任务时间" prop="rangen">
+          <!-- <el-form-item label="任务时间" prop="rangen">
             <el-date-picker
               v-model="queryParams.range"
               type="daterange"
               value-format="yyyy-MM-dd"
               placeholder="请选择任务时间段">
             </el-date-picker>
+          </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-item label="培训类型" prop="type">
                   <el-select v-model="queryParams.type" placeholder="请选择培训类型" clearable>
@@ -58,7 +68,7 @@
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddTask">临时登记</el-button>
@@ -89,13 +99,13 @@
                    </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
+          </div>
         <el-table
           border
-          height="600"
+          height="650"
           size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" align="center" width="70" prop="no"/>
-          <el-table-column label="培训主题" width="315" align="left" header-align="center" prop="title"/>
+          <el-table-column label="任务名称" width="315" align="left" header-align="center" prop="title"/>
           <el-table-column label="受训机构" width="315" align="left" header-align="center" prop="orgName"/>
           <el-table-column label="任务进度" align="center" prop="status" width="150">
             <template slot-scope="scope">
@@ -180,6 +190,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
 
@@ -191,6 +202,7 @@
 
 <script>
 import {listEduTask, addEduTask, updateEduTask} from "@/api/core/edu/eduTask";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import DialogPerform from "./dialog.perform";
@@ -204,7 +216,7 @@ export default {
     DialogInfo,
     DialogPerform,
     OrgTree,
-    DialogNewTask
+    DialogNewTask,DataRangePicker
   },
   data() {
     return {

src/views/core/materials/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
@@ -8,7 +8,8 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-
+        <div class="main-right-box">
+          <div class="main-search-box">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
           <el-form-item label="资料名称" prop="title">
@@ -46,7 +47,7 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -61,10 +62,11 @@
 
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
+          </div>
         <!-- 表格数据 -->
         <el-table
           border
-          height="600"
+          height="650"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="68"/>
@@ -151,11 +153,12 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改学习资料对话框 -->
     <DialogCom :title="title" :visible.sync="open" @close="cancel" width="700px" append-to-body>
-      <el-form :disabled="title=='知识库详情'" ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form :disabled="title=='知识库详情'" ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="资料名称" prop="title" class="endItem">
           <el-input v-model="form.title" placeholder="请输入资料名称" maxlength="50" show-word-limit/>
         </el-form-item>
@@ -171,7 +174,7 @@
                   <el-input v-model="form.content" placeholder="请输入资料内容" maxlength="200" show-word-limit/>
                 </el-form-item>-->
 
-        <el-form-item label="资料附件" prop="fileList">
+        <el-form-item label="上传文件" prop="fileList">
           <K-file-upload ref="upload" :isShowUploadBtn="title!='知识库详情'"
                          :defaultValue="formFileListDefualtValue"
                          v-model="form.fileList"/>

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/editEvaluationRuleDialog.vue

@@ -142,7 +142,7 @@
         <el-button @click="openSelect">新增扣分规则</el-button>
 
         <el-table :data="tableData" style="width: 100%" height="400px">
-          <el-table-column label="序号" type="index" width="50">
+          <el-table-column label="序号" type="index" width="100">
           </el-table-column>
           <el-table-column prop="indicatorNote" label="计算项目">
           </el-table-column>
@@ -165,8 +165,8 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
       </div>
     </DialogCom>
     <DialogSelect

src/views/evaluationRule/index.vue

@@ -1,16 +1,17 @@
 <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"
           :inline="true"
           v-show="showSearch"
-          label-width="100px"
+          
         >
           <el-form-item label="机构类型">
             <el-select
@@ -106,6 +107,8 @@
             >
           </el-col>
         </el-row>
+        </div>
+        
         <el-table
           border
           height="650"
@@ -119,7 +122,7 @@
           <el-table-column
             label="序号"
             type="index"
-            width="50"
+            width="100"
           ></el-table-column>
           <el-table-column label="机构类型" prop="orgTypeText" />
           <el-table-column label="指标分类" prop="typeCodeText" />
@@ -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/resumption/plan/dialog.edit.vue

@@ -19,7 +19,8 @@
           <el-row>
             <el-col :span="6">
               <el-form-item prop="planName" label="任务名称:">
-                <el-input :disabled="isChildren()"
+                <el-input
+                  :disabled="isChildren()"
                   v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"
@@ -119,7 +120,6 @@
                 ></el-switch> -->
             <!-- </el-form-item> -->
             <!-- </el-col> -->
-            
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -163,10 +163,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
 
             <el-col :span="6">
-              <el-form-item prop="count" label="任务次数:" >
+              <el-form-item prop="count" label="任务次数:">
                 <el-input-number
                   style="margin-left: 10px"
                   v-model="formData.count"
@@ -177,10 +176,15 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-            <el-col :span="6" >
-              <el-form-item prop="tempBuildTaskNow" label="立即生效:">
+            <el-col :span="6">
+              <el-form-item
+                prop="tempBuildTaskNow"
+                label="立即生效:"
+                v-if="NowBuild()"
+              >
                 <div class="checkbox-wrapper">
-                  <el-checkbox :disabled="isChildren()"
+                  <el-checkbox
+                    :disabled="isbuildTaskNow()"
                     v-model="tempBuildTaskNow"
                     size="medium"
                     @change="handleCheckboxChange"
@@ -208,7 +212,10 @@
           height="400px"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" :selectable="handleSelectable"></el-table-column>
+          <el-table-column
+            type="selection"
+            :selectable="handleSelectable"
+          ></el-table-column>
 
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
@@ -244,7 +251,8 @@
           <el-table-column v-if="false" prop="ofOrgId" label="所属机构id">
           </el-table-column>
           <el-table-column prop="areaName" label="履职区域"> </el-table-column>
-          <el-table-column prop="checkName" label="履职点位" v-if="false"> </el-table-column>
+          <el-table-column prop="checkName" label="履职点位" v-if="false">
+          </el-table-column>
           <el-table-column label="操作">
             <template v-slot="{ row }">
               <el-button
@@ -259,8 +267,9 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
+       
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
       </div>
     </DialogCom>
     <DialogSelect
@@ -307,6 +316,7 @@ export default {
       execOrgType: null,
       roleNames: null,
       planExec: null,
+      defbuildTaskNow:false,
       count: 0,
       description: null,
       propItem: "",
@@ -379,6 +389,29 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    isbuildTaskNow() {
+      if (
+        (this.formData.planCreateOrgId == this.orgId &&
+          this.formData.hasEdit != 1) ||
+        (this.formData.planOfOrgType != 3 && this.formData.hasEdit != 1) ||
+        (this.id == null &&
+          (this.id == null ||
+            this.id == undefined ||
+            this.formData.planStatus == 0))
+      ) {
+        return false;
+      } else return true;
+    },
+    NowBuild() {
+      //如果新增或者是草稿状态的立即生效的编辑
+      if (
+        this.id == null ||
+        this.id == undefined ||
+        (this.defbuildTaskNow && this.formData.planStatus == 0)
+      )
+        return true;
+      else return false;
+    },
     handleSelectable(row) {
       // 在这里根据特定条件判断是否禁用多选框行
       return this.getshenglianshe(row); // 返回 true 禁用，返回 false 不禁用
@@ -690,7 +723,7 @@ export default {
       this.getRolesByOrg();
     },
     async show(id, other = {}) {
-      this.parentCount =1;
+      this.parentCount = 1;
       this.tempBuildTaskNow = false;
       this.buildTime = null;
       this.id = id;
@@ -700,7 +733,8 @@ export default {
       // console.log(id);
       if (id !== undefined) {
         await api.get(id).then((res) => {
-          this.tempBuildTaskNow=res.data.buildTaskNow>0?true:false;
+          this.defbuildTaskNow=res.data.buildTaskNow> 0 ? true : false;;
+          this.tempBuildTaskNow = res.data.buildTaskNow > 0 ? true : false;
           this.parentCount = res.data.parentCount;
           // console.log(res, "res");
           this.tableData = res.data.itemList;

src/views/resumption/plan/index.vue

@@ -21,107 +21,113 @@
           size="small"
           :inline="true"
           v-show="showSearch"
-          label-width="70px"
+          label-width="90px"
         >
-          <el-form-item prop="planType" label="任务类型">
-            <el-select
-              prop="planType"
-              label="任务类型"
-              v-model="queryParams.planType"
-              placeholder="请选择任务类型"
-              clearable
-            >
-              <el-option
-                v-for="dict in dict.type.resumption_plan_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="resumptionRole" label="履职人员">
-            <el-select
-              @visible-change="getRolesByOrg"
-              prop="resumptionRole"
-              label="履职人员"
-              v-model="queryParams.resumptionRole"
-              placeholder="请选择用户角色"
-              clearable
-            >
-              <el-option
-                v-for="dict in resumptionRoles"
-                :key="dict.index"
-                :label="dict.roleName"
-                :value="dict.id"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-form-item prop="planType" label="任务类型">
+              <el-select
+                prop="planType"
+                label="任务类型"
+                v-model="queryParams.planType"
+                placeholder="请选择任务类型"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.resumption_plan_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="resumptionRole" label="履职人员">
+              <el-select
+                @visible-change="getRolesByOrg"
+                prop="resumptionRole"
+                label="履职人员"
+                v-model="queryParams.resumptionRole"
+                placeholder="请选择用户角色"
+                clearable
+              >
+                <el-option
+                  v-for="dict in resumptionRoles"
+                  :key="dict.index"
+                  :label="dict.roleName"
+                  :value="dict.id"
+                />
+              </el-select>
+            </el-form-item>
 
-          <el-form-item prop="planCycle" label="任务周期">
-            <el-select
-              prop="planCycle"
-              label="任务周期"
-              v-model="queryParams.planCycle"
-              placeholder="请选择任务周期"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_plan_cycle"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+            <el-form-item prop="planCycle" label="任务周期">
+              <el-select
+                prop="planCycle"
+                label="任务周期"
+                v-model="queryParams.planCycle"
+                placeholder="请选择任务周期"
+                clearable
+              >
+                <el-option
+                  v-for="item in dict.type.resumption_plan_cycle"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item prop="planStatus" label="任务状态">
+              <el-select
+                prop="planStatus"
+                label="任务状态"
+                v-model="queryParams.planStatus"
+                placeholder="请选择任务状态"
+                clearable
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="planStatus" label="任务状态">
-            <el-select
-              prop="planStatus"
-              label="任务状态"
-              v-model="queryParams.planStatus"
-              placeholder="请选择任务状态"
-              clearable
-            >
-              <el-option
-                v-for="item in dict.type.resumption_plan_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                <el-option
+                  v-for="item in dict.type.resumption_plan_status"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
+            </el-form-item>
+            <el-form-item prop="planName" label="任务名称">
+              <el-input
+                v-model="queryParams.planName"
+                :maxlength="50"
+                name="planName"
+                placeholder="请输入任务名称"
+                clearable
+              />
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="mini"
+                @click="getList"
+                >搜索</el-button
               >
-              </el-option>
-            </el-select>
-            <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="0"></el-switch> -->
-          </el-form-item>
-          <el-form-item prop="planName" label="任务名称">
-            <el-input
-              v-model="queryParams.planName"
-              :maxlength="50"
-              name="planName"
-              placeholder="请输入任务名称"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-              >搜索</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="['system:user:add']"
-              >新增任务</el-button
-            >
-          </el-form-item>
-          <el-row :gutter="10" class="mb8">
+              <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="['system:user:add']"
+                >新增任务</el-button
+              >
+            </el-form-item>
+          </el-row>
+          <!-- <el-row :gutter="10" class="mb8">
             <el-col :span="1.5"> </el-col>
 
             <right-toolbar
@@ -129,7 +135,7 @@
               @queryTable="getList"
               :columns="columns"
             ></right-toolbar>
-          </el-row>
+          </el-row> -->
         </el-form>
 
         <!--    按纽    -->
@@ -144,6 +150,7 @@
           row-key="id"
         >
           <el-table-column
+            align="center"
             fixed
             type="index"
             label="序号"
@@ -226,6 +233,7 @@
             </template>
           </el-table-column>
           <el-table-column
+            align="center"
             prop="count"
             label="任务次数"
             v-if="columns[7].visible"
@@ -306,7 +314,7 @@
               <el-button
                 size="mini"
                 type="text"
-                icon="el-icon-arrow-down"
+                icon="el-icon-top-left"
                 v-if="chehui(r.row)"
                 @click="chhuile(r.row)"
                 v-hasPermi="['system:user:remove']"
@@ -465,7 +473,7 @@ export default {
         .confirm("撤回计划会清除本周期所有任务!", "提示")
         .then(() => {
           // 用户点击了确认按钮
-          console.log("执行操作...");
+          // console.log("执行操作...");
           this.loading = true;
           api.cheHui(row.id).then((response) => {
             this.getList();
@@ -474,7 +482,7 @@ export default {
         })
         .catch(() => {
           // 用户点击了取消按钮
-          console.log("取消操作...");
+          // console.log("取消操作...");
         });
     },
     //已下发的显示撤回

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -34,10 +34,11 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button @click="resetFormHandler('ruleForm')">取消</el-button>
+          
           <el-button type="primary" @click="submitForm('ruleForm')"
             >确定</el-button
           >
+          <el-button @click="resetFormHandler('ruleForm')">取消</el-button>
         </el-form-item>
       </el-form>
     </DialogCom>

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -86,7 +86,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item prop="buildTaskNow" label="立即生效:">
+              <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!id">
                 <el-checkbox v-model="formData.buildTaskNow" size="medium"
                   >勾选后当前周期开始生效</el-checkbox
                 >
@@ -94,10 +94,10 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-button @click="openSelect">新增评价内容</el-button>
+        <el-button @click="openSelect" type="primary" style="margin-bottom: 10px;">新增评价内容</el-button>
 
         <el-table :data="tableData" style="width: 100%" height="400px">
-          <el-table-column label="序号" type="index" width="50">
+          <el-table-column label="序号" type="index" width="100">
           </el-table-column>
           <el-table-column prop="content" label="评价内容"> </el-table-column>
           <el-table-column prop="code" label="编号"> </el-table-column>
@@ -116,8 +116,8 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="onHide">取消</el-button>
       </div>
     </DialogCom>
     <DialogSelect

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"
+              
+            >
+              <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"
@@ -119,7 +126,7 @@
             <el-table-column
               label="序号"
               type="index"
-              width="50"
+              width="100"
             ></el-table-column>
             <el-table-column label="创建机构" prop="orgName" />
             <el-table-column label="外包评价名称" prop="evaluateName" />
@@ -155,20 +162,20 @@
                   size="mini"
                   @click="publishHandler(row)"
                   type="text"
-                  icon="el-icon-plus"
-                  >{{row.isDistribute=='0'? '':'取消'}}发布</el-button
+                  class="el-icon-arrow-down"
+                  >{{ 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/editPlanEvaluate.vue

@@ -144,10 +144,11 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">关闭</el-button>
+        
         <el-button type="primary" @click="onSubmit" v-if="isEvaluate == '0'"
           >确定</el-button
         >
+        <el-button @click="onHide">取消</el-button>
       </div>
     </DialogCom>
   </div>

src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -1,74 +1,83 @@
 <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 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"
+                  />
+                </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 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"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
                 >
-                </el-date-picker>
               </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>
+          </div>
+
+          <!--用户数据-->
 
           <el-table
             border
@@ -83,7 +92,7 @@
             <el-table-column
               label="序号"
               type="index"
-              width="50"
+              width="100"
             ></el-table-column>
             <el-table-column label="评价机构" prop="orgName" />
             <el-table-column label="评价角色" prop="roleName" />
@@ -105,7 +114,6 @@
               class-name="small-padding fixed-width"
             >
               <template slot-scope="{ row }">
-               
                 <el-button
                   size="mini"
                   v-if="isEvaluateHandler(row)"
@@ -114,11 +122,15 @@
                   icon="el-icon-plus"
                   >评价</el-button
                 >
+                <span
+                  v-else
+                  style="display: inline-block; width: 70px; height: 20px"
+                ></span>
                 <el-button
                   size="mini"
                   @click="editHandler(row)"
                   type="text"
-                  icon="el-icon-plus"
+                  class="el-icon-info"
                   >详情</el-button
                 >
               </template>
@@ -132,9 +144,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>
@@ -158,9 +171,9 @@ export default {
       queryParams: {
         orgId: null,
         checkSub: true,
-        status: '',
+        status: "",
         dataTime: [],
-        evaluateName:'',
+        evaluateName: "",
         pageNum: 1,
         pageSize: 10,
       },
@@ -173,7 +186,7 @@ export default {
   created() {},
   mounted() {},
   computed: {
-    ...mapGetters(["orgId",'roleList']),
+    ...mapGetters(["orgId", "roleList"]),
   },
   methods: {
     statusChange(row) {
@@ -211,24 +224,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/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"
@@ -74,7 +64,7 @@
           <el-table-column
             label="序号"
             type="index"
-            width="50"
+            width="100"
           ></el-table-column>
           <el-table-column
             label="年月"
@@ -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-column label="序号" type="index" width="50">
-          </el-table-column>
-          <el-table-column prop="orgName" label="营业场所">
+        <el-table v-loading="loading" :data="tableData" style="width: 100%" height="400px">
+          <el-table-column label="序号" type="index" width="100">
           </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"
@@ -46,32 +43,26 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="onHide">取消</el-button>
         <!-- <el-button type="primary" @click="onSubmit">确定</el-button> -->
+        <el-button @click="onHide">取消</el-button>
       </div>
     </DialogCom>
   </div>
 </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
       });
     },
     // 事件

src/views/system/dept/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10">
-       <!--机构数据-->
-       <el-col :span="4" :xs="24">
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
         <org-tree
           v-model="queryParams.orgId"
           @defaultKey="defaultKeys"
@@ -67,7 +67,21 @@
                    />
                  </el-select>
                </el-form-item>
-               <el-form-item>
+<!--               <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">
+               <el-col :span="1.5">
                  <el-button
                    type="primary"
                    icon="el-icon-search"
@@ -75,12 +89,16 @@
                    @click="handleQuery"
                  >搜索</el-button
                  >
-                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+               </el-col>
+               <el-col :span="1.5">
+                 <el-button
+                   type="primary"
+                   icon="el-icon-refresh"
+                   size="mini"
+                   @click="resetQuery"
                  >重置</el-button
                  >
-               </el-form-item>
-             </el-form>
-             <el-row :gutter="10">
+               </el-col>
                <el-col :span="1.5">
                  <el-button
                    type="primary"
@@ -126,31 +144,32 @@
              </el-table-column>
              <el-table-column  prop="code" align="center" label="机构编码"></el-table-column>
 
-             <el-table-column prop="isLock" align="center" label="机构状态">
-               <template v-slot="scope">
-                 <dict-tag
-                   :options="dict.type.sys_normal_disable"
-                   :value="scope.row.isLock"
-                 />
-               </template>
-             </el-table-column>
+            <el-table-column prop="isLock" align="center" label="机构状态">
+              <template v-slot="scope">
+                <dict-tag
+                  :options="dict.type.sys_normal_disable"
+                  :value="scope.row.isLock"
+                />
+              </template>
+            </el-table-column>
 
-             <el-table-column
-               align="center"
-               prop="sort"
-               label="排序"
-             ></el-table-column>
-             <el-table-column v-if="false"
-                              align="center"
-                              prop="weatherCityCode"
-                              label="城市天气区域"
-             >
-               <template slot-scope="r">
-                 <span>{{ getCode(r.row.weatherCityCode) }}</span>
-               </template>
-             </el-table-column>
-             <!-- <el-table-column prop="address" label="地址"></el-table-column> -->
-             <!-- <el-table-column label="负责人" align="center">
+            <el-table-column
+              align="center"
+              prop="sort"
+              label="排序"
+            ></el-table-column>
+            <el-table-column
+              v-if="false"
+              align="center"
+              prop="weatherCityCode"
+              label="城市天气区域"
+            >
+              <template slot-scope="r">
+                <span>{{ getCode(r.row.weatherCityCode) }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column prop="address" label="地址"></el-table-column> -->
+            <!-- <el-table-column label="负责人" align="center">
              <template v-slot:default="scope">
                <span v-text="scope.row.manager"></span>-
                <span v-text="scope.row.managerPhone"> </span>
@@ -169,7 +188,7 @@
              <el-table-column
                label="操作"
                align="left"
-               width="220"
+               width="280"
                class-name="small-padding fixed-width"
              >
                <template slot-scope="scope">
@@ -177,8 +196,8 @@
                    :to="'/system/dept-extend/extend/' + scope.row.id"
                    class="link-type"
                  > -->
-                 <el-button
-                   v-if="
+                <el-button
+                  v-if="
                     scope.row.type == 4 ||
                     scope.row.type == 10 ||
                     scope.row.type == 5
@@ -190,7 +209,7 @@
                    @click="handleReplenish(scope.row.id)"
                  >补充信息</el-button
                  >
-                 <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
+                 <span v-else style="display: inline-block;width: 85px;height: 20px;"></span>
                  <!-- </router-link> -->
                  <el-divider direction="vertical"></el-divider>
                  <el-button
@@ -214,7 +233,6 @@
              </el-table-column>
            </el-table>
            <pagination
-             v-show="total > 0"
              :total="total"
              :page.sync="queryParams.pageNum"
              :limit.sync="queryParams.pageSize"
@@ -292,8 +310,8 @@
                   v-show="
                     addIndex == 2 ||
                     (addIndex == 3 && dict.value == 5) ||
-                    (addIndex == 3 && dict.value == 10)||
-                    (addIndex == 3 && dict.value == 6)||
+                    (addIndex == 3 && dict.value == 10) ||
+                    (addIndex == 3 && dict.value == 6) ||
                     (addIndex == 3 && dict.value == 7)
                   "
                 />
@@ -325,7 +343,7 @@
 
         <el-row>
           <el-col :span="12" v-if="false">
-            <el-form-item label="负责人电话" prop="managerPhone" >
+            <el-form-item label="负责人电话" prop="managerPhone">
               <el-input
                 v-model="form.managerPhone"
                 placeholder="请输入负责人电话"
@@ -334,7 +352,6 @@
               />
             </el-form-item>
           </el-col>
-
         </el-row>
 
         <el-row>
@@ -369,7 +386,10 @@
           @click="changeSubmitForm"
           >确 定</el-button
         >
-        <el-button v-if="title == '新增机构信息'" type="primary" @click="addSubmitForm"
+        <el-button
+          v-if="title == '新增机构信息'"
+          type="primary"
+          @click="addSubmitForm"
           >确 定</el-button
         >
         <el-button @click="cancel">取 消</el-button>

src/views/system/device/index.vue

@@ -171,7 +171,6 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="total > 0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"

src/views/system/user/index.vue

@@ -194,6 +194,7 @@
               prop="username"
               width="120"
               v-if="columns[0].visible"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
               label="姓名"
@@ -255,7 +256,7 @@
                 />
               </template>
             </el-table-column>
-            
+
             <el-table-column
               label="登录IP"
               align="center"
@@ -363,7 +364,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination            
+          <pagination
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -653,7 +654,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         username: null,
         phone: null,
         status: null,