调阅计划

src/api/system/plan.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询列表监控调阅计划
+export function listPlan(query) {
+  return request({
+    url: '/system/plan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细监控调阅计划
+export function getPlan(id) {
+  return request({
+    url: '/system/plan/' + id,
+    method: 'get'
+  })
+}
+
+// 新增监控调阅计划
+export function addPlan(data) {
+  return request({
+    url: '/system/plan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改监控调阅计划
+export function updatePlan(data) {
+  return request({
+    url: '/system/plan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除监控调阅计划
+export function delPlan(id) {
+  return request({
+    url: '/system/plan/' + id,
+    method: 'delete'
+  })
+}

src/views/system/check/index.vue

@@ -4,11 +4,16 @@
       <el-form-item label="采集点名称" prop="checkName">
         <el-input v-model="queryParams.checkName" placeholder="请输入采集点名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="区域id" prop="areaId">
-        <el-input v-model="queryParams.areaId" placeholder="请输入区域id" clearable @keyup.enter.native="handleQuery" />
+
+      <el-form-item label="区域" prop="areaId">
+        <el-select v-model="queryParams.areaId" placeholder="请选择">
+          <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="机构id" prop="orgId">
-        <el-input v-model="queryParams.orgId" placeholder="请输入机构id" clearable @keyup.enter.native="handleQuery" />
+
+      <el-form-item label="归属部门" prop="orgId">
+        <treeselect style="width: 160px;" v-model="queryParams.orgId" :options="deptOptions" :show-count="true"
+          :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
       </el-form-item>
 
       <el-form-item>
@@ -99,6 +104,7 @@ import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/syst
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
+import { listArea } from "@/api/system/area";
 export default {
   name: "Check",
 
@@ -124,6 +130,8 @@ export default {
       deptOptions: null,
       // 总条数
       total: 0,
+      //区域集合
+      areaList: [],
       // 区域采集点表格数据
       checkList: [],
       // 弹出层标题
@@ -144,12 +152,15 @@ export default {
       // 表单校验
       rules: {
       },
-      defaultKeys:[]
+      defaultKeys: []
     };
   },
   created() {
     this.getList();
     this.getDeptTree();
+    listArea().then(response => {
+      this.areaList = response.rows;
+    })
   },
   methods: {
     /** 查询区域采集点列表 */
@@ -166,8 +177,8 @@ export default {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
         console.log(this.deptOptions, ' this.deptOptions')
-        this.defaultKeys.push(response.data[0].id);
-        this.queryParams.orgId = response.data[0].id;
+        // this.defaultKeys.push(response.data[0].id);
+        // this.queryParams.orgId = response.data[0].id;
         this.handleQuery();
       });
     },

src/views/system/plan/index.vue

@@ -0,0 +1,296 @@
+<template>
+  <div class="app-container">
+    <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="请选择">
+          <el-option v-for="dict in dict.type.org_type_number" :key="dict.value" :label="dict.label"
+            :value="`${dict.value}`"></el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="调阅角色" prop="roleId">
+        <el-select v-model="queryParams.hostId" placeholder="请选择">
+          <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="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>
+        </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.sys_normal_disable" :key="dict.value" :label="dict.label"
+            :value="`${dict.value}`"></el-option>
+        </el-select>
+      </el-form-item>
+    
+      <el-form-item label="计划名称" prop="planName">
+        <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
+      </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" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:plan:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:plan:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:plan:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['system:plan:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="计划所属机构" align="center" prop="orgName" />
+      <el-table-column label="计划名称" align="center" prop="planName" />
+      <el-table-column label="机构类型" align="center" prop="orgType" />
+      <el-table-column label="调阅角色" align="center" prop="roleName" />
+      <el-table-column label="调阅周期" align="center" prop="planCycle" />
+      <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.sys_normal_disable" :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">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:plan:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:plan:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改监控调阅计划对话框 -->
+    <el-dialog :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="请输入计划名称" />
+        </el-form-item>
+       
+        <el-form-item label="调阅机构类型" prop="orgType">
+        <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择">
+          <el-option v-for="dict in dict.type.org_type_number" :key="dict.value" :label="dict.label"
+            :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>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="调阅角色" prop="roleId">
+        <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择">
+          <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 v-model="form.planFrequency" placeholder="请输入调阅频次" />
+        </el-form-item>
+        <el-form-item label="备注" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/system/plan";
+import { listRole } from "@/api/system/role";
+export default {
+  name: "Plan",
+  dicts: ['org_type_number','sys_access_cycle','sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      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
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+    listRole().then(response => {
+      this.roleList = response.rows;
+    });
+
+  },
+  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: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        description: null,
+        isDeleted: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      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;
+        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;
+      this.$modal.confirm('是否确认删除监控调阅计划编号为"' + ids + '"的数据项？').then(function () {
+        return delPlan(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/plan/export', {
+        ...this.queryParams
+      }, `plan_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/system/user/index.vue

@@ -81,16 +81,7 @@
           <el-table-column label="所属机构" align="center" key="orgName" prop="orgName" v-if="columns[3].visible"
             :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible" width="120" />
-          <!-- <el-table-column label="状态" align="center" key="isLock" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.isLock"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column> -->
+  
           <el-table-column label="状态" align="center" key="isLock" prop="isLock" v-if="columns[5].visible" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isLock" />