Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

4 years ago · 4171674d0a
5 changed files with 159 additions and 128 deletions
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@ -633,3 +633,18 @@
        background: #002e74;
    }
 }
+
+.m-hint {
+    position: relative;
+    height: 300px;
+
+    // 暂无数据
+    img {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        margin: auto;
+    }
+}
--- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
@ -106,7 +106,7 @@
                </div>
                <div class="info-prop">
                  <span>项目方案：</span>
-                  <span>{{ projectInfo.projectTitle }}</span>
+                  <span>{{ projectInfo.backGround }}</span>
                </div>
                <div class="info-prop">
                  <span>内部备注：</span>
--- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue
@ -166,7 +166,7 @@
                </div>
                <div class="info-prop">
                  <span>项目方案：</span>
-                  <span>{{ projectInfo.projectTitle }}</span>
+                  <span>{{ projectInfo.backGround }}</span>
                </div>
                <div class="info-prop">
                  <span>内部备注：</span>
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@ -365,6 +365,13 @@
                >
                </el-pagination>
              </div>
+
+              <div v-if="incident.list.length == 0" class="m-hint">
+                <img
+                  src="@/assets/img/modules/visual/noData.png"
+                  class="no-data-img"
+                />
+              </div>
            </div>

            <div class="list-wrap" v-show="showedIncidentOrTopic == 'topic'">
@ -391,6 +398,13 @@
                >
                </el-pagination>
              </div>
+
+              <div v-if="topic.list.length == 0" class="m-hint">
+                <img
+                  src="@/assets/img/modules/visual/noData.png"
+                  class="no-data-img"
+                />
+              </div>
            </div>
          </cpt-card>
        </div>
@ -433,6 +447,13 @@
                >
                </el-pagination>
              </div>
+
+              <div v-if="point.list.length == 0" class="m-hint">
+                <img
+                  src="@/assets/img/modules/visual/noData.png"
+                  class="no-data-img"
+                />
+              </div>
            </div>
          </cpt-card>
        </div>
--- a/src/views/modules/visual/measure/dialogInfo.vue
+++ b/src/views/modules/visual/measure/dialogInfo.vue
@ -13,7 +13,6 @@
        <div class="list-title">需求内容</div>
        <div class="list-wr">
          <div class="list">
-            
            <div class="item-desc">
              <!-- <span class="item-field">所属网格：</span> -->
              <span>{{ info.content }}</span>
@ -58,12 +57,18 @@
            </div>
            <div class="item">
              <span class="item-field">实际服务时间：</span>
-              <span v-if="info.serviceStartTime">{{ info.serviceStartTime }} 至 <br/>
-                {{ info.serviceEndTime }}</span>
+              <span v-if="info.serviceStartTime"
+                >{{ info.serviceStartTime }} 至 <br />
+                {{ info.serviceEndTime }}</span
+              >
            </div>
            <div class="item">
              <span class="item-field">完成情况：</span>
-              <span>{{ info.finishResult == 'resolved' ? '已解决' : '未解决' }} <br /> {{ info.finishDesc }}</span>
+              <span
+                >{{ info.finishResult == "resolved" ? "已解决" : "未解决" }}
+                <br />
+                {{ info.finishDesc }}</span
+              >
            </div>
            <div class="item">
              <span class="item-field">评价：</span>
@ -75,24 +80,16 @@
        </div>

        <div class="tabs">
-          <div
-            class="tab-btn"
-          >
+          <div class="tab-btn">
            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
          </div>
-          <div
-            class="tab z-on"
-          >
-            研判分析
-          </div>
-          <div
-            class="tab-btn"
-          >
+          <div class="tab z-on">研判分析</div>
+          <div class="tab-btn">
            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
          </div>
        </div>

-        <div style="padding: 30px 0;">
+        <div style="padding: 30px 0">
          <analyse
            v-if="!loading"
            :single-list="demandList"
@ -106,8 +103,6 @@
            @user="handleToUser"
          />
        </div>
-        
-        
      </cpt-card>
    </div>
  </div>
@ -115,7 +110,7 @@

 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
-import analyse from '../cpts/analyse.vue'
+import analyse from "../cpts/analyse.vue";
 import { requestPost } from "@/js/dai/request";

 export default {
@ -126,13 +121,13 @@ export default {
      default: "",
    },
    demandId: String,
-    queryOrigin: String
+    queryOrigin: String,
    // info: Object,
  },

  components: {
    cptCard,
-    analyse
+    analyse,
  },

  data() {
@ -399,103 +394,101 @@ export default {
        //     }
        //   ]
        // }
-        
      ],
      userLists: [
        {
-          homeId: '1',
-          icUserId: '1',
-          icUserName: '沾上干'
+          homeId: "1",
+          icUserId: "1",
+          icUserName: "沾上干",
        },
        {
-          homeId: '2',
-          icUserId: '2',
-          icUserName: '李四'
+          homeId: "2",
+          icUserId: "2",
+          icUserName: "李四",
        },
        {
-          homeId: '3',
-          icUserId: '3',
-          icUserName: '王五哈哈'
-        }
+          homeId: "3",
+          icUserId: "3",
+          icUserName: "王五哈哈",
+        },
      ],
-      userName: '王亚男哈',
+      userName: "王亚男哈",
      eventList: [
        {
-          categoryName: '辨明服务',
-          categoryCode: '1',
+          categoryName: "辨明服务",
+          categoryCode: "1",
          projectList: [
            {
-              title: '不知道写了什么哈哈哈',
-              status: 'closed',
-              projectId: '1'
+              title: "不知道写了什么哈哈哈",
+              status: "closed",
+              projectId: "1",
            },
            {
-              title: '罗里吧嗦写了什么哈哈哈',
-              status: 'closed',
-              projectId: '2'
+              title: "罗里吧嗦写了什么哈哈哈",
+              status: "closed",
+              projectId: "2",
            },
            {
-              title: '胡说八道写了什么哈哈哈',
-              status: 'closed',
-              projectId: '1=3'
+              title: "胡说八道写了什么哈哈哈",
+              status: "closed",
+              projectId: "1=3",
            },
            {
-              title: '费眼飞鱼不知道写了什么哈哈哈',
-              status: 'closed',
-              projectId: '1=4'
+              title: "费眼飞鱼不知道写了什么哈哈哈",
+              status: "closed",
+              projectId: "1=4",
            },
            {
-              title: '狗屁不通不知道写了什么哈哈哈',
-              status: 'closed',
-              projectId: '5'
+              title: "狗屁不通不知道写了什么哈哈哈",
+              status: "closed",
+              projectId: "5",
            },
            {
-              title: '啦啦啦不知道写了什么哈哈哈',
-              status: 'closed',
-              projectId: '6'
-            }
-          ]
+              title: "啦啦啦不知道写了什么哈哈哈",
+              status: "closed",
+              projectId: "6",
+            },
+          ],
        },
        {
-          categoryName: '水煮鱼辨明服务辨明服务',
-          categoryCode: '4',
+          categoryName: "水煮鱼辨明服务辨明服务",
+          categoryCode: "4",
          projectList: [
            {
-              title: '熟煮雨不知道写了什么哈哈哈',
-              status: 'pending',
-              projectId: '4'
-            }
-          ]
+              title: "熟煮雨不知道写了什么哈哈哈",
+              status: "pending",
+              projectId: "4",
+            },
+          ],
        },
        {
-          categoryName: '开心麻花',
-          categoryCode: '2',
+          categoryName: "开心麻花",
+          categoryCode: "2",
          projectList: [
            {
-              title: '不知道开心麻花写了什么哈哈哈',
-              status: 'closed',
-              projectId: '1'
-            }
-          ]
+              title: "不知道开心麻花写了什么哈哈哈",
+              status: "closed",
+              projectId: "1",
+            },
+          ],
        },
        {
-          categoryName: '酸菜鱼',
-          categoryCode: '3',
+          categoryName: "酸菜鱼",
+          categoryCode: "3",
          projectList: [
            {
-              title: '不知道酸菜鱼写了什么哈哈哈',
-              status: 'pending',
-              projectId: '3'
-            }
-          ]
-        }
+              title: "不知道酸菜鱼写了什么哈哈哈",
+              status: "pending",
+              projectId: "3",
+            },
+          ],
+        },
      ],
    };
  },

-  
  async mounted() {
-    await this.getInfo(this.demandId)
+    await this.getInfo(this.demandId);
  },

  methods: {
@ -504,78 +497,81 @@ export default {
    },
    async getInfo(demandId) {
      // const url = "/gov/org/customeragency/staffinagencylist";
-      const url = '/heart/userdemand/demandDetail'
+      const url = "/heart/userdemand/demandDetail";
      let params = {
        demandRecId: demandId,
      };
      const { data, code, msg } = await requestPost(url, params);
      if (code === 0) {
        // console.log('data-org----dict', data)
-        this.info = data
-        this.getAnalyse()
+        this.info = data;
+        this.getAnalyse();
      } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
      }
    },
    async getAnalyse() {
      // const url = "/gov/org/customeragency/staffinagencylist";
-      this.loading = true
-      const url = '/heart/userdemand/demand-research-analysis'
+      this.loading = true;
+      const url = "/heart/userdemand/demand-research-analysis";
      let params = {
        firstCategoryCode: this.info.firstCategoryCode,
-        icResiUserId: this.info.demandUserId,
+        icResiUserId: this.info.icResiUserId,
        epmetUserIdList: [this.info.epmetUserId],
-        queryOrigin: this.queryOrigin
+        queryOrigin: this.queryOrigin,
      };
      const { data, code, msg } = await requestPost(url, params);
      if (code === 0) {
-        console.log('data-org----a', data)
-        this.userLists = data.houseUserList.map(item => {
+        console.log("data-org----a", data);
+        this.userLists = data.houseUserList.map((item) => {
          return {
            ...item,
-            icUserId: item.icResiUserId
-          }
-        })
-        this.demandList = data.demandData.map(item => {
+            icUserId: item.icResiUserId,
+          };
+        });
+        this.demandList = data.demandData.map((item) => {
          return {
            ...item,
            showItem: true,
            categoryName: item.firstCategoryName,
            categoryCode: item.firstCategoryCode,
-            projectList: item.demandList.map(n => {
+            projectList: item.demandList.map((n) => {
              return {
                ...n,
                title: n.content,
                status: n.status,
                statusName: n.statusName,
-                projectId: n.demandRecId
-              }
-            })
-          }
-        })
-        console.log('demandList-dd', this.demandList)
-
+                projectId: n.demandRecId,
+              };
+            }),
+          };
+        });
+        console.log("demandList-dd", this.demandList);
      } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
      }
-      this.loading = false
+      this.loading = false;
    },
    handleToProject(val) {
-      console.log('val---v', val)
-      this.getInfo(val.projectId)
+      console.log("val---v", val);
+      this.getInfo(val.projectId);
    },
    handleToUser(val) {
-      console.log('val-uuu', val)
+      console.log("val-uuu", val);

      this.$router.push({
        path: `/main-shuju/visual-basicinfo-people/${val.icUserId}`,
      });
-    }
-  }
+    },
+  },
 };
 </script>

-<style lang="scss" src="@/assets/scss/modules/visual/people.scss" scoped></style>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
 <style lang="scss" scoped>
 .m-pop {
  .wrap {
@ -609,6 +605,5 @@ export default {
 .list-wr {
  display: flex;
  padding: 0 32px;
-  
 }
 </style>