合并songzhen分支代码

src/assets/css/workflow.scss

@@ -534,7 +534,7 @@ html {
     -webkit-box-direction: normal;
     -ms-flex-direction: column;
     flex-direction: column;
-    height: 100%
+    // height: 100%
 }
 
 @font-face {

src/components/NameSplit/index.vue

@@ -3,8 +3,8 @@
     <div v-if="!flag" :title="getAllName(item[areaName])">{{ spliceNameFun(item[areaName], 8) }}</div>
     <div class="name_more" v-if="item[peopleName] && !item[peopleName].includes(',')" @click="gotoPersonnel(item.resiId)" :title="getAllName(item[peopleName])">{{ spliceNameFun(item[peopleName], 12) }}</div>
     <div class="name_more" v-if="item[peopleName] && item[peopleName].includes(',')">
-      <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>
-      <popTips :item="item" />
+      <span v-for="(i, k) in getItemNameArr(item[peopleName])" :key="i" @click="gotoPersonnel(item.resiId.split(',')[k])" :title="getAllName(i)">{{ spliceNameFun(i, 12) }}{{ k === getItemNameArr(item[peopleName]).length - 1 ? "" : "," }}</span>
+      <popTips :item="item" :pageName="pageName" />
     </div>
   </div>
 </template>

src/components/PopHomeTip/index.vue

@@ -83,8 +83,8 @@ export default {
     },
 
     gotoPersonnel(id) {
-      if (id) {
-        this.$router.push({ path: "/organizational/orgPersonnel", query: { user_id: id } });
+      if (id && id !== "") {
+        this.$router.push({ path: `/organizational/orgPersonnel/${this.pageName}`, query: { user_id: id } });
       } else {
         this.$message.error("无法跳转！");
       }

src/components/PopTips/index.vue

@@ -3,7 +3,7 @@
     <div class="popperList">
       <div style="margin-bottom: 13px">所有人员</div>
       <div v-for="(itm, idx) in getItemNameArr(item.name)" :key="itm">
-        <span style="cursor: pointer" @click="gotoPersonnel(item.resiId[idx])">{{ itm }}</span>
+        <span style="cursor: pointer" @click="gotoPersonnel(item.resiId.split(',')[idx])">{{ itm }}</span>
       </div>
     </div>
     <i slot="reference" style="margin-left: 2px" class="el-icon-more"></i>
@@ -18,14 +18,19 @@ export default {
       type: Object,
       default: () => {},
     },
+    pageName: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {};
   },
   methods: {
     gotoPersonnel(id) {
-      if (id) {
-        this.$router.push("/organizational/orgPersonnel");
+      console.log(id);
+      if (id && id !== "") {
+        this.$router.push({ path: `/organizational/orgPersonnel/${this.pageName}`, query: { user_id: id } });
       } else {
         this.$message({
           message: "无法跳转",

src/views/dataBoard/organizational/microgrid/index.vue

@@ -13,7 +13,7 @@
         <el-table-column label="序号" type="index" width="80" />
         <!-- 上报事件 -->
         <el-table-column v-if="otherTabel === 'sbsj'" prop="categoryName" label="事件类型" />
-        <el-table-column v-if="otherTabel === 'sbsj'" prop="addeventContentress" label="事件描述" />
+        <el-table-column v-if="otherTabel === 'sbsj'" prop="eventContent" label="事件描述" />
         <el-table-column v-if="otherTabel === 'sbsj'" prop="status" label="办理情况">
           <template slot-scope="scope">
             {{ getStatusMap(scope.row.status) }}
@@ -25,7 +25,7 @@
         <el-table-column v-if="otherTabel === 'jmxq'" prop="content" label="需求描述" />
         <el-table-column v-if="otherTabel === 'jmxq'" prop="status" label="办理情况">
           <template slot-scope="scope">
-            {{ getStatusMap(scope.row.status) }}
+            {{ getStatusMapsb(scope.row.status) }}
           </template>
         </el-table-column>
         <el-table-column v-if="otherTabel === 'jmxq'" prop="reportTime" label="上报时间" />
@@ -191,7 +191,7 @@ export default {
       this.rowId = null;
     },
     handleView(row) {
-      console.log('this.itemNav::', this.itemNav);
+      console.log("this.itemNav::", this.itemNav);
       this.rowId = row.id;
       if (this.itemNav === 1 || this.itemNav === 2) {
         this.showDialogEvent = true;
@@ -206,7 +206,17 @@ export default {
 
     getStatusMap(s) {
       const statusMap = new Map([
-        ["pending", "待处理"],
+        ["processing", "处理中"],
+        ["closed_case", "已结办"],
+        // ["assigned", "已派单"],
+        // ["have_order", "已接单"],
+        // ["finished", "已完成"],
+      ]);
+      return statusMap.get(s);
+    },
+    getStatusMapsb(s) {
+      const statusMap = new Map([
+        ["pending", "带办理"],
         ["canceled", "已取消"],
         ["assigned", "已派单"],
         ["have_order", "已接单"],