Browse Source

折改曲

zbb 1 year ago
parent
commit
3a8ff3c359

+ 2 - 2
src/pages/index/components/berth_peration_nalysis.vue

@@ -13,7 +13,7 @@
13 13
           :dataset="linedata"
14 14
           :tooltipFormat="lineTooltipFormat"
15 15
           :encode="[
16
-              { x: 'month', y: 'lastAmount', seriesName: '泊位盈余情况' },
16
+              { x: 'month', y: 'lastAmount', seriesName: '泊位盈余情况',bool:'true' },
17 17
             ]"
18 18
           id="sxcyfzqk"
19 19
         />
@@ -29,7 +29,7 @@
29 29
           :dataset="linedata1"
30 30
           :tooltipFormat="lineTooltipFormat1"
31 31
           :encode="[
32
-              { x: 'month', y: 'lastAmount', seriesName: '泊位周转率分析' }
32
+              { x: 'month', y: 'lastAmount', seriesName: '泊位周转率分析',bool:'true' }
33 33
             ]"
34 34
           id="sxcyfzqk1"
35 35
         />

+ 2 - 2
src/pages/index/components/berth_road.vue

@@ -65,8 +65,8 @@
65 65
           :dataset="linedata"
66 66
           :tooltipFormat="lineTooltipFormat"
67 67
           :encode="[
68
-              { x: 'month', y: 'lastYearAmount', seriesName: '泊位收入' },
69
-              { x: 'month', y: 'thisYearAmount', seriesName: '总体收入' },
68
+              { x: 'month', y: 'lastYearAmount', seriesName: '泊位收入',bool:'true' },
69
+              { x: 'month', y: 'thisYearAmount', seriesName: '总体收入',bool:'true' },
70 70
             ]"
71 71
           id="sxcyfzqk"
72 72
         />

+ 2 - 2
src/pages/index/components/berth_road_out.vue

@@ -65,8 +65,8 @@
65 65
           :dataset="linedata"
66 66
           :tooltipFormat="lineTooltipFormat"
67 67
           :encode="[
68
-              { x: 'month', y: 'lastYearAmount', seriesName: '泊位收入' },
69
-              { x: 'month', y: 'thisYearAmount', seriesName: '总体收入' },
68
+              { x: 'month', y: 'lastYearAmount', seriesName: '泊位收入',bool:'true' },
69
+              { x: 'month', y: 'thisYearAmount', seriesName: '总体收入',bool:'true' },
70 70
             ]"
71 71
           id="sxcyfzqk"
72 72
         />

+ 10 - 10
src/pages/index/components/berths_revenue.vue

@@ -45,8 +45,8 @@
45 45
           :dataset="linedata"
46 46
           :tooltipFormat="lineTooltipFormat"
47 47
           :encode="[
48
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场' },
49
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场' },
48
+              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
49
+              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
50 50
             ]"
51 51
           id="axstj"
52 52
         />
@@ -67,8 +67,8 @@
67 67
           :dataset="linedata2"
68 68
           :tooltipFormat="lineTooltipFormat"
69 69
           :encode="[
70
-                { x: 'month', y: 'lastYearAmount', seriesName: '入场' },
71
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场' },
70
+                { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
71
+              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
72 72
             ]"
73 73
           id="artj"
74 74
         />
@@ -89,8 +89,8 @@
89 89
           :dataset="linedata3"
90 90
           :tooltipFormat="lineTooltipFormat"
91 91
           :encode="[
92
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场' },
93
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场' },
92
+              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
93
+              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
94 94
             ]"
95 95
           id="aztj"
96 96
         />
@@ -111,8 +111,8 @@
111 111
           :dataset="linedata4"
112 112
           :tooltipFormat="lineTooltipFormat"
113 113
           :encode="[
114
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场' },
115
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场' },
114
+              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
115
+              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
116 116
             ]"
117 117
           id="aytj"
118 118
         />
@@ -133,8 +133,8 @@
133 133
           :dataset="linedata2"
134 134
           :tooltipFormat="lineTooltipFormat"
135 135
           :encode="[
136
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场' },
137
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场' },
136
+              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
137
+              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
138 138
             ]"
139 139
           id="antj"
140 140
         />

+ 20 - 20
src/pages/index/components/berths_usage.vue

@@ -42,10 +42,10 @@
42 42
           :dataset="linedata"
43 43
           :tooltipFormat="lineTooltipFormat"
44 44
           :encode="[
45
-              { x: 'month', y: 'comeIn', seriesName: '入场(路内)' },
46
-              { x: 'month', y: 'comeOut', seriesName: '入场(路外)' },
47
-              { x: 'month', y: 'leftIn', seriesName: '出场(路内)' },
48
-              { x: 'month', y: 'leftOut', seriesName: '出场(路外)' },
45
+              { x: 'month', y: 'comeIn', seriesName: '入场(路内)',bool:'true' },
46
+              { x: 'month', y: 'comeOut', seriesName: '入场(路外)',bool:'true' },
47
+              { x: 'month', y: 'leftIn', seriesName: '出场(路内)',bool:'true' },
48
+              { x: 'month', y: 'leftOut', seriesName: '出场(路外)',bool:'true' },
49 49
             ]"
50 50
           id="axstj"
51 51
         />
@@ -66,10 +66,10 @@
66 66
           :dataset="linedata2"
67 67
           :tooltipFormat="lineTooltipFormat"
68 68
           :encode="[
69
-              { x: 'month', y: 'comeIn', seriesName: '入场(路内)' },
70
-              { x: 'month', y: 'comeOut', seriesName: '入场(路外)' },
71
-              { x: 'month', y: 'leftIn', seriesName: '出场(路内)' },
72
-              { x: 'month', y: 'leftOut', seriesName: '出场(路外)' },
69
+              { x: 'month', y: 'comeIn', seriesName: '入场(路内)',bool:'true' },
70
+              { x: 'month', y: 'comeOut', seriesName: '入场(路外)',bool:'true' },
71
+              { x: 'month', y: 'leftIn', seriesName: '出场(路内)',bool:'true' },
72
+              { x: 'month', y: 'leftOut', seriesName: '出场(路外)',bool:'true' },
73 73
             ]"
74 74
           id="artj"
75 75
         />
@@ -90,10 +90,10 @@
90 90
           :dataset="linedata3"
91 91
           :tooltipFormat="lineTooltipFormat"
92 92
           :encode="[
93
-              { x: 'month', y: 'comeIn', seriesName: '入场(路内)' },
94
-              { x: 'month', y: 'comeOut', seriesName: '入场(路外)' },
95
-              { x: 'month', y: 'leftIn', seriesName: '出场(路内)' },
96
-              { x: 'month', y: 'leftOut', seriesName: '出场(路外)' },
93
+              { x: 'month', y: 'comeIn', seriesName: '入场(路内)',bool:'true' },
94
+              { x: 'month', y: 'comeOut', seriesName: '入场(路外)',bool:'true' },
95
+              { x: 'month', y: 'leftIn', seriesName: '出场(路内)',bool:'true' },
96
+              { x: 'month', y: 'leftOut', seriesName: '出场(路外)',bool:'true' },
97 97
             ]"
98 98
           id="aztj"
99 99
         />
@@ -114,10 +114,10 @@
114 114
           :dataset="linedata4"
115 115
           :tooltipFormat="lineTooltipFormat"
116 116
           :encode="[
117
-              { x: 'month', y: 'comeIn', seriesName: '入场(路内)' },
118
-              { x: 'month', y: 'comeOut', seriesName: '入场(路外)' },
119
-              { x: 'month', y: 'leftIn', seriesName: '出场(路内)' },
120
-              { x: 'month', y: 'leftOut', seriesName: '出场(路外)' },
117
+              { x: 'month', y: 'comeIn', seriesName: '入场(路内)',bool:'true' },
118
+              { x: 'month', y: 'comeOut', seriesName: '入场(路外)',bool:'true' },
119
+              { x: 'month', y: 'leftIn', seriesName: '出场(路内)',bool:'true' },
120
+              { x: 'month', y: 'leftOut', seriesName: '出场(路外)',bool:'true' },
121 121
             ]"
122 122
           id="aytj"
123 123
         />
@@ -138,10 +138,10 @@
138 138
           :dataset="linedata2"
139 139
           :tooltipFormat="lineTooltipFormat"
140 140
           :encode="[
141
-              { x: 'month', y: 'comeIn', seriesName: '入场(路内)' },
142
-              { x: 'month', y: 'comeOut', seriesName: '入场(路外)' },
143
-              { x: 'month', y: 'leftIn', seriesName: '出场(路内)' },
144
-              { x: 'month', y: 'leftOut', seriesName: '出场(路外)' },
141
+              { x: 'month', y: 'comeIn', seriesName: '入场(路内)',bool:'true' },
142
+              { x: 'month', y: 'comeOut', seriesName: '入场(路外)',bool:'true' },
143
+              { x: 'month', y: 'leftIn', seriesName: '出场(路内)',bool:'true' },
144
+              { x: 'month', y: 'leftOut', seriesName: '出场(路外)',bool:'true' },
145 145
             ]"
146 146
           id="antj"
147 147
         />

+ 2 - 2
src/pages/index/components/customer_complaint.vue

@@ -126,8 +126,8 @@ export default {
126 126
           key: 'disposeState'
127 127
         },
128 128
         {
129
-          label: '处理结束时间状态',
130
-          key: 'endDisposeTime'
129
+          label: '处理时间',
130
+          key: 'disposeTime'
131 131
         }
132 132
       ],
133 133
       modelPieColor: ["#4382f6","#9078f8","#C1FFC1","#1E90FF"],

+ 1 - 1
src/pages/index/components/message.vue

@@ -55,7 +55,7 @@ export default {
55 55
         },
56 56
         {
57 57
           label: '发布时间',
58
-          key: 'endPublishDate'
58
+          key: 'publishDate'
59 59
         },
60 60
       ],
61 61
       tableData: [],

+ 12 - 12
src/pages/index/components/operation_log.vue

@@ -40,13 +40,13 @@
40 40
       </el-table-column>
41 41
       <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
42 42
       </el-table-column>
43
-      <el-table-column
44
-        label="操作"
45
-        width="100">
46
-        <template slot-scope="scope">
47
-          <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleDetail(scope.row)" type="text" size="small">查看详情</el-button>
48
-        </template>
49
-      </el-table-column>
43
+<!--      <el-table-column-->
44
+<!--        label="操作"-->
45
+<!--        width="100">-->
46
+<!--        <template slot-scope="scope">-->
47
+<!--          <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleDetail(scope.row)" type="text" size="small">查看详情</el-button>-->
48
+<!--        </template>-->
49
+<!--      </el-table-column>-->
50 50
     </el-table>
51 51
     <div class="table-pagination">
52 52
       <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
@@ -72,23 +72,23 @@ export default {
72 72
       columns: [
73 73
         {
74 74
           label: '日期',
75
-          key: 'resourceName'
75
+          key: 'createTime'
76 76
         },
77 77
         {
78 78
           label: '操作',
79
-          key: 'resourceType'
79
+          key: 'operateType'
80 80
         },
81 81
         {
82 82
           label: '用户',
83
-          key: 'userName'
83
+          key: 'operateDetails'
84 84
         },
85 85
         {
86 86
           label: '详情',
87
-          key: 'applyTypeText'
87
+          key: 'operateDetails'
88 88
         },
89 89
         {
90 90
           label: 'IP地址',
91
-          key: 'applyTypeText'
91
+          key: 'ipAddress'
92 92
         }
93 93
       ],
94 94
       tableData: [],

+ 1 - 1
src/pages/index/components/other_analyse.vue

@@ -120,7 +120,7 @@
120 120
           :dataset="cllfx"
121 121
           :tooltipFormat="lineTooltipFormat4"
122 122
           :encode="[
123
-              { x: 'month', y: 'lastAmount', seriesName: '车流量' },
123
+              { x: 'month', y: 'lastAmount', seriesName: '车流量' ,bool:'true'},
124 124
             ]"
125 125
           id="cllfx"
126 126
         />

+ 2 - 2
src/pages/index/components/park_bahavior.vue

@@ -31,8 +31,8 @@
31 31
           :dataset="linedata"
32 32
           :tooltipFormat="lineTooltipFormat"
33 33
           :encode="[
34
-              { x: 'month', y: 'lastYearAmount', seriesName: '入场' },
35
-              { x: 'month', y: 'thisYearAmount', seriesName: '出场' },
34
+              { x: 'month', y: 'lastYearAmount', seriesName: '入场',bool:'true' },
35
+              { x: 'month', y: 'thisYearAmount', seriesName: '出场',bool:'true' },
36 36
             ]"
37 37
           id="sxcyfzqk"
38 38
         />

+ 1 - 1
src/pages/index/components/park_development_analysis.vue

@@ -2,7 +2,7 @@
2 2
   <div>
3 3
     <div style="color: #d5d3d3" class="middle-map">
4 4
       <div align="center" style="color: #3498db;font-size: 23px;margin-bottom: 20px">区域综合评估</div>
5
-      <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
5
+      <el-table :data="tableData1" style="background: #2a2a2a;border-color: #333;">
6 6
         <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
7 7
         </el-table-column>
8 8
       </el-table>

+ 2 - 2
src/pages/index/components/parking_operate.vue

@@ -52,8 +52,8 @@
52 52
           :dataset="linedata"
53 53
           :tooltipFormat="lineTooltipFormat"
54 54
           :encode="[
55
-              { x: 'month', y: 'lastYearAmount', seriesName: '泊位收入' },
56
-              { x: 'month', y: 'thisYearAmount', seriesName: '总体收入' },
55
+              { x: 'month', y: 'lastYearAmount', seriesName: '泊位收入',bool:'true' },
56
+              { x: 'month', y: 'thisYearAmount', seriesName: '总体收入',bool:'true' },
57 57
             ]"
58 58
           id="sxcyfzqk"
59 59
         />

+ 7 - 7
src/pages/index/components/record_query.vue

@@ -69,13 +69,13 @@
69 69
         <el-table :data="tableData3">
70 70
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
71 71
           </el-table-column>
72
-          <el-table-column
73
-            label="操作"
74
-            width="100">
75
-            <template slot-scope="scope">
76
-              <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleAudit(scope.row)" type="text" size="small">审核</el-button>
77
-            </template>
78
-          </el-table-column>
72
+<!--          <el-table-column-->
73
+<!--            label="操作"-->
74
+<!--            width="100">-->
75
+<!--            <template slot-scope="scope">-->
76
+<!--              <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleAudit(scope.row)" type="text" size="small">审核</el-button>-->
77
+<!--            </template>-->
78
+<!--          </el-table-column>-->
79 79
         </el-table>
80 80
         <div class="table-pagination">
81 81
           <el-pagination layout="prev, pager, next" :total="total3" @current-change="handlePageChange3"

+ 1 - 1
src/pages/index/components/static_resource.vue

@@ -198,7 +198,7 @@ export default {
198 198
         },
199 199
         {
200 200
           label: '合作截止日期',
201
-          key: 'endEndDate'
201
+          key: 'endDate'
202 202
         }
203 203
       ],
204 204
       columns6: [