浏览代码

BUG修改

seimin 3 年之前
父节点
当前提交
9599ddc30c
共有 5 个文件被更改,包括 98 次插入57 次删除
  1. 1 1
      config/index.js
  2. 8 8
      src/views/guideDetail.vue
  3. 16 11
      src/views/indes.vue
  4. 1 1
      src/views/wxChartDetail.vue
  5. 72 36
      src/views/wxChartList.vue

+ 1 - 1
config/index.js

@@ -27,7 +27,7 @@ module.exports = {
27 27
     },
28 28
 
29 29
     // Various Dev Server settings
30
-    host: 'localhost', // can be overwritten by process.env.HOST
30
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
31 31
     // host: '192.168.3.170', // can be overwritten by process.env.HOST
32 32
     // host: '192.168.31.32', // can be overwritten by process.env.HOST
33 33
     // host: '192.168.31.32', // can be overwritten by process.env.HOST

+ 8 - 8
src/views/guideDetail.vue

@@ -2,10 +2,10 @@
2 2
   <div>
3 3
     <!-- <div class="header">公告详情</div> -->
4 4
     <div class="title">
5
-      <div class="tit">{{data.title}}</div>
5
+      <div class="tit">{{ data.title }}</div>
6 6
       <div class="info">
7
-        <span class="fl">{{data.placeDTO.place}}</span>
8
-        <span class="fr">{{data.createTime}}</span>
7
+        <span class="fl">{{ data.placeDTO ? data.placeDTO.place : "" }}</span>
8
+        <span class="fr">{{ data.createTime }}</span>
9 9
       </div>
10 10
     </div>
11 11
     <div class="content" v-html="data.content"></div>
@@ -24,7 +24,7 @@ export default {
24 24
   methods: {
25 25
     getData() {
26 26
       var that = this;
27
-      that.data =that.$route.params.data;
27
+      that.data = that.$route.params.data;
28 28
     }
29 29
   },
30 30
   created() {
@@ -33,7 +33,7 @@ export default {
33 33
   mounted() {}
34 34
 };
35 35
 </script>
36
-<style scoped lang='less'>
36
+<style scoped lang="less">
37 37
 // .header {
38 38
 //   width: 100%;
39 39
 //   height: 0.88rem;
@@ -52,7 +52,7 @@ export default {
52 52
   //   height: 0.88rem;
53 53
   font-size: 0.36rem;
54 54
   // margin-top: .88rem;
55
-  .tit{
55
+  .tit {
56 56
     text-align: center;
57 57
   }
58 58
   div {
@@ -78,7 +78,7 @@ export default {
78 78
   text-indent: 0.7rem;
79 79
   margin-bottom: 0.32rem;
80 80
   overflow: hidden;
81
-  .table{
81
+  .table {
82 82
     width: 100% !important;
83 83
   }
84 84
 }
@@ -89,4 +89,4 @@ export default {
89 89
   padding-right: 0.32rem;
90 90
   line-height: 0.45rem;
91 91
 }
92
-</style>
92
+</style>

+ 16 - 11
src/views/indes.vue

@@ -10,7 +10,7 @@
10 10
         <i class="iconfont dsit-dianhualiuyan"></i>
11 11
         <span>留言列表</span>
12 12
       </router-link>
13
-      <a href="http://itsm.zuel.edu.cn/user/#/knowList">
13
+      <a href="javascript:;">
14 14
         <i class="iconfont dsit-changjianwenti2"></i>
15 15
         <span>常见问题</span>
16 16
       </a>
@@ -37,17 +37,20 @@
37 37
           <div class="conent">
38 38
             <div class="center">
39 39
               <div>
40
-                <span class="fl">{{item.requester.name}}</span>
41
-                <span class="fr">{{item.createTime}}</span>
40
+                <span class="fl">{{ item.requester.name }}</span>
41
+                <span class="fr">{{ item.createTime }}</span>
42 42
               </div>
43 43
               <p class="desc">
44
-                <span class="grayFont overflowEllipsis2" v-html="item.incidentDescription"></span>
44
+                <span
45
+                  class="grayFont overflowEllipsis2"
46
+                  v-html="item.incidentDescription"
47
+                ></span>
45 48
               </p>
46 49
             </div>
47 50
           </div>
48 51
         </div>
49 52
         <!-- 无数据 -->
50
-        <div class="wushuju" v-if="!dataList.length&&!newRapirLoading">
53
+        <div class="wushuju" v-if="!dataList.length && !newRapirLoading">
51 54
           <div>
52 55
             <img src="./../../static/images/quesheng.png" alt />
53 56
             <p>暂无待办报障</p>
@@ -70,10 +73,10 @@
70 73
             <i class="iconfont dsit-xiangyou"></i>
71 74
           </span>
72 75
         </div>
73
-        <div class="conentBox" v-if="!newNoticeNoData&&!newNoticeLoading">
76
+        <div class="conentBox" v-if="!newNoticeNoData && !newNoticeLoading">
74 77
           <div class="conent" v-for="v in noticeData" @click="toGuideDetail(v)">
75
-            <div class="head overflowEllipsis2">{{v.title}}</div>
76
-            <div class="cot">{{v.createTime}}</div>
78
+            <div class="head overflowEllipsis2">{{ v.title }}</div>
79
+            <div class="cot">{{ v.createTime }}</div>
77 80
             <!-- <div class="cot">{{v.createTime.substring(0,v.createTime.length-5)}}</div> -->
78 81
           </div>
79 82
         </div>
@@ -115,14 +118,15 @@ export default {
115 118
     getNoticData() {
116 119
       // alert('公告列表')
117 120
       var that = this;
118
-      http.bpmFetchDataList('notice',{
121
+      http
122
+        .bpmFetchDataList("notice", {
119 123
           idx: 0,
120 124
           sum: 4
121 125
         })
122 126
         .then(function(res) {
123 127
           // alert(JSON.stringify(res.data))
124 128
           that.newNoticeLoading = false;
125
-          if (res.data.list&&res.data.list.length > 0) {
129
+          if (res.data.list && res.data.list.length > 0) {
126 130
             that.newNoticeNoData = false;
127 131
             that.noticeData = res.data.list;
128 132
           } else {
@@ -133,7 +137,8 @@ export default {
133 137
     // 获取最新报修
134 138
     getNewRapir() {
135 139
       var that = this;
136
-      http.bpmFetchDataList('wxincident',{
140
+      http
141
+        .bpmFetchDataList("wxincident", {
137 142
           wxincident: { state: "未转换" },
138 143
           idx: 0,
139 144
           sum: 2

+ 1 - 1
src/views/wxChartDetail.vue

@@ -18,7 +18,7 @@
18 18
             </p>
19 19
             <p>
20 20
               <span>报修地址:</span>
21
-              <span>{{model.area.area||''}} {{model.place.place||''}} {{model.houseNumber||''}}</span>
21
+              <span>{{model.area?model.area.area:''}} {{model.place?model.place.place:''}} {{model.houseNumber||''}}</span>
22 22
             </p>
23 23
             <p class="desc">
24 24
               <span>报修描述:</span>

+ 72 - 36
src/views/wxChartList.vue

@@ -18,25 +18,55 @@
18 18
             @pulling-up="onPullingUp"
19 19
           >
20 20
             <div class="conentBox">
21
-              <div class="conent" v-for="item in items" @click="toIncidentDetails(item)">
21
+              <div
22
+                class="conent"
23
+                v-for="item in items"
24
+                @click="toIncidentDetails(item)"
25
+              >
22 26
                 <div class="center">
23 27
                   <p class="desc">
24
-                    <span class="fl"><i class="iconfont dsit-baoxiuliebiao newPapir"></i> 事件描述:</span>
25
-                    <span class="grayFont overflowEllipsis2" v-html="item.incidentDescription"></span>
26
-                    <span :class="{'btn':true,'bushouli':item.state=='不受理','yizhuanhuan':item.state=='已转换','weizhuanhuan':item.state=='未转换','yijiejue':item.state=='已解决','chulizhong':item.state=='处理中','daipingjia':item.state=='待评价'}">{{item.state}}</span>
28
+                    <span class="fl"
29
+                      ><i class="iconfont dsit-baoxiuliebiao newPapir"></i>
30
+                      事件描述:</span
31
+                    >
32
+                    <span
33
+                      class="grayFont overflowEllipsis2"
34
+                      v-html="item.incidentDescription"
35
+                    ></span>
36
+                    <span
37
+                      :class="{
38
+                        btn: true,
39
+                        bushouli: item.state == '不受理',
40
+                        yizhuanhuan: item.state == '已转换',
41
+                        weizhuanhuan: item.state == '未转换',
42
+                        yijiejue: item.state == '已解决',
43
+                        chulizhong: item.state == '处理中',
44
+                        daipingjia: item.state == '待评价'
45
+                      }"
46
+                      >{{ item.state }}</span
47
+                    >
27 48
                   </p>
28 49
                   <p>
29 50
                     <span class="fl">区域地点:</span>
30
-                    <span class="grayFont">{{item.place.place}} {{item.place.areas.area}}</span>
51
+                    <span class="grayFont"
52
+                      >{{ item.place ? item.place.place : "" }}
53
+                      {{
54
+                        item.place
55
+                          ? item.place.areas
56
+                            ? item.place.areas.area
57
+                            : ""
58
+                          : ""
59
+                      }}</span
60
+                    >
31 61
                   </p>
32 62
                 </div>
33 63
                 <div class="bottom">
34
-                  <span class="fl">报修人: {{item.requester.name}}</span>
35
-                  <span class="fr">{{item.createTime}}</span>
64
+                  <span class="fl">报修人: {{ item.requester.name }}</span>
65
+                  <span class="fr">{{ item.createTime }}</span>
36 66
                 </div>
37 67
               </div>
38 68
               <div class="wushuju" v-show="wushuju">
39
-                <img src="./../../static/images/quesheng.png" alt>
69
+                <img src="./../../static/images/quesheng.png" alt />
40 70
                 <p>暂无报障</p>
41 71
               </div>
42 72
             </div>
@@ -49,9 +79,14 @@
49 79
                 <div
50 80
                   v-show="props.beforePullDown"
51 81
                   class="before-trigger"
52
-                  :style="{paddingTop: props.bubbleY + 'px'}"
82
+                  :style="{ paddingTop: props.bubbleY + 'px' }"
53 83
                 >
54
-                  <span :class="{rotate: props.bubbleY > pullDownRefreshThreshold - 80}">↓</span>
84
+                  <span
85
+                    :class="{
86
+                      rotate: props.bubbleY > pullDownRefreshThreshold - 80
87
+                    }"
88
+                    >↓</span
89
+                  >
55 90
                 </div>
56 91
                 <div class="after-trigger" v-show="!props.beforePullDown">
57 92
                   <div v-show="props.isPullingDown" class="loading">
@@ -67,7 +102,7 @@
67 102
         </div>
68 103
       </div>
69 104
     </div>
70
-    <load-ing v-show="!items.length&&!wushuju"></load-ing>
105
+    <load-ing v-show="!items.length && !wushuju"></load-ing>
71 106
   </div>
72 107
 </template>
73 108
 <script>
@@ -78,7 +113,7 @@ import InputOption from "../components/input-option";
78 113
 import SelectOption from "../components/select-option";
79 114
 import { formatDate } from "./../components/js/date.js";
80 115
 import LoadIng from "./../views/loading.vue";
81
-import http from "../request/http"
116
+import http from "../request/http";
82 117
 export default {
83 118
   data() {
84 119
     return {
@@ -172,25 +207,26 @@ export default {
172 207
     },
173 208
     toIncidentDetails(data) {
174 209
       this.$router.push({
175
-        name: 'WxChartDetail',
210
+        name: "WxChartDetail",
176 211
         params: {
177
-          data: data,
212
+          data: data
178 213
         }
179 214
       });
180 215
     },
181 216
 
182 217
     getData() {
183 218
       var that = this;
184
-      http.bpmFetchDataList('wxincident',{
185
-          wxincident:{state: that.searchType},
219
+      http
220
+        .bpmFetchDataList("wxincident", {
221
+          wxincident: { state: that.searchType },
186 222
           idx: that.idx,
187 223
           sum: that.sum
188 224
         })
189 225
         .then(function(res) {
190
-          if (res.data.list&&res.data.list.length > 0) {
226
+          if (res.data.list && res.data.list.length > 0) {
191 227
             that.wushuju = false;
192 228
             that.items = that.items.concat(res.data.list);
193
-          } else if(res.data.list.length <= 0) {
229
+          } else if (res.data.list.length <= 0) {
194 230
             that.wushuju = true;
195 231
           }
196 232
           that.loadShow = false;
@@ -363,12 +399,12 @@ export default {
363 399
   }
364 400
 }
365 401
 </style>
366
-<style lang='less' scoped>
402
+<style lang="less" scoped>
367 403
 .cont {
368 404
   margin-top: 1.86rem;
369 405
 }
370 406
 .scroll-list-wrap {
371
-  padding-top: .88rem;
407
+  padding-top: 0.88rem;
372 408
 }
373 409
 .stateSearch {
374 410
   width: 100%;
@@ -508,21 +544,21 @@ export default {
508 544
       border-bottom: 0.01rem solid #e6e6e6;
509 545
       padding: 0.24rem 0.48rem;
510 546
       p {
511
-          padding-left: .43rem;
512
-        &.desc{
513
-            padding-left: 0;
514
-            position: relative;
515
-            overflow: hidden;
516
-            max-height: .88rem;
517
-            padding-right: 1.2rem;
518
-            .iconfont{
519
-                color: #01559d;
520
-            }
521
-            .btn{
522
-                position: absolute;
523
-                right: 0;
524
-                top: .03rem;
525
-            }
547
+        padding-left: 0.43rem;
548
+        &.desc {
549
+          padding-left: 0;
550
+          position: relative;
551
+          overflow: hidden;
552
+          max-height: 0.88rem;
553
+          padding-right: 1.2rem;
554
+          .iconfont {
555
+            color: #01559d;
556
+          }
557
+          .btn {
558
+            position: absolute;
559
+            right: 0;
560
+            top: 0.03rem;
561
+          }
526 562
         }
527 563
         .grayFont {
528 564
           overflow-x: scroll;
@@ -540,4 +576,4 @@ export default {
540 576
     }
541 577
   }
542 578
 }
543
-</style>
579
+</style>