From a42abe823017e61d3ac1d0d76b634c138572626b Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Sat, 7 Dec 2019 17:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/issue-close-detail-view.vue   | 8 ++++----
 src/views/modules/events/issue-process-detail-view.vue | 2 +-
 src/views/modules/events/issue-reject-detail-view.vue  | 2 +-
 src/views/modules/events/issue-review-detail-view.vue  | 2 +-
 src/views/modules/events/item-close-detail-view.vue    | 6 +++---
 src/views/modules/events/item-deal-detail-view.vue     | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/events/issue-close-detail-view.vue b/src/views/modules/events/issue-close-detail-view.vue
index 2a813755..1e0bcbad 100644
--- a/src/views/modules/events/issue-close-detail-view.vue
+++ b/src/views/modules/events/issue-close-detail-view.vue
@@ -17,7 +17,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:">
@@ -43,7 +43,7 @@
                     </el-form-item>
                 </el-form>
                 <div class="container">
-                    <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.issueAddress}}</div>
+                    <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.address}}</div>
                     <div id="map"></div>
                 </div>
             </div>
@@ -160,9 +160,9 @@ export default {
   filters: {
     formatState (item) {
       if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS.length > 0) {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
           return '吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS.length === 0) {
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
           return '关闭'
diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue
index 4ee08072..c824361b 100644
--- a/src/views/modules/events/issue-process-detail-view.vue
+++ b/src/views/modules/events/issue-process-detail-view.vue
@@ -16,7 +16,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="distributeTime">
diff --git a/src/views/modules/events/issue-reject-detail-view.vue b/src/views/modules/events/issue-reject-detail-view.vue
index d4c39b4a..6d77a415 100644
--- a/src/views/modules/events/issue-reject-detail-view.vue
+++ b/src/views/modules/events/issue-reject-detail-view.vue
@@ -17,7 +17,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue
index 6ca8c6e2..ef99e563 100644
--- a/src/views/modules/events/issue-review-detail-view.vue
+++ b/src/views/modules/events/issue-review-detail-view.vue
@@ -16,7 +16,7 @@
                     <el-form-item label="所属网格:" prop="ownGrid">
                         <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
-                    <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
+                    <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
                         <div>{{dataForm.groupName}}</div>
                     </el-form-item>
                     <el-form-item label="上报时间:" prop="createdTime">
diff --git a/src/views/modules/events/item-close-detail-view.vue b/src/views/modules/events/item-close-detail-view.vue
index 23414ffa..cf3b485b 100644
--- a/src/views/modules/events/item-close-detail-view.vue
+++ b/src/views/modules/events/item-close-detail-view.vue
@@ -14,7 +14,7 @@
                           @click="clickImg(url)">
                 </el-image>
             </el-form-item>
-              <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+              <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
                   <div>{{dataForm.groupName}}</div>
               </el-form-item>
             <el-form-item label="上报时间:">
@@ -170,9 +170,9 @@ export default {
   filters: {
     formatState (item) {
       if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS.length > 0) {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
           return '吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS.length === 0) {
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
           return '关闭'
diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index eafd5d8e..0086faf2 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -14,7 +14,7 @@
                       @click="clickImg(url)">
             </el-image>
           </el-form-item>
-          <el-form-item v-if="dataForm.groupName !== null && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
+          <el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
             <div>{{dataForm.groupName}}</div>
           </el-form-item>
           <el-form-item label="上报时间:" prop="distributeTime">
@@ -220,9 +220,9 @@ export default {
   filters: {
     formatState (item) {
       if (item.type === 'project') {
-        if (item.state === 0 && item.itemDeptDTOS.length > 0) {
+        if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length > 0) {
           return '吹哨'
-        } else if (item.state === 0 && item.itemDeptDTOS.length === 0) {
+        } else if (item.state === 0 && item.itemDeptDTOS && item.itemDeptDTOS.length === 0) {
           return '回应'
         } else if (item.state === 5) {
           return '关闭'