Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/project/system/controller/TAlarmPrincipalController.java

@@ -85,10 +85,10 @@ public class TAlarmPrincipalController extends BaseController
     {
         tAlarmPrincipal.setCreaterCode(getUserId().toString());
         //人员信息对应
-        TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrByStaffId(tAlarmPrincipal.getStaffid());
-        tAlarmPrincipal.setPrincipalName(staffmgr.getName());
-        tAlarmPrincipal.setPrincipalEmail(staffmgr.getMail());
-        tAlarmPrincipal.setDeptId(staffmgr.getDeptId());
+//        TStaffmgr staffmgr = tStaffmgrService.selectTStaffmgrByStaffId(tAlarmPrincipal.getStaffid());
+//        tAlarmPrincipal.setPrincipalName(staffmgr.getName());
+//        tAlarmPrincipal.setPrincipalEmail(staffmgr.getMail());
+//        tAlarmPrincipal.setDeptId(staffmgr.getDeptId());
         return toAjax(tAlarmPrincipalService.insertTAlarmPrincipal(tAlarmPrincipal));
     }
 

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -139,14 +139,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectUserListByPost" parameterType="String" resultMap="SysUserResult">
-		select u.user_id,u.staffid, u.dept_id, u.user_name, u.nick_name||'__'||d.dept_name as nick_name
+		select u.user_id,u.staffid,u.email, u.dept_id, u.user_name, u.nick_name||'__'||d.dept_name as nick_name
 		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		left join sys_user_role ur on u.user_id = ur.user_id
 		left join sys_role r on r.role_id = ur.role_id
 		LEFT JOIN SYS_USER_POST sp on u.USER_ID = sp.USER_ID
 		LEFT JOIN SYS_POST p on p.POST_ID = sp.POST_ID
-		where u.del_flag = '0'
+		where u.del_flag = '0' and u.staffid is not null
 		<if test="postCode != null and postCode != ''">
 			and p.POST_CODE = #{postCode}
 		</if>

ui/src/views/sems/month/index.vue

@@ -194,7 +194,7 @@
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item :label="$t('装置名称')" prop="plantCode">
-          <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small">
+          <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable @change="handleCommand" size="small">
             <el-option
               v-for="dict in plantOptions"
               :key="dict.name"
@@ -219,7 +219,14 @@
         <el-collapse v-model="activeNames">
           <el-collapse-item :title="$t('压力容器')" name="1" :style="{display:showYlrq}">
             <el-form-item :label="$t('容器单元')" prop="rqUnit">
-              <el-input v-model="form.rqUnit" :placeholder="$t('请输入') + $t('容器单元')"/>
+              <el-select v-model="form.rqUnit" :placeholder="$t('请选择')+ $t('容器单元')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in unitOptions"
+                  :key="dict.name"
+                  :label="dict.name"
+                  :value="dict.name"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item :label="$t('容器本体')" prop="rqSelf">
               <el-select v-model="form.rqSelf" :placeholder="$t('请选择') + $t('容器本体')">
@@ -290,7 +297,14 @@
           </el-collapse-item>
           <el-collapse-item :title="$t('压力管道')" name="2" :style="{display:showYlgd}">
             <el-form-item :label="$t('管道区域/单元')" prop="gdUnit">
-              <el-input v-model="form.gdUnit" :placeholder="$t('请输入') + $t('管道区域/单元')"/>
+              <el-select v-model="form.gdUnit" :placeholder="$t('请选择')+ $t('管道区域/单元')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in unitOptions"
+                  :key="dict.name"
+                  :label="dict.name"
+                  :value="dict.name"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item :label="$t('管道宏观')" prop="gdSelf">
               <el-select v-model="form.gdSelf" :placeholder="$t('请选择') + $t('管道宏观')">
@@ -351,7 +365,14 @@
           </el-collapse-item>
           <el-collapse-item :title="$t('锅炉')" name="3" :style="{display:showGl}">
             <el-form-item :label="$t('锅炉区域/单元')" prop="glUnit">
-              <el-input v-model="form.glUnit" :placeholder="$t('请输入') + $t('锅炉区域/单元')"/>
+              <el-select v-model="form.glUnit" :placeholder="$t('请选择')+ $t('锅炉区域/单元')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in unitOptions"
+                  :key="dict.name"
+                  :label="dict.name"
+                  :value="dict.name"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item :label="$t('承压部件')" prop="glPressure">
               <el-select v-model="form.glPressure" :placeholder="$t('请选择') + $t('承压部件')">
@@ -568,7 +589,7 @@ import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {mylistPlant} from "@/api/system/plant";
+import {listUnit, mylistPlant} from "@/api/system/plant";
 import MonthApprove from "./monthapprove";
 
 export default {
@@ -645,6 +666,8 @@ export default {
       // 水质化验字典
       glWaterOptions: [],
       plantOptions: [],
+      unitOptions: [],
+      plantIds: [],
       approveStatusOptions: [],
       // 用户导入参数
       upload: {
@@ -773,6 +796,20 @@ export default {
         this.loading = false;
       });
     },
+    handleCommand(plantIds) {
+      this.plantIds = []
+      this.plantIds.push(plantIds)
+      this.getUnitList()
+    },
+    //获取账号对应单元
+    getUnitList() {
+      let unitParams = {
+        plantIds: this.plantIds
+      }
+      listUnit(unitParams).then(response => {
+        this.unitOptions = response;
+      });
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {

ui/src/views/sems/specanalysis/index.vue

@@ -396,7 +396,6 @@ export default {
         this.$refs.approveChart.devApproveData(this.plantIds, this.unitIds);
         this.devGlPerData()
       });
-
     },
     handleCommand(plantIds) {
       this.plantIds = plantIds

ui/src/views/system/alarmtype/index.vue

@@ -50,7 +50,6 @@
 
     <el-table v-loading="loading" :data="alarmtypeList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :formatter="plantCodeFormat" />
       <el-table-column :label="$t('表名称')" align="center" prop="tableName" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('预警字段名称')" align="center" prop="fieldName" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('一级预警')" align="center" prop="firstlevel" :show-overflow-tooltip="true"/>

ui/src/views/system/principal/index.vue

@@ -50,7 +50,7 @@
 
     <el-table v-loading="loading" :data="principalList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :formatter="plantCodeFormat" />
+      <el-table-column :label="$t('部门名称')" align="center" prop="deptName" />
       <el-table-column :label="$t('负责人姓名')" align="center" prop="principalName" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('负责人邮箱')" align="center" prop="principalEmail" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
@@ -84,24 +84,17 @@
     <!-- 添加或修改预警管理负责人对话框 -->
     <el-dialog v-dialogDrag :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="$t('装置名称')" prop="plantCode">
-          <el-select v-model="form.plantCode" :placeholder="$t('请选择') + $t('装置名称')">
-            <el-option
-              v-for="dict in plantCodeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
+        <el-form-item :label="$t('归属部门')" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
         </el-form-item>
         <el-form-item :label="$t('负责人姓名')" prop="principalName">
-          <el-select v-model="form.staffid" filterable :placeholder="$t('请选择') + $t('负责人姓名')" @change="pricipalChange($event)">
+          <el-select v-model="form.staffid" filterable :placeholder="$t('请选择') + $t('负责人姓名')" filterable @change="pricipalChange($event)">
             <el-option
               v-for="dict in stffmgrOptions"
-              :key="dict.staffid"
-              :label="dict.name"
-              :value="dict.staffid">
-              <span style="float: left">{{ dict.name }}</span>
+              :key="dict.userId"
+              :label="dict.nickName"
+              :value="dict.staffId">
+              <span style="float: left">{{ dict.nickName }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.staffid }}</span>
             </el-option>
           </el-select>
@@ -128,6 +121,7 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {listPostUser} from "@/api/system/user";
 
 export default {
   name: "Principal",
@@ -243,8 +237,11 @@ export default {
     },
     //获取人员表
     getStaffmar() {
-      listStaffmgr(this.staffmgrQueryParams).then(response => {
-        this.stffmgrOptions = response.rows;
+      // listStaffmgr(this.staffmgrQueryParams).then(response => {
+      //   this.stffmgrOptions = response.rows;
+      // });
+      listPostUser(this.queryParams).then(response => {
+        this.stffmgrOptions = response;
       });
     },
     // 取消按钮
@@ -267,7 +264,8 @@ export default {
         updaterCode: null,
         updatedate: null,
         deptId: null,
-        remarks: null
+        remarks: null,
+        name: null
       };
       this.resetForm("form");
     },
@@ -275,9 +273,10 @@ export default {
     pricipalChange(val) {
       let _this = this
       this.staffmgrQueryParams.staffid = val
+      console.log(val)
       this.stffmgrOptions.forEach(function (item, index) {
-        if (item.staffid == val) {
-          _this.stffmgrEmail = item.mail
+        if (item.staffId == val) {
+          _this.stffmgrEmail = item.email
         }
       })
     },