Przeglądaj źródła

修改前端界面

gaoxiong 2 lat temu
rodzic
commit
2a0a283d42

+ 1 - 1
package.json

@@ -40,7 +40,7 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "3.25.3",
+    "core.js": "^0.4.2",
     "dayjs": "^1.11.9",
     "echarts": "5.4.0",
     "element-ui": "2.15.12",

+ 315 - 297
src/views/core/accessPlan/index.vue

@@ -5,17 +5,18 @@
       <el-col :span="4" :xs="24">
 
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-          @click="clickTreeNode" hangsheTree></org-tree>
+                  @click="clickTreeNode" hangsheTree></org-tree>
       </el-col>
       <!--搜索栏-->
 
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
 
           <el-form-item label="机构类型" prop="orgType">
             <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择" @change="changeSelect">
               <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
-                :value="`${dict.value}`"></el-option>
+                         :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
 
@@ -29,23 +30,25 @@
           <el-form-item label="调阅周期" prop="planCycle">
             <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择">
               <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
-                :value="`${dict.value}`"></el-option>
+                         :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="计划状态" prop="planStatus">
             <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择">
               <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
-                :value="`${dict.value}`"></el-option>
+                         :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="计划名称" prop="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
-              @keyup.enter.native="handleQuery" />
+                      @keyup.enter.native="handleQuery"/>
           </el-form-item>
 
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" v-hasPermi="['core:accessPlan:list']">搜索</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                       v-hasPermi="['core:accessPlan:list']">搜索
+            </el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
@@ -53,52 +56,60 @@
         <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="['core:accessPlan:add']">新增计划</el-button>
+                       v-hasPermi="['core:accessPlan:add']">新增
+            </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="planList" row-key="id" :tree-props="{ children: 'children' }">
+        <el-table border
+                  height="650"
+                  size="small"
+                  v-loading="loading" :data="planList" row-key="id" :tree-props="{ children: 'children' }">
+          <el-table-column prop="index" label="序号" width="80"></el-table-column>
+          <el-table-column width="140" label="所属机构" align="center" prop="orgName"/>
+          <el-table-column width="140" label="计划名称" align="center" prop="planName"/>
 
-          <el-table-column label="计划所属机构" align="center" prop="orgName" />
-          <el-table-column label="计划名称" align="center" prop="planName" />
-
-          <el-table-column label="调阅机构类型" align="center" key="orgType" prop="orgType">
+          <el-table-column label="机构类型" align="center" key="orgType" prop="orgType">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
+              <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType"/>
             </template>
           </el-table-column>
-          <el-table-column label="调阅角色" align="center" prop="roleName" />
+          <el-table-column label="调阅角色" align="center" prop="roleName"/>
 
           <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle" width="80">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.planCycle" />
+              <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.planCycle"/>
             </template>
           </el-table-column>
-          <el-table-column label="调阅频次" align="center" prop="planFrequency" />
+          <el-table-column label="调阅频次" align="center" prop="planFrequency"/>
 
           <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus" width="80">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus" />
+              <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus"/>
             </template>
           </el-table-column>
-          <el-table-column label="修改人" align="center" prop="updateBy" />
-          <el-table-column label="修改时间" align="center" prop="updateTime" />
-          <el-table-column label="备注" align="center" prop="description" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <!--<el-table-column label="修改人" align="center" prop="updateBy" />
+          <el-table-column label="修改时间" align="center" prop="updateTime" />-->
+          <el-table-column label="备注" align="center" prop="description"/>
+          <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">修改</el-button>
-              <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0" icon="el-icon-add"
-                @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发</el-button>
+                         v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
+              </el-button>
+              <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0" icon="el-icon-arrow-down"
+                         @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
+              </el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['core:accessPlan:remove']">删除</el-button>
+                         v-hasPermi="['core:accessPlan:remove']">删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-             @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/>
       </el-col>
 
     </el-row>
@@ -107,51 +118,50 @@
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="计划名称" prop="planName">
-          <el-input v-model="form.planName" placeholder="请输入计划名称" maxlength="50" />
+          <el-input v-model="form.planName" placeholder="请输入计划名称" maxlength="50"/>
         </el-form-item>
 
-        <el-form-item label="调阅机构类型" prop="orgType">
+        <el-form-item label="机构类型" prop="orgType">
           <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择" @change="changeSelect">
             <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
-              :value="`${dict.value}`"></el-option>
+                       :value="`${dict.value}`"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="调阅周期" prop="planCycle">
           <el-select style="width: 100%;" v-model="form.planCycle" placeholder="请选择">
             <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
-              :value="`${dict.value}`"></el-option>
+                       :value="`${dict.value}`"></el-option>
           </el-select>
         </el-form-item>
-
-
-        <el-form-item label="计划状态" prop="planStatus">
-          <el-radio-group v-model="form.planStatus">
-            <el-radio v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value">{{ dict.label
-            }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
-          <el-date-picker v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
-            align="right" type="date" placeholder="选择开始日期">
+          <el-date-picker style="width: 100%;" v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
+                          align="right" type="date" placeholder="选择开始日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item prop="endTime" v-if="form.planCycle == 0" label="结束日期">
-          <el-date-picker v-model="form.endTime"  :picker-options="endDatepickerOptions" align="right" type="date"
-            placeholder="选择结束日期">
+          <el-date-picker style="width: 100%;" v-model="form.endTime" :picker-options="endDatepickerOptions" align="right" type="date"
+                          placeholder="选择结束日期">
           </el-date-picker>
         </el-form-item>
 
-
         <el-form-item label="调阅角色" prop="roleId">
           <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择" @change="changeSelectOrgType">
             <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="调阅频次" prop="planFrequency">
-          <el-input type="number" oninput="if(value<=0)value=null;value=parseInt(value)" v-model.number="form.planFrequency" placeholder="请输入调阅频次" />
+          <el-input type="number" oninput="if(value<=0)value=null;value=parseInt(value)"
+                    v-model.number="form.planFrequency" placeholder="请输入调阅频次"/>
+        </el-form-item>
+        <el-form-item label="计划状态" prop="planStatus">
+          <el-radio-group v-model="form.planStatus">
+            <el-radio v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value">{{ dict.label
+              }}
+            </el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -163,267 +173,275 @@
 </template>
 
 <script>
-import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType, getRole, allRole } from "@/api/system/role";
-import tableList from "@/mixins/tableList";
-import orgTree from "@/components/orgTree";
-import { deptTreeSelect } from "@/api/system/public";
-import KFileUpload from "@/components/K-FileUpload/index.vue";
+  import {listPlan, getPlan, delPlan, addPlan, updatePlan, distribute} from "@/api/core/accessPlan";
+  import {listRole, findRoleByType, getRole, allRole} from "@/api/system/role";
+  import tableList from "@/mixins/tableList";
+  import orgTree from "@/components/orgTree";
+  import {deptTreeSelect} from "@/api/system/public";
+  import KFileUpload from "@/components/K-FileUpload/index.vue";
 
-export default {
-  name: "Plan",
-  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status'],
-  components: {
-    orgTree
-  },
-  data() {
-    return {
-      startDatepickerOptions: {
-        disabledDate(time) {
-          const date = new Date();
-          date.setTime(date.getTime() - 3600 * 1000 * 24);
-          return time.getTime() < date;
+  export default {
+    name: "Plan",
+    dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable', 'plan_status'],
+    components: {
+      orgTree
+    },
+    data() {
+      return {
+        startDatepickerOptions: {
+          disabledDate(time) {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            return time.getTime() < date;
+          },
         },
-      },
-      endDatepickerOptions: {
-        disabledDate:this.disabledDate
-      },
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      names: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 监控调阅计划表格数据
-      planList: [],
-      //角色列表
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        planName: null,
-        orgId: null,
-        orgPath: null,
-        orgName: null,
-        orgType: null,
-        roleId: null,
-        planCycle: null,
-        planFrequency: null,
-        planStatus: null,
-        description: null,
-        isDeleted: null,
-        isDistribute: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        planName: [
-          { required: true, message: '请输入计划名称', trigger: 'change' },
-        ],
-        orgType: [
-          { required: true, message: '请选择机构类型', trigger: 'change' },
-        ],
-        planCycle: [
-          { required: true, message: '请选择调阅周期', trigger: 'change' },
-        ],
-        roleId: [
-          { required: true, message: '请选择调阅角色', trigger: 'change' },
-        ],
-        planFrequency: [
-          { required: true, message: '请选择调阅频次', trigger: 'change' },
-        ],
-      }
+        endDatepickerOptions: {
+          disabledDate: this.disabledDate
+        },
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        names: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 监控调阅计划表格数据
+        planList: [],
+        //角色列表
+        roleList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          planName: null,
+          orgId: null,
+          orgPath: null,
+          orgName: null,
+          orgType: null,
+          roleId: null,
+          planCycle: null,
+          planFrequency: null,
+          planStatus: null,
+          description: null,
+          isDeleted: null,
+          isDistribute: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          planName: [
+            {required: true, message: '请输入计划名称', trigger: 'change'},
+          ],
+          orgType: [
+            {required: true, message: '请选择机构类型', trigger: 'change'},
+          ],
+          planCycle: [
+            {required: true, message: '请选择调阅周期', trigger: 'change'},
+          ],
+          roleId: [
+            {required: true, message: '请选择调阅角色', trigger: 'change'},
+          ],
+          planFrequency: [
+            {required: true, message: '请选择调阅频次', trigger: 'change'},
+          ],
+        }
 
-    };
-  },
-  created() {
-    // this.getList();
-    // listRole().then(response => {
-    //   this.roleList = response.rows;
-    // });
-    allRole().then(response => {
-      this.roleList = response.data;
-    });
-  },
-  methods: {
-    /** 查询监控调阅计划列表 */
-    getList() {
-      this.loading = true;
-      listPlan(this.queryParams).then(response => {
-        this.planList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        planName: null,
-        orgId: null,
-        orgPath: null,
-        orgName: null,
-        orgType: null,
-        roleId: null,
-        planCycle: null,
-        planFrequency: null,
-        planStatus: "0",
-        createTime: null,
-        createBy: null,
-        updateTime: null,
-        updateBy: null,
-        description: null,
-        isDeleted: null
       };
-      this.resetForm("form");
     },
-    getDefaultKey(key) {
-      this.queryParams.orgId = key;
-      this.getList();
-    },
-    //单选框状态改变
-    checkChange(state) {
-      this.queryParams.checkSub = state;
-      this.handleQuery();
-    },
-    startDateChanged(time) {
-  
-      if (this.form.startTime > this.form.endTime) {
-        this.form.endTime = this.form.startTime;
-      }
+    created() {
+      // this.getList();
+      // listRole().then(response => {
+      //   this.roleList = response.rows;
+      // });
+      allRole().then(response => {
+        this.roleList = response.data;
+      });
     },
-    disabledDate(time) {
-      //小于开始日期禁止选择
-      let startTime = new Date();
-      startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
-      if (this.form.startTime) {
-        
-        startTime = new Date(this.formatTime(this.form.startTime, 'YYYY-MM-DD'));
+    methods: {
+      getPageIndex($index) {
+        //表格序号
+        return (
+          (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+        );
+      },
+      /** 查询监控调阅计划列表 */
+      getList() {
+        this.loading = true;
+        listPlan(this.queryParams).then(response => {
+          this.planList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          planName: null,
+          orgId: null,
+          orgPath: null,
+          orgName: null,
+          orgType: null,
+          roleId: null,
+          planCycle: null,
+          planFrequency: null,
+          planStatus: "0",
+          createTime: null,
+          createBy: null,
+          updateTime: null,
+          updateBy: null,
+          description: null,
+          isDeleted: null
+        };
+        this.resetForm("form");
+      },
+      getDefaultKey(key) {
+        this.queryParams.orgId = key;
+        this.getList();
+      },
+      //单选框状态改变
+      checkChange(state) {
+        this.queryParams.checkSub = state;
+        this.handleQuery();
+      },
+      startDateChanged(time) {
+
+        if (this.form.startTime > this.form.endTime) {
+          this.form.endTime = this.form.startTime;
+        }
+      },
+      disabledDate(time) {
+        //小于开始日期禁止选择
+        let startTime = new Date();
         startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
-      }
-      return time.getTime() < new Date(startTime).getTime()
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    // 节点单击事件
-    clickTreeNode(data) {
-      //this.initPlanRoleList();
-      this.queryParams.orgId = data.id;
-      this.handleQuery();
-    },
-    changeSelectOrgType(val) {
-      getRole(val).then(response => {
-        this.form.orgType = response.data.orgType;
-      })
-    },
-    changeSelect(val) {
-      findRoleByType(val).then(response => {
-        this.roleList = response;
-      })
-    },
-    /** 查询机构树数据 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
+        if (this.form.startTime) {
 
+          startTime = new Date(this.formatTime(this.form.startTime, 'YYYY-MM-DD'));
+          startTime.setTime(startTime.getTime() - 3600 * 1000 * 24);
+        }
+        return time.getTime() < new Date(startTime).getTime()
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      // 节点单击事件
+      clickTreeNode(data) {
+        //this.initPlanRoleList();
+        this.queryParams.orgId = data.id;
         this.handleQuery();
-      });
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.names = selection.map(item => item.planName)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加监控调阅计划";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getPlan(id).then(response => {
-        this.form = response.data;
+      },
+      changeSelectOrgType(val) {
+        getRole(val).then(response => {
+          this.form.orgType = response.data.orgType;
+        })
+      },
+      changeSelect(val) {
+        findRoleByType(val).then(response => {
+          this.roleList = response;
+        })
+      },
+      /** 查询机构树数据 */
+      getDeptTree() {
+        deptTreeSelect().then(response => {
+          this.deptOptions = response.data;
+
+          this.handleQuery();
+        });
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.names = selection.map(item => item.planName)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
         this.open = true;
-        this.title = "修改监控调阅计划";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updatePlan(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addPlan(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        this.title = "添加监控调阅计划";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getPlan(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改监控调阅计划";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updatePlan(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addPlan(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      const names = row.planName || this.names;
-      this.$modal.confirm('是否确认删除监控调阅计划"' + names + '"的数据项?').then(function () {
-        return delPlan(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    handDistribute(row) {
-      this.$modal.confirm('是否确认下发监控调阅计划"' + row.planName + '"的数据项?').then(function () {
-        return distribute(row.id);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("下发成功");
-      }).catch(() => { });
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        const names = row.planName || this.names;
+        this.$modal.confirm('是否确认删除监控调阅计划"' + names + '"的数据项?').then(function () {
+          return delPlan(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {
+        });
+      },
+      handDistribute(row) {
+        this.$modal.confirm('是否确认下发监控调阅计划"' + row.planName + '"的数据项?').then(function () {
+          return distribute(row.id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("下发成功");
+        }).catch(() => {
+        });
 
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/plan/export', {
-        ...this.queryParams
-      }, `plan_${new Date().getTime()}.xlsx`)
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('system/plan/export', {
+          ...this.queryParams
+        }, `plan_${new Date().getTime()}.xlsx`)
+      }
     }
-  }
-};
+  };
 </script>

+ 1 - 1
src/views/core/task/index.vue

@@ -123,7 +123,7 @@
       </el-table-column>
       <el-table-column label="调阅人" align="center" prop="retrievalUserName" width="140"/>
       <el-table-column label="异常数" align="center" prop="exceptionCount" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" fixed="right" style="width: 100px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 15 - 7
src/views/resumption/plan/index.vue

@@ -148,7 +148,7 @@
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
               >删除</el-button
-            > 
+            >
           </el-col>-->
 
           <right-toolbar
@@ -159,6 +159,9 @@
         </el-row>
 
         <el-table
+          border
+          height="650"
+          size="small"
           v-loading="loading"
           :data="pageData"
           @selection-change="handleSelectionChange"
@@ -166,19 +169,22 @@
           :tree-props="{ children: 'children' }"
         >
           <el-table-column
+            fixed
             prop="index"
             label="序号"
-            width="80px"
-            v-if="columns[0].visible"            
+            width="80"
+            v-if="columns[0].visible"
           ></el-table-column>
           <el-table-column
             prop="planName"
             label="计划名称"
+            width="120"
             v-if="columns[1].visible"
           ></el-table-column>
           <el-table-column
             prop="planType"
             label="计划类型"
+            width="120"
             v-if="columns[2].visible"
           >
             <template slot-scope="r"
@@ -190,6 +196,7 @@
           <el-table-column
             prop="planCreateOrgName"
             label="计划创建机构"
+            width="120"
             v-if="columns[3].visible"
           >
             <!-- <template slot-scope="r"
@@ -199,6 +206,7 @@
           <el-table-column
             prop="planOfOrgName"
             label="计划所属机构"
+            width="120"
             v-if="columns[4].visible"
           ></el-table-column>
 
@@ -272,7 +280,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作">
+          <el-table-column fixed="right"  width="120" label="操作">
             <template slot-scope="r">
               <el-button
                 size="mini"
@@ -280,7 +288,7 @@
                 icon="el-icon-edit"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['system:user:edit']"
-                >修改</el-button
+                >编辑</el-button
               >
               <el-button
                 size="mini"
@@ -411,7 +419,7 @@ export default {
         })
     },
     async getRolesByOrg() {
-  
+
       await allRole().then((res) => {
         // console.info(res);
         this.resumptionRoles = res.data;
@@ -423,7 +431,7 @@ export default {
       if(this.queryParams.resumptionRole!=null&&this.queryParams.resumptionRole!=''){
         this.queryParams.roleList.push(this.queryParams.resumptionRole);
       }
-      
+
       console.info(this.dict.type);
       api
         .list(this.queryParams)

+ 6 - 3
src/views/resumption/rule/dialog.edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rule-type">
     <DialogCom
-      :title="id ? '编辑履职内容库定义' : '新增履职内容库定义'"
+      :title="id ? '编辑' : '新增'"
       :visible.sync="isShow"
       @close="onHide"
       width="500px"
@@ -28,6 +28,7 @@
           <el-form-item prop="type" label="履职类型:">
             <el-select
               label="履职类型"
+              style="width: 100%"
               v-model="formData.type"
               placeholder="请选择履职类型"
               clearable
@@ -44,6 +45,7 @@
 
           <el-form-item prop="orgType" label="履职机构类型:">
             <el-select
+              style="width: 100%"
               prop="orgType"
               label="履职机构类型"
               v-model="formData.orgType"
@@ -62,6 +64,7 @@
 
           <el-form-item prop="status" label="状态:">
             <el-select
+              style="width: 100%"
               prop="status"
               label="状态"
               v-model="formData.status"
@@ -146,9 +149,9 @@ export default {
     },
 
     // 事件
-    onHide() {   
+    onHide() {
       this.formData=this.reset();
-      this.$refs.form.resetFields(); 
+      this.$refs.form.resetFields();
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {

+ 1 - 1
src/views/resumption/rule/index.vue

@@ -157,7 +157,7 @@
                 icon="el-icon-edit"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['resumption:rule:edit']"
-                >修改</el-button
+                >编辑</el-button
               >
               <el-popconfirm
                 title="确定删除履职内容库定义?"

+ 15 - 10
src/views/resumption/ruleManager/dialog.editItem.vue

@@ -13,17 +13,22 @@
             ref="form"
             :model="formData"
             :rules="formDataRules"
-            label-width="110px"
+            label-width="100px"
           >
-            <el-form-item prop="name" label="履职项">
-              <el-input
-                v-model="formData.name"
-                :maxlength="50"
-                name="name"
-                placeholder="请输入履职项"
-                clearable
-              />
-            </el-form-item>
+            <el-row>
+              <el-col span="20">
+                <el-form-item  prop="name" label="履职项">
+                  <el-input
+                    v-model="formData.name"
+                    :maxlength="50"
+                    name="name"
+                    placeholder="请输入履职项"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
           </el-form>
         </div>
         <div class="box">

+ 2 - 0
src/views/resumption/ruleManager/dialog.editPoint.vue

@@ -38,6 +38,7 @@
           </el-form-item>
           <el-form-item label="履职区域" prop="areaId">
             <el-select
+              style="width: 100%;"
               v-model="formData.areaId"
               placeholder="请选择履职区域"
               @change="onAreaChanged"
@@ -53,6 +54,7 @@
           </el-form-item>
           <el-form-item label="数据来源" prop="businessType">
             <el-select
+              style="width: 100%;"
               v-model="formData.businessType"
               placeholder="请选择数据来源"
               clearable

+ 2 - 1
src/views/resumption/ruleManager/index.vue

@@ -77,6 +77,7 @@
             <el-button
               type="warning"
               @click="dakai"
+              size="mini"
               :disabled="rule ? false : true"
               >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
             >
@@ -103,7 +104,7 @@
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
               >删除</el-button
-            > 
+            >
           </el-col>-->
 
           <right-toolbar

+ 58 - 51
src/views/resumption/taskManager/index.vue

@@ -280,64 +280,87 @@
             :columns="columns"
           ></right-toolbar>
         </el-row>
-        <el-table v-loading="loading" :data="pageData">
+        <el-table
+          border
+          height="650"
+          size="small"
+          v-loading="loading" :data="pageData">
           <el-table-column
-            type="index"
-            min-width="4%"
-            label="序号"
-            v-if="columns[0].visible"
-          >
-          </el-table-column>
+          type="index"
+          fixed
+          min-width="50"
+          label="序号"
+          v-if="columns[0].visible"
+        >
+        </el-table-column>
           <el-table-column
             prop="name"
-            label="任务名称"
-            min-width="20%"
+            label="履职任务"
+            min-width="120"
             v-if="columns[1].visible"
           >
           </el-table-column>
           <el-table-column
+            prop="orgName"
+            label="履职机构"
+            min-width="120"
+            v-if="columns[5].visible"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="roleName"
+            label="履职角色"
+            min-width="120"
+            v-if="columns[6].visible"
+            >
+          </el-table-column>
+          <el-table-column
+            prop="status"
+            label="任务状态"
+            width="100px"
+            v-if="columns[10].visible"
+          >
+            <template slot-scope="r">
+              <span>
+                <i class="circle" :style="statusColor(r.row.status, true)" />
+                <label :style="statusColor(r.row.status, false)">
+                  {{
+                    getLabel(dict.type.resumption_status, r.row.status)
+                  }}</label
+                >
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
             prop="planStartTime"
-            label="任务开始时间"
-            min-width="15%"
+            label="开始时间"
+            min-width="140"
             v-if="columns[2].visible"
           />
           <el-table-column
             prop="planEndTime"
-            label="任务结束时间"
-            min-width="15%"
+            label="结束时间"
+            min-width="140"
             v-if="columns[3].visible"
           />
 
           <el-table-column
             prop="parentOrgName"
             label="上级机构"
-            min-width="15%"
+            min-width="120"
             v-if="columns[4].visible"
           >
           </el-table-column>
-          <el-table-column
-            prop="orgName"
-            label="履职机构"
-            min-width="15%"
-            v-if="columns[5].visible"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="roleName"
-            label="履职角色"
-            min-width="10%"
-            v-if="columns[6].visible"
-          >
-          </el-table-column>
+
           <el-table-column
             prop="submitter"
             label="提交人"
-            min-width="10%"
+            min-width="120"
             v-if="columns[7].visible"
           ></el-table-column>
           <el-table-column
             label="提交时间"
-            min-width="15%"
+            min-width="120"
             v-if="columns[8].visible"
           >
             <template slot-scope="r">{{
@@ -347,28 +370,12 @@
           <el-table-column
             prop="abnormalDataNums"
             label="异常个数"
-            min-width="9%"
+            min-width="80"
             v-if="columns[9].visible"
           >
           </el-table-column>
-          <el-table-column
-            prop="status"
-            label="任务状态"
-            width="100px"
-            v-if="columns[10].visible"
-          >
-            <template slot-scope="r">
-              <span>
-                <i class="circle" :style="statusColor(r.row.status, true)" />
-                <label :style="statusColor(r.row.status, false)">
-                  {{
-                    getLabel(dict.type.resumption_status, r.row.status)
-                  }}</label
-                >
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" min-width="13%">
+
+          <el-table-column label="操作" fixed="right" min-width="120px">
             <template slot-scope="r">
               <!-- <el-button v-if="
                             r.row.status == 'WAIT' &&
@@ -622,7 +629,7 @@ export default {
     ...mapGetters(["orgName"])
   },
   methods: {
-   
+
     getLabel,
     toName(row) {
       // const ymd = row.ymd;
@@ -704,7 +711,7 @@ export default {
       this.loading = true;
       api
         .page(this.queryParams)
-        .then((r) => {          
+        .then((r) => {
           this.isTableHaveData = r.rows.length > 0;
           this.pageData = r.rows;
           this.total = r.total;

+ 7 - 7
src/views/system/menu/index.vue

@@ -88,13 +88,13 @@
         prop="menuName"
         label="菜单名称"
         :show-overflow-tooltip="true"
-        width="160"
+        width="180"
       ></el-table-column>
       <el-table-column
         prop="platformType"
         label="平台类型"
         :show-overflow-tooltip="true"
-        width="160"
+        width="80"
       >
         <template slot-scope="scope">
           <dict-tag
@@ -111,7 +111,7 @@
       <el-table-column prop="icon" v-if="activeName==0" label="图标" align="center" width="100">
         <template slot-scope="scope">
           <img :src="scope.row.icon" alt="">
-         
+
         </template>
       </el-table-column>
       <el-table-column
@@ -137,11 +137,11 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <!-- <template slot-scope="scope">
+      <!--<el-table-column label="创建时间" align="center" prop="createTime">
+        &lt;!&ndash; <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template> -->
-      </el-table-column>
+        </template> &ndash;&gt;
+      </el-table-column>-->
       <el-table-column
         label="操作"
         align="center"