65b96fd6 by 焦小希

修改了表格数据请求渲染回来,表格出现无数据的bug,优化了整体工程中表格的样式问题。注释了下拉框的值。

1 parent c1a66e0a
...@@ -49,7 +49,6 @@ var self = new Vue({ ...@@ -49,7 +49,6 @@ var self = new Vue({
49 this.getData() 49 this.getData()
50 }, 50 },
51 handleCurrentChange(pageNum){ 51 handleCurrentChange(pageNum){
52 alert(pageNum)
53 this.pageNum = pageNum 52 this.pageNum = pageNum
54 this.getData() 53 this.getData()
55 }, 54 },
...@@ -80,10 +79,7 @@ var self = new Vue({ ...@@ -80,10 +79,7 @@ var self = new Vue({
80 } 79 }
81 this.total = result.length; 80 this.total = result.length;
82 this.tabaledata = result.slice((this.pageNum - 1) * this.pageSize, (this.pageNum - 1) * this.pageSize + this.pageSize); 81 this.tabaledata = result.slice((this.pageNum - 1) * this.pageSize, (this.pageNum - 1) * this.pageSize + this.pageSize);
83
84
85 }); 82 });
86
87 }, 83 },
88 clickData(row){ 84 clickData(row){
89 this.jumpdetailPage(row) 85 this.jumpdetailPage(row)
......
...@@ -121,87 +121,89 @@ ...@@ -121,87 +121,89 @@
121 </el-col> 121 </el-col>
122 </el-row> 122 </el-row>
123 <!-- 列表区域--> 123 <!-- 列表区域-->
124 <el-table 124 <div v-if="tabaledata.length!=0">
125 :data="tabaledata" 125 <el-table
126 style="width: 100%;margin-top:10px;" 126 :data="tabaledata"
127 height="100%" 127 style="width: 100%;margin-top:10px;"
128 border 128 height="100%"
129 stripe 129 border
130 @row-click="clickData" 130 stripe
131 @selection-change="handleSelectionChange" 131 @row-click="clickData"
132 > 132 @selection-change="handleSelectionChange"
133 <el-table-column
134 type="selection"
135 width="55">
136 </el-table-column>
137 <el-table-column
138 prop="PHXMBH"
139 width="130"
140 label="项目编号"
141 align="center"
142 ></el-table-column>
143 <el-table-column
144 prop="PHXMMC"
145 label="项目名称"
146 align="center"
147 width="400"
148 > 133 >
149 </el-table-column> 134 <el-table-column
150 <el-table-column 135 type="selection"
151 prop="PHDJBH" 136 width="55">
152 label="地籍编号" 137 </el-table-column>
153 align="center" 138 <el-table-column
154 width="100" 139 prop="PHXMBH"
155 > 140 width="130"
156 </el-table-column> 141 label="项目编号"
157 <el-table-column 142 align="center"
158 prop="PHYDMJ" 143 ></el-table-column>
159 label="用地面积(亩)" 144 <el-table-column
160 align="center" 145 prop="PHXMMC"
161 width="180" 146 label="项目名称"
162 > 147 align="center"
163 </el-table-column> 148 width="400"
164 <el-table-column 149 >
165 prop="PHZDWZ" 150 </el-table-column>
166 label="宗地位置" 151 <el-table-column
167 align="center" 152 prop="PHDJBH"
168 width="387" 153 label="地籍编号"
169 > 154 align="center"
170 </el-table-column> 155 width="100"
171 <el-table-column 156 >
172 prop="PHTDYT" 157 </el-table-column>
173 label="土地用途" 158 <el-table-column
174 align="center" 159 prop="PHYDMJ"
175 width="150" 160 label="用地面积(亩)"
176 > 161 align="center"
177 </el-table-column> 162 width="180"
178 <!-- <el-table-column 163 >
179 prop="PHZRDW" 164 </el-table-column>
180 label="责任单位" 165 <el-table-column
181 align="center" 166 prop="PHZDWZ"
182 width="100" 167 label="宗地位置"
183 > 168 align="center"
184 </el-table-column>--> 169 width="387"
185 <el-table-column 170 >
186 prop="PHSSQY" 171 </el-table-column>
187 label="所属区域" 172 <el-table-column
188 align="center" 173 prop="PHTDYT"
189 width="100" 174 label="土地用途"
190 > 175 align="center"
191 </el-table-column> 176 width="150"
192 <el-table-column 177 >
193 prop="CREATETIME" 178 </el-table-column>
194 label="创建时间" 179 <!-- <el-table-column
195 align="center" 180 prop="PHZRDW"
196 width="218" 181 label="责任单位"
197 > 182 align="center"
198 <template slot-scope="scope"> 183 width="100"
199 <span>{{ 184 >
200 scope.row.CREATETIME | dataFormat 185 </el-table-column>-->
201 }}</span> 186 <el-table-column
202 </template> 187 prop="PHSSQY"
203 </el-table-column> 188 label="所属区域"
204 </el-table> 189 align="center"
190 width="100"
191 >
192 </el-table-column>
193 <el-table-column
194 prop="CREATETIME"
195 label="创建时间"
196 align="center"
197 width="218"
198 >
199 <template slot-scope="scope">
200 <span>{{
201 scope.row.CREATETIME | dataFormat
202 }}</span>
203 </template>
204 </el-table-column>
205 </el-table>
206 </div>
205 <!-- 分页区域--> 207 <!-- 分页区域-->
206 208
207 </div> 209 </div>
......
...@@ -121,87 +121,90 @@ ...@@ -121,87 +121,90 @@
121 </el-col> 121 </el-col>
122 </el-row> 122 </el-row>
123 <!-- 列表区域--> 123 <!-- 列表区域-->
124 <el-table 124 <div v-if ="tabaledata.length!=0">
125 :data="tabaledata" 125 <el-table
126 style="width: 100%;margin-top:10px;" 126 :data="tabaledata"
127 height="100%" 127 style="width: 100%;margin-top:10px;"
128 border 128 height="100%"
129 stripe 129 border
130 @row-click="clickData" 130 stripe
131 @selection-change="handleSelectionChange" 131 @row-click="clickData"
132 > 132 @selection-change="handleSelectionChange"
133 <el-table-column
134 type="selection"
135 width="55">
136 </el-table-column>
137 <el-table-column
138 prop="PHXMBH"
139 width="130"
140 label="项目编号"
141 align="center"
142 ></el-table-column>
143 <el-table-column
144 prop="PHXMMC"
145 label="项目名称"
146 align="center"
147 width="400"
148 > 133 >
149 </el-table-column> 134 <el-table-column
150 <el-table-column 135 type="selection"
151 prop="PHDJBH" 136 width="55">
152 label="地籍编号" 137 </el-table-column>
153 align="center" 138 <el-table-column
154 width="100" 139 prop="PHXMBH"
155 > 140 width="130"
156 </el-table-column> 141 label="项目编号"
157 <el-table-column 142 align="center"
158 prop="PHYDMJ" 143 ></el-table-column>
159 label="用地面积(亩)" 144 <el-table-column
160 align="center" 145 prop="PHXMMC"
161 width="180" 146 label="项目名称"
162 > 147 align="center"
163 </el-table-column> 148 width="400"
164 <el-table-column 149 >
165 prop="PHZDWZ" 150 </el-table-column>
166 label="宗地位置" 151 <el-table-column
167 align="center" 152 prop="PHDJBH"
168 width="400" 153 label="地籍编号"
169 > 154 align="center"
170 </el-table-column> 155 width="100"
171 <el-table-column 156 >
172 prop="PHTDYT" 157 </el-table-column>
173 label="土地用途" 158 <el-table-column
174 align="center" 159 prop="PHYDMJ"
175 width="150" 160 label="用地面积(亩)"
176 > 161 align="center"
177 </el-table-column> 162 width="180"
178 <!-- <el-table-column 163 >
179 prop="PHZZDW" 164 </el-table-column>
180 label="责任单位" 165 <el-table-column
181 align="center" 166 prop="PHZDWZ"
182 width="100" 167 label="宗地位置"
183 > 168 align="center"
184 </el-table-column>--> 169 width="400"
185 <el-table-column 170 >
186 prop="PHSSQY" 171 </el-table-column>
187 label="所属区域" 172 <el-table-column
188 align="center" 173 prop="PHTDYT"
189 width="100" 174 label="土地用途"
190 > 175 align="center"
191 </el-table-column> 176 width="150"
192 <el-table-column 177 >
193 prop="CREATETIME" 178 </el-table-column>
194 label="创建时间" 179 <!-- <el-table-column
195 align="center" 180 prop="PHZZDW"
196 width="180" 181 label="责任单位"
197 > 182 align="center"
198 <template slot-scope="scope"> 183 width="100"
184 >
185 </el-table-column>-->
186 <el-table-column
187 prop="PHSSQY"
188 label="所属区域"
189 align="center"
190 width="115"
191 >
192 </el-table-column>
193 <el-table-column
194 prop="CREATETIME"
195 label="创建时间"
196 align="center"
197 width="180"
198 >
199 <template slot-scope="scope">
199 <span>{{ 200 <span>{{
200 scope.row.CREATETIME | dataFormat 201 scope.row.CREATETIME | dataFormat
201 }}</span> 202 }}</span>
202 </template> 203 </template>
203 </el-table-column> 204 </el-table-column>
204 </el-table> 205 </el-table>
206 </div>
207
205 <!-- 分页区域--> 208 <!-- 分页区域-->
206 <div class="block"> 209 <div class="block">
207 <el-pagination 210 <el-pagination
......
...@@ -5,24 +5,24 @@ var self = new Vue({ ...@@ -5,24 +5,24 @@ var self = new Vue({
5 FloatRightTitle: '图片', 5 FloatRightTitle: '图片',
6 imgtabaledata: [ 6 imgtabaledata: [
7 { 7 {
8 wjmc: '微信截图.png', 8 wjmc: '昆仑东路辅路违法搭建现场拍照(1).jpg',
9 size: '5k', 9 size: '5k',
10 scsj: '2020-8-06' 10 scsj: '2020-8-06'
11 }, 11 },
12 { 12 {
13 wjmc: '微信截图.png', 13 wjmc: '昆仑东路辅路违法搭建现场拍照(2)jpg',
14 size: '5k', 14 size: '5k',
15 scsj: '2020-8-06' 15 scsj: '2020-8-06'
16 } 16 }
17 ], 17 ],
18 filetabeldata: [ 18 filetabeldata: [
19 { 19 {
20 wjmc: 'test.txt', 20 wjmc: '昆仑东路违法占道搭建便民市场汇总文档(1).txt',
21 size: '15k', 21 size: '10k',
22 scsj: '2020-8-01' 22 scsj: '2020-8-01'
23 }, 23 },
24 { 24 {
25 wjmc: '违法结果.txt', 25 wjmc: '昆仑东路违法占道搭建便民市场汇总文档(2).txt',
26 size: '10k', 26 size: '10k',
27 scsj: '2020-8-01' 27 scsj: '2020-8-01'
28 }, 28 },
......
...@@ -123,64 +123,65 @@ ...@@ -123,64 +123,65 @@
123 </el-col> 123 </el-col>
124 </el-row> 124 </el-row>
125 <!-- 列表区域--> 125 <!-- 列表区域-->
126 <el-table 126 <div v-if="tabaledata.length!=0">
127 :data="tabaledata" 127 <el-table
128 style="width: 100%;margin-top:10px;" 128 :data="tabaledata"
129 height="100%" 129 style="width: 100%;margin-top:10px;"
130 border 130 height="100%"
131 stripe 131 border
132 @row-click="clickData" 132 stripe
133 @selection-change="handleSelectionChange" 133 @row-click="clickData"
134 > 134 @selection-change="handleSelectionChange"
135 <el-table-column
136 type="selection"
137 width="55">
138 </el-table-column>
139 <el-table-column
140 prop="procjectName"
141 width="330"
142 label="项目名称"
143 align="center"
144 ></el-table-column>
145 <el-table-column
146 prop="procjectAddress"
147 label="项目地址"
148 align="center"
149 width="450"
150 > 135 >
151 </el-table-column> 136 <el-table-column
152 <el-table-column 137 type="selection"
153 prop="taskYear" 138 width="55">
154 label="任务年份" 139 </el-table-column>
155 align="center" 140 <el-table-column
156 width="100" 141 prop="procjectName"
157 > 142 width="330"
158 </el-table-column> 143 label="项目名称"
159 <el-table-column 144 align="center"
160 prop="dutyUnit" 145 ></el-table-column>
161 label="责任单位" 146 <el-table-column
162 align="center" 147 prop="procjectAddress"
163 width="300" 148 label="项目地址"
164 > 149 align="center"
165 </el-table-column> 150 width="450"
166 <el-table-column 151 >
167 prop="distict" 152 </el-table-column>
168 label="所属区域" 153 <el-table-column
169 align="center" 154 prop="taskYear"
170 width="200" 155 label="任务年份"
171 > 156 align="center"
172 </el-table-column> 157 width="100"
173 <el-table-column 158 >
174 prop="evdlveStage" 159 </el-table-column>
175 label="进展阶段" 160 <el-table-column
176 align="center" 161 prop="dutyUnit"
177 width="275" 162 label="责任单位"
178 > 163 align="center"
179 </el-table-column> 164 width="300"
180 </el-table> 165 >
181 <!-- 分页区域--> 166 </el-table-column>
182 167 <el-table-column
168 prop="distict"
169 label="所属区域"
170 align="center"
171 width="200"
172 >
173 </el-table-column>
174 <el-table-column
175 prop="evdlveStage"
176 label="进展阶段"
177 align="center"
178 width="275"
179 >
180 </el-table-column>
181 </el-table>
182 </div>
183 </div> 183 </div>
184 <!-- 分页区域-->
184 <div class="block"> 185 <div class="block">
185 <el-pagination 186 <el-pagination
186 @size-change="handleSizeChange" 187 @size-change="handleSizeChange"
......
...@@ -146,31 +146,31 @@ ...@@ -146,31 +146,31 @@
146 </div> 146 </div>
147 147
148 <!-- 地区选择以及要素分布 --> 148 <!-- 地区选择以及要素分布 -->
149 <div class="right-top-select"> 149 <!-- <div class="right-top-select">-->
150 <div id="info-div"> 150 <!-- <div id="info-div">-->
151 <select id="region_select"> 151 <!-- <select id="region_select">-->
152 <option value="610100" selected>西安市</option> 152 <!-- <option value="610100" selected>西安市</option>-->
153 <option value="610102">新城区</option> 153 <!-- <option value="610102">新城区</option>-->
154 <option value="610103">碑林区</option> 154 <!-- <option value="610103">碑林区</option>-->
155 <option value="610104">莲湖区</option> 155 <!-- <option value="610104">莲湖区</option>-->
156 <option value="610111">灞桥区</option> 156 <!-- <option value="610111">灞桥区</option>-->
157 <option value="610112">未央区</option> 157 <!-- <option value="610112">未央区</option>-->
158 <option value="610113">雁塔区</option> 158 <!-- <option value="610113">雁塔区</option>-->
159 <option value="610114">阎良区</option> 159 <!-- <option value="610114">阎良区</option>-->
160 <option value="610115">临潼区</option> 160 <!-- <option value="610115">临潼区</option>-->
161 <option value="610116">长安区</option> 161 <!-- <option value="610116">长安区</option>-->
162 <option value="610122">蓝田县</option> 162 <!-- <option value="610122">蓝田县</option>-->
163 <option value="610124">周至县</option> 163 <!-- <option value="610124">周至县</option>-->
164 <option value="610118">鄠邑区</option> 164 <!-- <option value="610118">鄠邑区</option>-->
165 <option value="610117">高陵区</option> 165 <!-- <option value="610117">高陵区</option>-->
166 </select> 166 <!-- </select>-->
167 <div class="features"> 167 <!-- <div class="features">-->
168 <input type="checkbox" name="feature_area" id="features"> 168 <!-- <input type="checkbox" name="feature_area" id="features">-->
169 <label style="font-weight:normal">要素分布</label> 169 <!-- <label style="font-weight:normal">要素分布</label>-->
170 <!-- <input type="checkbox" name="switch" lay-skin="switch">--> 170 <!-- &lt;!&ndash; <input type="checkbox" name="switch" lay-skin="switch">&ndash;&gt;-->
171 </div> 171 <!-- </div>-->
172 </div> 172 <!-- </div>-->
173 </div> 173 <!-- </div>-->
174 <!-- 总量变化趋势echart --> 174 <!-- 总量变化趋势echart -->
175 <div class="layui-card sum-change" id="layui-card-bottom" style="opacity: 0.8"> 175 <div class="layui-card sum-change" id="layui-card-bottom" style="opacity: 0.8">
176 <div class="layui-card-header" style="height:18px">总量变化趋势</div> 176 <div class="layui-card-header" style="height:18px">总量变化趋势</div>
......