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

src/assets/scss/modules/shequzhili/project-info.scss

@@ -81,12 +81,16 @@
     .info-pics {
         display: flex;
         margin: 20px 0;
+        min-width: 200px;
+        padding-left: 15px;
+
         img {
             display: block;
             width: 32%;
             height: 90px;
             margin-right: 9px;
             object-fit: cover;
+            cursor: pointer;
         }
     }
 

src/views/components/dateShow.vue

@@ -0,0 +1,48 @@
+<template>
+  <span>{{ showText }}</span>
+</template>
+
+<script>
+import dateFormat from "dai-js/tools/dateFormat";
+
+export default {
+  name: "dateShow",
+  props: {
+    format: {
+      type: String,
+      default: "yyyy-MM-dd hh:mm:ss",
+    },
+    timestamp: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      showText: "",
+    };
+  },
+  computed: {},
+  watch: {
+    timestamp(val) {
+      this.computeShowText();
+    },
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      this.computeShowText();
+    },
+
+    computeShowText() {
+      const { timestamp, format } = this;
+      if (!timestamp) return;
+      const showText = dateFormat(new Date(timestamp * 1000), format);
+
+      this.showText = showText;
+    },
+  },
+};
+</script>

src/views/components/selectStaff.vue

@@ -1307,7 +1307,7 @@ export default {
       .name {
         @include toe;
         width: 70%;
-        font-size: 18px;
+        font-size: 16px;
         font-family: PingFang SC;
         font-weight: 500;
         color: rgba(51, 51, 51, 1);
@@ -1316,11 +1316,13 @@ export default {
           position: relative;
           display: inline-block;
           vertical-align: middle;
-          padding: 0 5px * 0.5;
-          height: 24px * 0.5;
-          line-height: 24px * 0.5;
+          box-sizing: content-box;
+          top: -2px;
+          padding: 0 4px;
+          height: 16px;
+          line-height: 16px;
           border: 1px * 0.5 solid rgba(187, 19, 19, 1);
-          border-radius: 12px * 0.5;
+          border-radius: 16px;
           font-size: 10px;
           font-family: PingFang SC;
           font-weight: 500;

src/views/modules/shequzhili/xiangmu/cpts/event-info.vue

@@ -7,7 +7,7 @@
             <div class="m-info">
               <div class="info-title">事件内容</div>
               <div class="info-content">{{ info.eventContent }}</div>
-              <div class="info-audio" v-if="info.voiceList.length>0">
+              <div class="info-audio" v-if="info.voiceList.length > 0">
                 <audio controls>
                   <source
                     :src="item.url"
@@ -80,6 +80,7 @@ function iniData() {
       eventPerson: [],
       eventOrg: [],
       eventPeopleName: "",
+      voiceList: [],
       projectInfo: {
         projectId: "",
         operationName: "",

src/views/modules/shequzhili/xiangmu/cpts/issue-info.vue

@@ -12,17 +12,40 @@
                 <span>{{ issueInfo.issueTitle }}</span>
               </div>
               <div class="info-prop">
-                <span>议题建议：</span>
+                <span>处理建议：</span>
                 <span>{{ issueInfo.issueSuggestion }}</span>
               </div>
+              <div class="info-prop" v-if="issueInfo.topicInfo">
+                <span>话题内容：</span>
+                <span>{{ issueInfo.topicInfo.topicContent }}</span>
+              </div>
+              <div class="info-pics" v-if="issueInfo.topicInfo">
+                <img
+                  :src="src"
+                  :key="src"
+                  v-for="src in issueInfo.topicInfo.topicImgs"
+                  @click="watchImg(src)"
+                />
+              </div>
+              <div
+                class="info-audio"
+                v-if="issueInfo.topicInfo && issueInfo.topicInfo.voiceList"
+              >
+                <audio controls>
+                  <source
+                    :src="item.url"
+                    type=""
+                    :key="item.url"
+                    v-for="item in issueInfo.topicInfo.voiceList"
+                  />
+                </audio>
+              </div>
+
               <div class="info-prop">
                 <span>所属网格：</span>
                 <span>{{ issueInfo.belongsGridName || "--" }}</span>
               </div>
-              <div class="info-prop">
-                <span>议题发起人：</span>
-                <span>{{ issueInfo.issueInitiator }}</span>
-              </div>
+
               <div
                 v-if="issueInfo.topicInfo && issueInfo.topicInfo.groupName"
                 class="info-prop"
@@ -30,10 +53,28 @@
                 <span>议题来源：</span>
                 <span>{{ issueInfo.topicInfo.groupName }}</span>
               </div>
+
+              <div class="info-prop">
+                <span>议题发起人：</span>
+                <span>{{ issueInfo.issueInitiator }}</span>
+              </div>
+
+              <div class="info-prop" v-if="issueInfo.topicInfo">
+                <span>话题发表人：</span>
+                <span>{{ issueInfo.topicInfo.publishedUser }}</span>
+              </div>
+
               <div class="info-prop">
                 <span>转议题时间：</span>
                 <span>{{ issueInfo.shiftIssueTime }}</span>
               </div>
+
+              <div class="info-prop" v-if="issueInfo.topicInfo">
+                <span>话题发表时间：</span>
+                <date-show
+                  :timestamp="issueInfo.topicInfo.publishedTime"
+                ></date-show>
+              </div>
             </div>
 
             <div class="m-line">
@@ -134,6 +175,7 @@
 <script>
 import { requestPost } from "@/js/dai/request";
 import foldText from "@/views/components/foldText";
+import dateShow from "@/views/components/dateShow";
 import dateFormat from "dai-js/tools/dateFormat";
 import lineChart from "@/views/modules/visual/cpts/line-chart";
 
@@ -178,6 +220,7 @@ export default {
   components: {
     foldText,
     lineChart,
+    dateShow,
   },
 
   data: iniData,

src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@@ -53,13 +53,19 @@
 
             <div class="info-prop">
               <span>分类：</span>
-              <fold-text style="width: 300px" :row="3">
+              <fold-text
+                v-if="projectCate.length > 0"
+                style="width: 250px"
+                :row="3"
+              >
                 <div :key="item.name" v-for="item in projectCate">
                   {{ item.name }}
                 </div>
               </fold-text>
+              <span style="width: 250px" v-else>--</span>
 
-              <el-popover v-if="projectInfo.projectStatus=='pending'"
+              <el-popover
+                v-if="projectInfo.projectStatus == 'pending'"
                 placement="bottom"
                 width="400"
                 height="400"
@@ -93,13 +99,19 @@
             </div>
             <div class="info-prop">
               <span>标签：</span>
-              <fold-text style="width: 300px" :row="3">
+              <fold-text
+                v-if="projectTag.length > 0"
+                style="width: 250px"
+                :row="3"
+              >
                 <div :key="item.name" v-for="item in projectTag">
                   {{ item.name }}
                 </div>
               </fold-text>
+              <span style="width: 250px" v-else>--</span>
 
-              <el-popover v-if="projectInfo.projectStatus=='pending'"
+              <el-popover
+                v-if="projectInfo.projectStatus == 'pending'"
                 placement="bottom"
                 width="400"
                 height="400"