任务下发页面执行人对应字段修改

gassafetyprogress-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -185,7 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT
 			u.user_id,
 			u.dept_id,
-			u.user_name
+			u.user_name,
+			u.nick_name
 		FROM
 			sys_user u
 		LEFT JOIN sys_user_post up ON u.user_id = up.user_id

gassafetyprogress-system/src/main/resources/mapper/system/TWorkOrderMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             info.enterprise_name AS work_assign_enterprose_name,
             workOrder.work_assign_enterprose_id,
             workOrder.work_assign_man_id,
-            usr.user_name AS work_assign_man,
+            usr.nick_name AS work_assign_man,
             workOrder.work_status,
             workOrder.inspection_date,
             workOrder.inspection_route,

gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue

@@ -265,7 +265,7 @@
               <el-option
                 v-for="item in inspectors"
                 :key="item.userId "
-                :label="item.userName"
+                :label="item.nickName"
                 :value="item.userId "
               ></el-option>
             </el-select>
@@ -436,7 +436,7 @@
                 <el-option
                   v-for="item in inspectors"
                   :key="item.userId "
-                  :label="item.userName"
+                  :label="item.nickName"
                   :value="item.userId "
                 ></el-option>
               </el-select>
@@ -943,11 +943,11 @@ export default {
     //获取执行人
     selectInspection(userId,type){
       if(userId){
-        let userName = this.inspectors.find(val=>val.userId == userId).userName;
+        let nickName = this.inspectors.find(val=>val.userId == userId).nickName;
         if("edit" == type){
-          this.form.workAssignMan = userName;
+          this.form.workAssignMan = nickName;
         }else{
-          this.workForm.workAssignMan = userName;
+          this.workForm.workAssignMan = nickName;
         }
       }else{
         if("edit" == type){

gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Right.vue

@@ -15,8 +15,8 @@
       <div class="right">进行中</div>
     </div>
     <div class="three flex">
-      <div class="left zzz">15</div>
-      <div class="middle zzz">13</div>
+      <div class="left zzz">6</div>
+      <div class="middle zzz">4</div>
       <div class="right zzz">2</div>
     </div>
 
@@ -49,51 +49,37 @@ export default {
     return {
       arr: [
         {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
+          companyName: "河北泽宏科技",
+          time: "2021-09-09 09:35",
+          text: "城市燃气",
         },
         {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
+          companyName: "河北汉宏",
+          time: "2021-05-11 14:16",
+          text: "天然气化工",
         },
         {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
+          companyName: "河北海康",
+          time: "2020-03-21 13:20",
+          text: "工业燃料",
         },
         {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
+          companyName: "河北新奥",
+          time: "2022-03-02 13:59",
+          text: "天然气化工",
         },
         {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
+          companyName: "河北霄领",
+          time: "2020-01-16 10:19",
+          text: "天然气化工",
         },
         {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
-        },
-        {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
-        },
-        {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
-        },
-        {
-          companyName: "河北泽宏公司啊啊啊啊啊",
-          time: "2022-04-09 07:29",
-          text: "大师傅阿斯蒂芬阿斯蒂芬Î",
+          companyName: "河北泽宏公司",
+          time: "2020-07-19 09:21",
+          text: "城市燃气",
         },
 
+
         // {
         //   companyName: 123,
         //   time: "2022-04-09 07:29",