Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/api/system/area.js

@@ -16,6 +16,12 @@ export function getArea(id) {
     method: 'get'
   })
 }
+export function getAreaByOrg(orgId) {
+  return request({
+    url: '/system/area/getAreaByOrg/' + orgId.id,
+    method: 'get'
+  })
+}
 
 // 新增【请填写功能名称】
 export function addArea(data) {

src/views/core/accessPlan/index.vue

@@ -151,7 +151,7 @@
 
 
         <el-form-item label="调阅角色" prop="roleId">
-          <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择">
+          <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>
@@ -172,7 +172,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType } from "@/api/system/role";
+import { listRole, findRoleByType, getRole } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -295,9 +295,12 @@ export default {
       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;
       })

src/views/resumption/plan/index.vue

@@ -397,7 +397,7 @@ export default {
     ...mapMutations([]),
         //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
-      if (row.createOrgType == "1") {
+      if (row.createOrgType == "1"&&row.children.length==0) {
         return true
       }
       return false;

src/views/system/area/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="区域名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入名称"
+          placeholder="请输入区域名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -119,7 +119,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="区域名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称" />
+          <el-input v-model="form.name" placeholder="请输入区域名称" />
         </el-form-item>
 
 

src/views/system/bind/index.vue

@@ -18,8 +18,8 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="区域名称" prop="areaId">
-            <el-input v-model="queryParams.areaId" placeholder="请输入区域" clearable @keyup.enter.native="handleQuery" />
+          <el-form-item label="区域名称" prop="areaName">
+            <el-input v-model="queryParams.areaName" placeholder="请输入区域" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">
@@ -29,7 +29,7 @@
 
           <el-form-item label="状态" prop="enable">
             <el-select v-model="queryParams.enable" placeholder="请选择状态">
-              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+              <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
                 :value=dict.value></el-option>
             </el-select>
           </el-form-item>
@@ -71,7 +71,7 @@
 
           <el-table-column prop="status" label="状态" width="80">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.enable" />
+              <dict-tag :options="dict.type.plan_status" :value="scope.row.enable" />
             </template>
           </el-table-column>
 
@@ -86,13 +86,9 @@
             </template>
           </el-table-column>
         </el-table>
-
-        <pagination v-show="pages.total" :total="pages.total" :page.sync="pages.page" :limit.sync="pages.size"
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
           @pagination="getList" />
-
       </el-col>
-
-
     </el-row>
 
 
@@ -112,14 +108,14 @@
           <el-col :span="30">
             <el-form-item label="机构名称" prop="orgId">
               <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" />
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="20">
-            <el-form-item label="区域名称">
+            <el-form-item label="区域名称" prop="areaId">
               <el-select v-model="form.areaId" placeholder="请选择区域名称" @change="changeSelect">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -129,7 +125,7 @@
 
         <el-row>
           <el-col :span="20">
-            <el-form-item label="采集点名称">
+            <el-form-item label="采集点名称" prop="checkId">
               <el-select v-model="form.checkId" placeholder="请选择采集点名称">
                 <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
               </el-select>
@@ -144,7 +140,7 @@
 
         <el-form-item label="状态" prop="enable">
           <el-select v-model="form.enable" placeholder="请选择状态">
-            <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+            <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
               :value="`${dict.value}`"></el-option>
           </el-select>
         </el-form-item>
@@ -165,19 +161,23 @@ import tableList from '@/mixins/tableList'
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listBind, getBind, delBind, addBind, updateBind } from "@/api/system/bind";
+import{getAreaByOrg} from "@/api/system/area";
 import { deptTreeSelect } from "@/api/system/public";
 import { getCheckByAreaId } from "@/api/system/check";
 export default {
   /** 引入基础minxins*/
   mixins: [tableList],
   components: { treeselect },
-  dicts: ['sys_normal_disable'],
+  dicts: ['sys_normal_disable', 'plan_status'],
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
+       // 总条数
+       total: 0,
+      names: [],
       //搜索tree
       deptName: null,
       // 非单个禁用
@@ -197,6 +197,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        pageNum: 1,
+        pageSize: 10,
         areaId: null,
         enable: null,
         code: null,
@@ -211,6 +213,21 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        areaId: [
+          { required: true, message: '请选择区域', trigger: 'blur' },
+        ],
+        orgId: [
+          { required: true, message: '请选择归属部门', trigger: 'blur' },
+        ],
+        checkId: [
+          { required: true, message: '请选择采集点', trigger: 'blur' }
+        ],
+        code: [
+          { required: true, message: '请输入标签编号', trigger: 'change' }
+        ],
+        enable: [
+          { required: true, message: '请选择状态', trigger: 'blur' }
+        ]
       },
       checkList: [],
       roleOptions: [],
@@ -248,6 +265,13 @@ export default {
       this.queryParams.orgId = data.id;
       this.handleQuery();
     },
+    changeSelectArea(val){
+    
+      getAreaByOrg(val).then(response =>{
+      this.roleOptions  = response.data;
+      })
+    },
+    
     changeSelect(val) {
       getCheckByAreaId(val).then(response => {
         this.form.checkId = null;
@@ -258,7 +282,6 @@ export default {
     getList() {
       this.loading = true;
       listBind(this.queryParams).then(response => {
-        console.log(response, 111)
         this.bindList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -294,7 +317,7 @@ export default {
       this.form = {
         id: null,
         areaId: null,
-        enable: null,
+        enable: "1",
         code: null,
         createTime: null,
         updateId: null,
@@ -321,7 +344,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-
+      this.names = selection.map(item => item.code)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -340,6 +363,8 @@ export default {
         this.form.password = this.initPassword;
       });
     },
+
+
     /** 修改按钮操作 */
     handleUpdate(row) {
 
@@ -378,7 +403,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function () {
+      const names = row.code || this.names;
+      this.$modal.confirm('是否确认删除标签编号为"' + names + '"的数据项？').then(function () {
         return delBind(ids);
       }).then(() => {
         this.getList();

src/views/system/check/index.vue

@@ -4,7 +4,7 @@
       <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="区域" prop="areaId">
+      <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>
@@ -43,8 +43,8 @@
       <el-table-column type="selection" width="55" align="center" />
 
       <el-table-column label="采集点名称" align="center" prop="checkName" />
-      <el-table-column label="区域" align="center" prop="areaName" />
-      <el-table-column label="机构" align="center" prop="orgName" />
+      <el-table-column label="区域名称" align="center" prop="areaName" />
+      <el-table-column label="归属部门" align="center" prop="orgName" />
       <el-table-column label="修改人" align="center" prop="updateBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -64,7 +64,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="16">
-            <el-form-item label="区域名称">
+            <el-form-item label="区域名称" prop="areaId">
               <el-select v-model="form.areaId" placeholder="请选择区域名称">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
@@ -108,6 +108,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      names:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -142,7 +143,17 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
+ 
       rules: {
+        areaId: [
+            { required: true,message: '请选择区域', trigger: 'blur' },
+          ],
+          orgId:[
+            { required: true,message: '请选择归属部门', trigger: 'blur' },
+          ],
+          checkName: [
+            { required: true,message: '请输入采集点名称', trigger: 'change' }
+          ],
       },
       defaultKeys: []
     };
@@ -218,6 +229,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.names=selection.map(item => item.checkName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -237,6 +249,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
+     
       getCheck(id).then(response => {
         this.form = response.data;
         this.roleOptions = response.areas;
@@ -267,7 +280,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除区域采集点编号为"' + ids + '"的数据项？').then(function () {
+      const names=row.checkName || this.names
+      this.$modal.confirm('是否确认删除区域采集点名称为"' + names + '"的数据项？').then(function () {
         return delCheck(ids);
       }).then(() => {
         this.getList();

src/views/system/device/index.vue

@@ -233,15 +233,9 @@ export default {
           { required: true, message: '请选择设备分类', trigger: 'blur' },
 
         ],
-        deviceBrand: [
-          { required: true, message: '请输入设备品牌', trigger: 'change' },
-        ],
-        checkTime: [
-          { required: true, message: '请选择验收日期', trigger: 'change' }
-        ],
-        maintenanceTerm: [
-          { required: true, message: '请输入保修期限', trigger: 'change' }
-        ],
+     
+      
+      
       },
       // 遮罩层
       loading: true,

src/views/system/role/index.vue

@@ -125,7 +125,7 @@
         <el-form-item label="角色顺序" prop="roleSort">
           <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="状态">
+        <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
               {{ dict.label }}
@@ -268,11 +268,14 @@ export default {
         roleName: [
           { required: true, message: "角色名称不能为空", trigger: "blur" }
         ],
-       /*  roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
-        ], */
+        orgType: [
+          { required: true, message: "请选择机构类型", trigger: "blur" }
+        ], 
         roleSort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        ],
+        status:[
+        { required: true, message: "请选择状态", trigger: "blur" }
         ]
       },
     };

src/views/system/user/index.vue

@@ -25,10 +25,10 @@
                 :value="dict.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <!-- <el-form-item label="创建时间">
             <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
               range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          </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>
@@ -73,19 +73,19 @@
         </el-row>
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户名" align="center" key="username" prop="username" v-if="columns[0].visible" />
+          <el-table-column label="用户名称" align="center" key="username" prop="username" v-if="columns[0].visible" />
           <el-table-column label="用户昵称" align="center" key="name" prop="name" v-if="columns[1].visible"
             :show-overflow-tooltip="true" />
 
           <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"  prop="roles" v-if="columns[2].visible"
-            :show-overflow-tooltip="true" >
-            <template slot-scope="scope" >
+          <el-table-column label="用户角色" align="center" prop="roles" v-if="columns[2].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="scope">
               <template v-for="item in scope.row.roles">
-          {{ item.roleName }}
-          <br/>
-        </template> 
+                {{ item.roleName }}
+                <br />
+              </template>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" key="isLock" prop="isLock" v-if="columns[4].visible" width="80">
@@ -93,27 +93,19 @@
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isLock" />
             </template>
           </el-table-column>
-          <el-table-column label="是否管理人员" align="center" key="isManager" prop="isManager" v-if="columns[5].visible" width="120" >
+          <el-table-column label="是否管理人员" align="center" key="isManager" prop="isManager" v-if="columns[5].visible"
+            width="120">
             <template slot-scope="scope">
-              {{ scope.row.isManager>0?"是":"否" }}
+              {{ scope.row.isManager > 0 ? "是" : "否" }}
             </template>
           </el-table-column>
           <el-table-column label="登录IP" align="center" key="lastIp" prop="lastIp" v-if="columns[6].visible" width="120" />
-          <el-table-column label="登录时间" align="center" key="lastTime" prop="lastTime" v-if="columns[7].visible" width="120" />
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column label="登录时间" align="center" key="lastTime" prop="lastTime" v-if="columns[7].visible"
+            width="120" />
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-plus"
-                @click="handleExtend(scope.row)"
-                v-hasPermi="['system:user:extend']"
-              >补充信息</el-button>
+              <el-button size="mini" type="text" icon="el-icon-plus" @click="handleExtend(scope.row)"
+                v-hasPermi="['system:user:extend']">补充信息</el-button>
               <!-- <el-button
                   size="mini"
                   type="text"
@@ -121,26 +113,17 @@
                   v-hasPermi="['system:user:extend']"
                   >补充信息</el-button
                 > -->
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >编辑</el-button>
-              <el-button v-if="!scope.row.source"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']">编辑</el-button>
+              <el-button v-if="!scope.row.source" size="mini" type="text" icon="el-icon-delete"
+                @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole"  v-if="false" icon="el-icon-circle-check"
+                  <el-dropdown-item command="handleAuthRole" v-if="false" icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -158,30 +141,25 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="用户名" prop="username" v-if="!form.source">
+            <el-form-item label="用户名称" prop="username" v-if="!form.source">
               <el-input v-model="form.username" placeholder="请输入用户名" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户昵称" prop="name"  v-if="!form.source">
+            <el-form-item label="用户昵称" prop="name" v-if="!form.source">
               <el-input v-model="form.name" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          
+
           <el-col :span="10">
-            <el-form-item label="所属机构" prop="orgId"  v-if="!form.source">
-              <tree-select
-                v-model="form.orgId"
-                :options="deptOptions"
-                :show-count="true"
-                :normalizer="tenantIdnormalizer"
-                :props="{checkStrictly: true, label:'name'}"
-                placeholder="请选择归属机构" />
+            <el-form-item label="所属机构" prop="orgId" v-if="!form.source">
+              <tree-select v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属机构" />
             </el-form-item>
           </el-col>
-          <el-col :span="10" >
+          <el-col :span="10">
             <el-form-item label="用户角色" prop="roleIds">
               <el-select style="width: 100%;" v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
@@ -192,12 +170,12 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="手机号码" prop="phone"  v-if="!form.source">
+            <el-form-item label="手机号码" prop="phone" v-if="!form.source">
               <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户性别"  v-if="!form.source">
+            <el-form-item label="用户性别" v-if="!form.source">
               <el-select style="width: 100%;" v-model="form.gender" placeholder="请选择性别">
                 <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
@@ -211,11 +189,11 @@
           </el-col> -->
         </el-row>
         <el-row>
-          <el-col :span="10">
+          <!-- <el-col :span="10">
             <el-form-item v-if="!form.id" label="用户名称" prop="username">
               <el-input v-model="form.username" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
-          </el-col>
+          </el-col>   -->
           <el-col :span="14">
             <el-form-item v-if="!form.id" label="用户密码" prop="password">
               <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
@@ -223,9 +201,9 @@
           </el-col>
         </el-row>
         <el-row>
-         
+
           <el-col :span="14">
-            <el-form-item label="状态"  v-if="!form.source">
+            <el-form-item label="状态" v-if="!form.source">
               <el-radio-group v-model="form.isLock">
                 <el-radio v-for="dict in dict.type.sys_normal_disable" :key="`${dict.value}`" :label="dict.value">{{
                   dict.label }}</el-radio>