65b96fd6 by 焦小希

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

1 parent c1a66e0a
......@@ -49,7 +49,6 @@ var self = new Vue({
this.getData()
},
handleCurrentChange(pageNum){
alert(pageNum)
this.pageNum = pageNum
this.getData()
},
......@@ -80,10 +79,7 @@ var self = new Vue({
}
this.total = result.length;
this.tabaledata = result.slice((this.pageNum - 1) * this.pageSize, (this.pageNum - 1) * this.pageSize + this.pageSize);
});
},
clickData(row){
this.jumpdetailPage(row)
......
......@@ -121,87 +121,89 @@
</el-col>
</el-row>
<!-- 列表区域-->
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="PHXMBH"
width="130"
label="项目编号"
align="center"
></el-table-column>
<el-table-column
prop="PHXMMC"
label="项目名称"
align="center"
width="400"
<div v-if="tabaledata.length!=0">
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
</el-table-column>
<el-table-column
prop="PHDJBH"
label="地籍编号"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="PHYDMJ"
label="用地面积(亩)"
align="center"
width="180"
>
</el-table-column>
<el-table-column
prop="PHZDWZ"
label="宗地位置"
align="center"
width="387"
>
</el-table-column>
<el-table-column
prop="PHTDYT"
label="土地用途"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column
prop="PHZRDW"
label="责任单位"
align="center"
width="100"
>
</el-table-column>-->
<el-table-column
prop="PHSSQY"
label="所属区域"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="CREATETIME"
label="创建时间"
align="center"
width="218"
>
<template slot-scope="scope">
<span>{{
scope.row.CREATETIME | dataFormat
}}</span>
</template>
</el-table-column>
</el-table>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="PHXMBH"
width="130"
label="项目编号"
align="center"
></el-table-column>
<el-table-column
prop="PHXMMC"
label="项目名称"
align="center"
width="400"
>
</el-table-column>
<el-table-column
prop="PHDJBH"
label="地籍编号"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="PHYDMJ"
label="用地面积(亩)"
align="center"
width="180"
>
</el-table-column>
<el-table-column
prop="PHZDWZ"
label="宗地位置"
align="center"
width="387"
>
</el-table-column>
<el-table-column
prop="PHTDYT"
label="土地用途"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column
prop="PHZRDW"
label="责任单位"
align="center"
width="100"
>
</el-table-column>-->
<el-table-column
prop="PHSSQY"
label="所属区域"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="CREATETIME"
label="创建时间"
align="center"
width="218"
>
<template slot-scope="scope">
<span>{{
scope.row.CREATETIME | dataFormat
}}</span>
</template>
</el-table-column>
</el-table>
</div>
<!-- 分页区域-->
</div>
......
......@@ -121,87 +121,90 @@
</el-col>
</el-row>
<!-- 列表区域-->
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="PHXMBH"
width="130"
label="项目编号"
align="center"
></el-table-column>
<el-table-column
prop="PHXMMC"
label="项目名称"
align="center"
width="400"
<div v-if ="tabaledata.length!=0">
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
</el-table-column>
<el-table-column
prop="PHDJBH"
label="地籍编号"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="PHYDMJ"
label="用地面积(亩)"
align="center"
width="180"
>
</el-table-column>
<el-table-column
prop="PHZDWZ"
label="宗地位置"
align="center"
width="400"
>
</el-table-column>
<el-table-column
prop="PHTDYT"
label="土地用途"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column
prop="PHZZDW"
label="责任单位"
align="center"
width="100"
>
</el-table-column>-->
<el-table-column
prop="PHSSQY"
label="所属区域"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="CREATETIME"
label="创建时间"
align="center"
width="180"
>
<template slot-scope="scope">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="PHXMBH"
width="130"
label="项目编号"
align="center"
></el-table-column>
<el-table-column
prop="PHXMMC"
label="项目名称"
align="center"
width="400"
>
</el-table-column>
<el-table-column
prop="PHDJBH"
label="地籍编号"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="PHYDMJ"
label="用地面积(亩)"
align="center"
width="180"
>
</el-table-column>
<el-table-column
prop="PHZDWZ"
label="宗地位置"
align="center"
width="400"
>
</el-table-column>
<el-table-column
prop="PHTDYT"
label="土地用途"
align="center"
width="150"
>
</el-table-column>
<!-- <el-table-column
prop="PHZZDW"
label="责任单位"
align="center"
width="100"
>
</el-table-column>-->
<el-table-column
prop="PHSSQY"
label="所属区域"
align="center"
width="115"
>
</el-table-column>
<el-table-column
prop="CREATETIME"
label="创建时间"
align="center"
width="180"
>
<template slot-scope="scope">
<span>{{
scope.row.CREATETIME | dataFormat
}}</span>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
</el-table>
</div>
<!-- 分页区域-->
<div class="block">
<el-pagination
......
......@@ -5,24 +5,24 @@ var self = new Vue({
FloatRightTitle: '图片',
imgtabaledata: [
{
wjmc: '微信截图.png',
wjmc: '昆仑东路辅路违法搭建现场拍照(1).jpg',
size: '5k',
scsj: '2020-8-06'
},
{
wjmc: '微信截图.png',
wjmc: '昆仑东路辅路违法搭建现场拍照(2)jpg',
size: '5k',
scsj: '2020-8-06'
}
],
filetabeldata: [
{
wjmc: 'test.txt',
size: '15k',
wjmc: '昆仑东路违法占道搭建便民市场汇总文档(1).txt',
size: '10k',
scsj: '2020-8-01'
},
{
wjmc: '违法结果.txt',
wjmc: '昆仑东路违法占道搭建便民市场汇总文档(2).txt',
size: '10k',
scsj: '2020-8-01'
},
......
......@@ -123,64 +123,65 @@
</el-col>
</el-row>
<!-- 列表区域-->
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="procjectName"
width="330"
label="项目名称"
align="center"
></el-table-column>
<el-table-column
prop="procjectAddress"
label="项目地址"
align="center"
width="450"
<div v-if="tabaledata.length!=0">
<el-table
:data="tabaledata"
style="width: 100%;margin-top:10px;"
height="100%"
border
stripe
@row-click="clickData"
@selection-change="handleSelectionChange"
>
</el-table-column>
<el-table-column
prop="taskYear"
label="任务年份"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="dutyUnit"
label="责任单位"
align="center"
width="300"
>
</el-table-column>
<el-table-column
prop="distict"
label="所属区域"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="evdlveStage"
label="进展阶段"
align="center"
width="275"
>
</el-table-column>
</el-table>
<!-- 分页区域-->
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
prop="procjectName"
width="330"
label="项目名称"
align="center"
></el-table-column>
<el-table-column
prop="procjectAddress"
label="项目地址"
align="center"
width="450"
>
</el-table-column>
<el-table-column
prop="taskYear"
label="任务年份"
align="center"
width="100"
>
</el-table-column>
<el-table-column
prop="dutyUnit"
label="责任单位"
align="center"
width="300"
>
</el-table-column>
<el-table-column
prop="distict"
label="所属区域"
align="center"
width="200"
>
</el-table-column>
<el-table-column
prop="evdlveStage"
label="进展阶段"
align="center"
width="275"
>
</el-table-column>
</el-table>
</div>
</div>
<!-- 分页区域-->
<div class="block">
<el-pagination
@size-change="handleSizeChange"
......
......@@ -146,31 +146,31 @@
</div>
<!-- 地区选择以及要素分布 -->
<div class="right-top-select">
<div id="info-div">
<select id="region_select">
<option value="610100" selected>西安市</option>
<option value="610102">新城区</option>
<option value="610103">碑林区</option>
<option value="610104">莲湖区</option>
<option value="610111">灞桥区</option>
<option value="610112">未央区</option>
<option value="610113">雁塔区</option>
<option value="610114">阎良区</option>
<option value="610115">临潼区</option>
<option value="610116">长安区</option>
<option value="610122">蓝田县</option>
<option value="610124">周至县</option>
<option value="610118">鄠邑区</option>
<option value="610117">高陵区</option>
</select>
<div class="features">
<input type="checkbox" name="feature_area" id="features">
<label style="font-weight:normal">要素分布</label>
<!-- <input type="checkbox" name="switch" lay-skin="switch">-->
</div>
</div>
</div>
<!-- <div class="right-top-select">-->
<!-- <div id="info-div">-->
<!-- <select id="region_select">-->
<!-- <option value="610100" selected>西安市</option>-->
<!-- <option value="610102">新城区</option>-->
<!-- <option value="610103">碑林区</option>-->
<!-- <option value="610104">莲湖区</option>-->
<!-- <option value="610111">灞桥区</option>-->
<!-- <option value="610112">未央区</option>-->
<!-- <option value="610113">雁塔区</option>-->
<!-- <option value="610114">阎良区</option>-->
<!-- <option value="610115">临潼区</option>-->
<!-- <option value="610116">长安区</option>-->
<!-- <option value="610122">蓝田县</option>-->
<!-- <option value="610124">周至县</option>-->
<!-- <option value="610118">鄠邑区</option>-->
<!-- <option value="610117">高陵区</option>-->
<!-- </select>-->
<!-- <div class="features">-->
<!-- <input type="checkbox" name="feature_area" id="features">-->
<!-- <label style="font-weight:normal">要素分布</label>-->
<!-- &lt;!&ndash; <input type="checkbox" name="switch" lay-skin="switch">&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- 总量变化趋势echart -->
<div class="layui-card sum-change" id="layui-card-bottom" style="opacity: 0.8">
<div class="layui-card-header" style="height:18px">总量变化趋势</div>
......