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

src/assets/scss/modules/visual/shijianchulifenxi.scss

@@ -14,14 +14,14 @@
     height: calc(100vh - 230px);
 
     .l_top {
-      height: 385px;
+      height: 355px;
       display: flex;
       align-items: center;
    
     
     }
     .l_bottom {
-      height: calc(100vh - 230px - 385px);
+      height: calc(100vh - 200px - 355px);
       margin-top: 20px;
     }
   }
@@ -112,7 +112,7 @@
   text-align: center;
   position: relative;
   width: 500px;
-  height: 385px;
+  height: 355px;
 
   box-sizing: border-box;
 }

src/views/modules/shequzhili/event/cpts/add.vue

@@ -412,9 +412,9 @@ export default {
     this.getCategoryList()
 
     this.initMap()
-    this.formData = {
+    // this.formData = {
-      ...this.formDataTemp
+    //   ...this.formDataTemp
-    }
+    // }
   },
 
   methods: {

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

@@ -81,11 +81,11 @@
                 <div v-if="item.type==='event'">
                   <div class="detail">
                     <div class="detail-field">回复人：</div>
-                    <div class="detail-value">{{ item.publicReply }}</div>
+                    <div class="detail-value">{{ item.departmentName }}</div>
                   </div>
                   <div class="detail">
                     <div class="detail-field">回复内容：</div>
-                    <div class="detail-value">{{ item.departmentName }}</div>
+                    <div class="detail-value">{{ item.publicReply }}</div>
                   </div>
                 </div>
 
@@ -93,11 +93,11 @@
                   <div v-if="item.processName==='回复'">
                     <div class="detail">
                       <div class="detail-field">回复人：</div>
-                      <div class="detail-value">{{ item.publicReply }}</div>
+                      <div class="detail-value">{{ item.departmentName }}</div>
                     </div>
                     <div class="detail">
                       <div class="detail-field">回复内容：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
+                      <div class="detail-value">{{ item.publicReply }}</div>
                     </div>
                   </div>
                   <div v-else>
@@ -147,11 +147,11 @@
                   <div v-if="item.processName==='回复'">
                     <div class="detail">
                       <div class="detail-field">回复人：</div>
-                      <div class="detail-value">{{ item.publicReply }}</div>
+                      <div class="detail-value">{{ item.departmentName }}</div>
                     </div>
                     <div class="detail">
                       <div class="detail-field">回复内容：</div>
-                      <div class="detail-value">{{ item.departmentName }}</div>
+                      <div class="detail-value">{{ item.publicReply }}</div>
                     </div>
                   </div>
                   <div v-if="item.processName==='需求完成'">

src/views/modules/shequzhili/event/cpts/process-form-project.vue

@@ -333,7 +333,7 @@ export default {
     this.getMyDepartmentList();
     this.getAssistanceUnitList();
     this.getTagList()
-    this.formData = { ...this.formDataTemp }
+    // this.formData = { ...this.formDataTemp }
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
     } else {

src/views/modules/visual/communityGovern/shijianchuli/event-info.vue

@@ -24,20 +24,26 @@
 
             <div class="info-prop">
               <span>事件内容：</span>
-              <div>
+              <span>{{ eventInfo.eventContent }}</span>
-                <div>{{ eventInfo.eventContent || "--"}}</div>
+            </div>
+
             <div v-if="eventInfo.imageList&&eventInfo.imageList.length>0"
-                     class="info-pics">
+                 class="info-prop">
+              <span>图片：</span>
+              <div class="info-pics">
                 <img :src="src"
                      :key="src"
-                       v-for="src in eventInfo.imageList" />
+                     style="width:100px;height:100px;padding-right:10px"
-                </div>
+                     v-for="src in eventInfo.imageList"
+                     @click="watchImg(src)" />
+
               </div>
             </div>
-            <div class="info-prop">
+
-              <span>音频：</span>
             <div v-if="eventInfo.voiceList&&eventInfo.voiceList.length>0"
-                   class="info-pics">
+                 class="info-prop">
+              <span>音频：</span>
+              <div class="info-pics">
                 <audio :src="src"
                        :key="src"
                        v-for="src in eventInfo.voiceList" />

src/views/modules/visual/communityGovern/shijianchuli/pieOption.js

@@ -1,10 +1,10 @@
 
 export function pieOption (_charts) {
-const center= ['50%', '200px']
+const center= ['50%', '170px']
   return {
     title: {
       text: '0',
-      top: 170,
+      top: 140,
       left: 'center',
       textStyle: {
         width: '100%',

src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@@ -294,18 +294,18 @@ export default {
     //获取服务器数据
     await this.getProjectTotal()
     await this.getLineChart()
-    await this.getTable()
+
     this.dataLoading = false
 
-    this.assignData()
+    // this.assignData()
 
   },
 
   methods: {
     async getApiData () {
+
       await this.getProjectTotal()
       await this.getLineChart()
-      await this.getTable();
 
       this.assignData()
 
@@ -332,19 +332,20 @@ export default {
       }
       if (index !== '0') {
         await this.getApiData()
-        this.assignPieChart()
+        // this.assignPieChart()
       }
 
 
     },
 
     assignData () {
+
       this.getPie()
       this.getLine()
     },
 
     handleSelectChange (value) {
-      console.log(value)
+
       this.queryStartTime = value[0] + " 00:00:00"
       this.queryEndTime = value[1] + " 23:59:59"
       this.getApiData();
@@ -565,6 +566,7 @@ export default {
     },
 
     getPie () {
+
       if (this.pieInitState) {
         this.assignPieChart()
       } else {
@@ -588,7 +590,7 @@ export default {
 
       this.pieOption.title.text = this.projectTotal
 
-      this.clickPie(maxIndex)
+      this.clickPie()
 
       let fun = function (params) {
         _that.clickPie(params.dataIndex)
@@ -598,10 +600,13 @@ export default {
     },
 
     clickPie (seriesIndex) {
+
       if (seriesIndex === 0) {
         this.processStatus = 'closed_case'
-      } else {
+      } else if (seriesIndex === 1) {
         this.processStatus = 'processing'
+      } else {
+        this.processStatus = ''
       }
 
       this.pieData.forEach((element, index) => {
@@ -643,28 +648,15 @@ export default {
     handleChangeAgency () {
       let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
       if (obj) {
-        this.orgId = obj.level === 'grid' ? 'grid' : 'agency'
+        this.orgType = obj.level === 'grid' ? 'grid' : 'agency'
-        this.orgId = obj.this.orgId = orgArray[0]
+        this.orgId = obj.agencyId
 
       } else {
         this.orgId = ''
         this.orgType = ''
       }
 
-      // let orgArray = []
-      // let key = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
-      // if (key) {
-      //   debugger
-      //   orgArray = key.split('-')
-      //   this.orgId = orgArray[0]
-      //   this.orgType = orgArray[1] === 'grid' ? 'grid' : 'agency'
-      // } else {
-      //   this.orgId = ''
-      //   this.orgType = ''
-      // }
-
       this.getApiData()
-
     },
 
     //初始化时间
@@ -707,7 +699,7 @@ export default {
       this.userId = id;
     },
     userId () {
-      this.getApiData();
+      // this.getApiData();
       window.scrollTo(0, 0);
     },
   },