Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
e0dc1bf1 by yangwei
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents a686fb34 04cf28fa
Inline Side-by-side
Showing 20 changed files with 122 additions and 82 deletions
...@@ -59,6 +59,9 @@ export default { ...@@ -59,6 +59,9 @@ export default {
59 initChart () { 59 initChart () {
60 // 初始化echart 60 // 初始化echart
61 this.chart = this.$echarts.init(this.$el, 'tdTheme') 61 this.chart = this.$echarts.init(this.$el, 'tdTheme')
62 function nowSize(val,initWidth=1920){
63 return val * (nowClientWidth/initWidth);
64 }
62 this.chart.setOption(this.options, true) 65 this.chart.setOption(this.options, true)
63 66
64 67
......
...@@ -35,6 +35,16 @@ export default { ...@@ -35,6 +35,16 @@ export default {
35 } 35 }
36 return rgbaColor; 36 return rgbaColor;
37 }, 37 },
38 fontSize(res) {
39 let docEl = document.documentElement,
40 clientWidth =
41 window.innerWidth ||
42 document.documentElement.clientWidth ||
43 document.body.clientWidth;
44 if (!clientWidth) return;
45 let fontSize = clientWidth / 1920;
46 return res * fontSize;
47 }
38 }, 48 },
39 watch: { 49 watch: {
40 cdata: { 50 cdata: {
...@@ -51,6 +61,7 @@ export default { ...@@ -51,6 +61,7 @@ export default {
51 data: newData.legendItem, 61 data: newData.legendItem,
52 textStyle: { 62 textStyle: {
53 color: "#00DEFF", 63 color: "#00DEFF",
64 fontSize:this.fontSize(12),
54 }, 65 },
55 }, 66 },
56 // calculable: true, 67 // calculable: true,
...@@ -97,8 +108,8 @@ export default { ...@@ -97,8 +108,8 @@ export default {
97 textStyle: { 108 textStyle: {
98 color: "rgba(255, 255, 255,0.7)", // x轴颜色 109 color: "rgba(255, 255, 255,0.7)", // x轴颜色
99 fontWeight: "normal", 110 fontWeight: "normal",
100 fontSize: "12", 111 fontSize: this.fontSize(12),
101 lineHeight: 22, 112 lineHeight: this.fontSize(22),
102 }, 113 },
103 }, 114 },
104 data: this.xAxisData, 115 data: this.xAxisData,
...@@ -136,7 +147,7 @@ export default { ...@@ -136,7 +147,7 @@ export default {
136 smooth: false, //是否平滑 147 smooth: false, //是否平滑
137 showSymbol: true, 148 showSymbol: true,
138 symbol: "circle", 149 symbol: "circle",
139 symbolSize: 6, 150 symbolSize: this.fontSize(6),
140 zlevel: 3, 151 zlevel: 3,
141 lineStyle: { 152 lineStyle: {
142 normal: { 153 normal: {
...@@ -154,7 +165,7 @@ export default { ...@@ -154,7 +165,7 @@ export default {
154 smooth: false, 165 smooth: false,
155 showSymbol: true, 166 showSymbol: true,
156 symbol: "circle", 167 symbol: "circle",
157 symbolSize: 8, 168 symbolSize: this.fontSize(8),
158 zlevel: 3, 169 zlevel: 3,
159 lineStyle: { 170 lineStyle: {
160 normal: { 171 normal: {
...@@ -172,7 +183,7 @@ export default { ...@@ -172,7 +183,7 @@ export default {
172 smooth: false, 183 smooth: false,
173 showSymbol: true, 184 showSymbol: true,
174 symbol: "circle", 185 symbol: "circle",
175 symbolSize: 8, 186 symbolSize: this.fontSize(8),
176 zlevel: 3, 187 zlevel: 3,
177 lineStyle: { 188 lineStyle: {
178 normal: { 189 normal: {
......
1 <template> 1 <template>
2 <Echart :options="options" id="centreLeft1Chart" :key="key" height="225px" width="80%"></Echart> 2 <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart>
3 </template> 3 </template>
4 <script> 4 <script>
5 import Echart from '@/common/echart' 5 import Echart from '@/common/echart'
...@@ -23,7 +23,7 @@ export default { ...@@ -23,7 +23,7 @@ export default {
23 handler (newData) { 23 handler (newData) {
24 console.log("newData",newData); 24 console.log("newData",newData);
25 this.options = { 25 this.options = {
26 grid: { 26 grid: {
27 right:"1%", 27 right:"1%",
28 bottom:"4%" 28 bottom:"4%"
29 }, 29 },
...@@ -49,7 +49,7 @@ export default { ...@@ -49,7 +49,7 @@ export default {
49 { 49 {
50 name: "业务量", 50 name: "业务量",
51 type: "pie", 51 type: "pie",
52 radius: [0,100], 52 radius: [20,100],
53 roseType: "area", 53 roseType: "area",
54 data: newData.seriesData 54 data: newData.seriesData
55 } 55 }
...@@ -67,7 +67,7 @@ export default { ...@@ -67,7 +67,7 @@ export default {
67 67
68 <style lang="scss" scoped> 68 <style lang="scss" scoped>
69 #centreLeft1Chart { 69 #centreLeft1Chart {
70 margin-bottom: 10px; 70 margin-bottom: .0521rem;
71 margin-left: 60px; 71 margin-left:60px;
72 } 72 }
73 </style> 73 </style>
......
...@@ -20,10 +20,14 @@ export default { ...@@ -20,10 +20,14 @@ export default {
20 }, 20 },
21 mounted () { 21 mounted () {
22 this.getdjywltotal(); 22 this.getdjywltotal();
23 window.addEventListener("resize", () => {
24 this.getdjywltotal();
25 });
23 }, 26 },
24 methods: { 27 methods: {
25 // 获取登记业务量玫瑰图数据 28 // 获取登记业务量玫瑰图数据
26 async getdjywltotal () { 29 async getdjywltotal () {
30 this.cdata.seriesData=[]
27 try { 31 try {
28 let p = { 32 let p = {
29 DJLX: "", 33 DJLX: "",
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
5 <template> 5 <template>
6 <div class='result'> 6 <div class='result'>
7 <p>响应xml</p> 7 <p>响应xml</p>
8 <el-input type="textarea" :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML"> 8 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="响应xml" v-model="REPMSGXML">
9 </el-input> 9 </el-input>
10 <p>错误信息</p> 10 <p>错误信息</p>
11 <el-input type="textarea" :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO"> 11 <el-input type="textarea" disabled :rows="6" class="resulttext" placeholder="错误信息" v-model="ERRORINFO">
12 </el-input> 12 </el-input>
13 </div> 13 </div>
14 </template> 14 </template>
...@@ -57,5 +57,4 @@ export default { ...@@ -57,5 +57,4 @@ export default {
57 } 57 }
58 58
59 } 59 }
60
61 </style> 60 </style>
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
100 <div v-if="titleName == 'xyjg'"> 100 <div v-if="titleName == 'xyjg'">
101 <Xyjg :form-data='dataReport'></Xyjg> 101 <Xyjg :form-data='dataReport'></Xyjg>
102 </div> 102 </div>
103 <JsonEditor :resultInfo="resultInfo" v-if="titleName == 'xml'" /> 103 <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" />
104 </div> 104 </div>
105 </el-dialog> 105 </el-dialog>
106 </template> 106 </template>
......
1 <template> 1 <template>
2 <el-input type="textarea" :rows="6" placeholder="配置参数" v-model="resultInfo"> 2 <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
3 </el-input> 3 </el-input>
4 </template> 4 </template>
5 <script> 5 <script>
......
...@@ -59,7 +59,7 @@ let mixin = { ...@@ -59,7 +59,7 @@ let mixin = {
59 } 59 }
60 this.$refs.editLog.isShow(row); 60 this.$refs.editLog.isShow(row);
61 }, 61 },
62 // // 重置表单 62 // 重置表单
63 resetForm () { 63 resetForm () {
64 if (!this.form) return 64 if (!this.form) return
65 Object.keys(this.form).forEach((key) => { 65 Object.keys(this.form).forEach((key) => {
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
10 } 10 }
11 11
12 .el-table__row .cell { 12 .el-table__row .cell {
13 color: #CEF8FF !important; 13 color: #8DEAF9 !important;
14 font-weight: 100 !important;
14 } 15 }
15 16
16 .el-table__row { 17 .el-table__row {
...@@ -62,6 +63,7 @@ ...@@ -62,6 +63,7 @@
62 /deep/.el-input__inner { 63 /deep/.el-input__inner {
63 background: #07388B; 64 background: #07388B;
64 border-radius: 2px; 65 border-radius: 2px;
66 color: #CEF8FF;
65 border: 1px solid #6BC1FC; 67 border: 1px solid #6BC1FC;
66 } 68 }
67 } 69 }
......
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
23 this.queryClick() 23 this.queryClick()
24 }, 24 },
25 handleCurrentChange (val) { 25 handleCurrentChange (val) {
26 console.log(val, '222222222');
27 this.pageData.currentPage = val 26 this.pageData.currentPage = val
28 if (this.queryClick) { 27 if (this.queryClick) {
29 this.queryClick() 28 this.queryClick()
...@@ -33,6 +32,16 @@ export default { ...@@ -33,6 +32,16 @@ export default {
33 let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize) 32 let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize)
34 let currentPage = this.pageData.currentPage > deleteAfterPage ? deleteAfterPage : this.pageData.currentPage 33 let currentPage = this.pageData.currentPage > deleteAfterPage ? deleteAfterPage : this.pageData.currentPage
35 this.pageData.currentPage = currentPage < 1 ? 1 : currentPage 34 this.pageData.currentPage = currentPage < 1 ? 1 : currentPage
35 },
36 // 重置表单
37 resetForm () {
38 if (!this.form) return
39 Object.keys(this.form).forEach((key) => {
40 if (key !== 'currentPage') this.form[key] = '';
41 })
42 this.form.currentPage = 1
43 this.tableData.data = []
44 this.queryClick()
36 } 45 }
37 } 46 }
38 } 47 }
......
1 import { Message } from "element-ui"; 1 import { Message } from "element-ui";
2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') { 2 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
3 debugger
3 if (!treeList || !treeList.length) { 4 if (!treeList || !treeList.length) {
4 return 5 return
5 } 6 }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row>
9 <el-col :span="5"> 9 <el-col :span="6">
10 <el-form-item label="行政区" label-width="80px"> 10 <el-form-item label="行政区" label-width="80px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 12 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </el-select> 14 </el-select>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <el-col :span="5"> 17 <el-col :span="6">
18 <el-form-item label="权属状态"> 18 <el-form-item label="权属状态">
19 <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态"> 19 <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态">
20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 20 <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -22,29 +22,24 @@ ...@@ -22,29 +22,24 @@
22 </el-select> 22 </el-select>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
25 <!-- <el-col :span="5"> 25 <el-col :span="6">
26 <el-form-item label="坐落">
27 <el-input v-model="form.ZL" placeholder="坐落"></el-input>
28 </el-form-item>
29 </el-col> -->
30 <el-col :span="5">
31 <el-form-item label="不动产权证号"> 26 <el-form-item label="不动产权证号">
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 27 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input>
33 </el-form-item> 28 </el-form-item>
34 </el-col> 29 </el-col>
35 <el-col :span="5"> 30 <el-col :span="6">
36 <el-form-item label="抵押人" label-width="80px"> 31 <el-form-item label="抵押人" label-width="80px">
37 <el-input v-model="form.dyr" placeholder="抵押人"></el-input> 32 <el-input v-model="form.dyr" placeholder="抵押人"></el-input>
38 </el-form-item> 33 </el-form-item>
39 </el-col> 34 </el-col>
40 </el-row> 35 </el-row>
41 <el-row class="mt-10"> 36 <el-row class="mt-10">
42 <el-col :span="5"> 37 <el-col :span="6">
43 <el-form-item label="不动产单元号"> 38 <el-form-item label="不动产单元号">
44 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 39 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
45 </el-form-item> 40 </el-form-item>
46 </el-col> 41 </el-col>
47 <el-col :span="5"> 42 <el-col :span="6">
48 <el-form-item label="抵押不动产类型"> 43 <el-form-item label="抵押不动产类型">
49 <el-select v-model="form.dybdclx" class="width100" clearable placeholder="抵押不动产类型"> 44 <el-select v-model="form.dybdclx" class="width100" clearable placeholder="抵押不动产类型">
50 <el-option v-for="item in dicData['A27']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 45 <el-option v-for="item in dicData['A27']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -52,7 +47,7 @@ ...@@ -52,7 +47,7 @@
52 </el-select> 47 </el-select>
53 </el-form-item> 48 </el-form-item>
54 </el-col> 49 </el-col>
55 <el-col :span="5"> 50 <el-col :span="6">
56 <el-form-item label="登记类型"> 51 <el-form-item label="登记类型">
57 <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型"> 52 <el-select v-model="form.DJLX" class="width100" clearable placeholder="登记类型">
58 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 53 <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -61,7 +56,7 @@ ...@@ -61,7 +56,7 @@
61 </el-form-item> 56 </el-form-item>
62 </el-col> 57 </el-col>
63 58
64 <el-col :span="9" class="btnColRight"> 59 <el-col :span="6" class="btnColRight">
65 <btn nativeType="cz" @click="resetForm">重置</btn> 60 <btn nativeType="cz" @click="resetForm">重置</btn>
66 <btn nativeType="cx" @click="handleSubmit">查询</btn> 61 <btn nativeType="cx" @click="handleSubmit">查询</btn>
67 </el-col> 62 </el-col>
......
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> 32 <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input>
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6" class="mt-10"> 35 <el-col :span="6">
36 <el-form-item label="权利人"> 36 <el-form-item label="权利人">
37 <el-input v-model="form.QLR" placeholder="权利人"></el-input> 37 <el-input v-model="form.QLR" placeholder="权利人"></el-input>
38 </el-form-item> 38 </el-form-item>
39 </el-col> 39 </el-col>
40 <el-col :span="6" class="mt-10"> 40 <el-col :span="6">
41 <el-form-item label="权利类型" label-width="105px"> 41 <el-form-item label="权利类型" label-width="105px">
42 <el-select v-model="form.QLLX" class="width100" clearable placeholder="权利类型"> 42 <el-select v-model="form.QLLX" class="width100" clearable placeholder="权利类型">
43 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 43 <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> 50 <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="6" class="btnColRight mt-10"> 53 <el-col :span="18" class="btnColRight mt-10">
54 <btn nativeType="cz" @click="resetForm">重置</btn> 54 <btn nativeType="cz" @click="resetForm">重置</btn>
55 <btn nativeType="cx" @click="handleSubmit">查询</btn> 55 <btn nativeType="cx" @click="handleSubmit">查询</btn>
56 </el-col> 56 </el-col>
......
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
103 height: 33%; 103 height: 33%;
104 background: url("~@/image/djywl.png") no-repeat; 104 background: url("~@/image/djywl.png") no-repeat;
105 background-size: 100% 100%; 105 background-size: 100% 100%;
106 padding: .2825rem 0 0 0; 106 padding: .3825rem 0 0 0;
107 } 107 }
108 108
109 .card3 { 109 .card3 {
......
...@@ -49,6 +49,7 @@ export default { ...@@ -49,6 +49,7 @@ export default {
49 margin: auto; 49 margin: auto;
50 display: flex; 50 display: flex;
51 justify-content: space-between; 51 justify-content: space-between;
52 margin-top: 15px;
52 53
53 } 54 }
54 // #box{ 55 // #box{
......
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
178 type: "index", 178 type: "index",
179 width: "50", 179 width: "50",
180 index: this.indexMethod, 180 index: this.indexMethod,
181 }, 181 }
182 ] 182 ]
183 .concat(data.columns()) 183 .concat(data.columns())
184 .concat([ 184 .concat([
...@@ -224,9 +224,10 @@ export default { ...@@ -224,9 +224,10 @@ export default {
224 getReceiveDataReportPage({ ...this.form, ...this.formData }).then( 224 getReceiveDataReportPage({ ...this.form, ...this.formData }).then(
225 (res) => { 225 (res) => {
226 if (res.code === 200) { 226 if (res.code === 200) {
227 let { total, records } = res.result; 227 let { total, records, current } = res.result;
228 this.tableData.total = total; 228 this.tableData.total = total;
229 this.tableData.data = records ? records : []; 229 this.tableData.data = records ? records : [];
230 this.pageData.current = current
230 } 231 }
231 } 232 }
232 ) 233 )
...@@ -234,11 +235,11 @@ export default { ...@@ -234,11 +235,11 @@ export default {
234 // 重置 235 // 重置
235 resetForm () { 236 resetForm () {
236 this.$refs.ruleForm.resetFields(); 237 this.$refs.ruleForm.resetFields();
237 this.pageData.currentPage = 1 238 this.form.currentPage = 1
238 this.queryClick(); 239 this.queryClick();
239 }, 240 },
240 featchData () { 241 featchData () {
241 this.pageData.currentPage = 1 242 this.form.currentPage = 1
242 this.queryClick(); 243 this.queryClick();
243 }, 244 },
244 // 结果 245 // 结果
......
...@@ -6,18 +6,6 @@ class data { ...@@ -6,18 +6,6 @@ class data {
6 columns () { 6 columns () {
7 return [ 7 return [
8 { 8 {
9 label: '序号',
10 type: 'index',
11 width: '50',
12 render: (h, scope) => {
13 return (
14 <div>
15 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
16 </div>
17 )
18 }
19 },
20 {
21 prop: "AREANAME", 9 prop: "AREANAME",
22 label: "区域名称", 10 label: "区域名称",
23 }, 11 },
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
9 </el-form-item> 9 </el-form-item>
10 <el-row> 10 <el-row>
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="行政区"> 12 <el-form-item label="行政区">
13 <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区"> 13 <el-select v-model="form.areacode" class="width100" clearable placeholder="行政区">
14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 14 <el-option v-for="item in dicData['A20']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
39 <!-- 列表区域 --> 39 <!-- 列表区域 -->
40 <div class="from-clues-content"> 40 <div class="from-clues-content">
41 <!-- table组件 --> 41 <!-- table组件 -->
42 <lb-table :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current" 42 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
43 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 43 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
44 :column="tableData.columns" :data="tableData.data"> 44 :data="tableData.data">
45 </lb-table> 45 </lb-table>
46 </div> 46 </div>
47 </div> 47 </div>
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
51 // 引入列表数据 51 // 引入列表数据
52 import { datas, sendThis } from "./data" 52 import { datas, sendThis } from "./data"
53 // 引入表格混入方法 53 // 引入表格混入方法
54 import table from "@/utils/mixin/table" 54 import tableMixin from "@/mixins/tableMixin.js";
55 import { getRecordLogPage } from "@/api/recordLog.js"; 55 import { getRecordLogPage } from "@/api/recordLog.js";
56 import { mapGetters } from 'vuex' 56 import { mapGetters } from 'vuex'
57 //引入日期处理方法 57 //引入日期处理方法
58 import {timeFormat } from "@/utils/operation"; 58 import {timeFormat } from "@/utils/operation";
59 export default { 59 export default {
60 name: "dbrzcx", 60 name: "dbrzcx",
61 mixins: [table], 61 mixins: [tableMixin],
62 computed: { 62 computed: {
63 ...mapGetters(['dicData']) 63 ...mapGetters(['dicData'])
64 }, 64 },
...@@ -83,13 +83,21 @@ export default { ...@@ -83,13 +83,21 @@ export default {
83 // 表单 83 // 表单
84 form: { 84 form: {
85 areacode: '', 85 areacode: '',
86 startTime: null, 86 startTime: '',
87 endTime: null, 87 endTime: '',
88 }, 88 },
89 // table数据 89 // table数据
90 tableData: { 90 tableData: {
91 // 表头 91 // 表头
92 columns: datas.columns(), 92 columns: [
93 {
94 label: "序号",
95 type: "index",
96 width: "50",
97 index: this.indexMethod,
98 }
99 ]
100 .concat(datas.columns()),
93 // 列表 101 // 列表
94 data: [], 102 data: [],
95 total: 0, 103 total: 0,
...@@ -104,19 +112,25 @@ export default { ...@@ -104,19 +112,25 @@ export default {
104 endTimeChange(val){ 112 endTimeChange(val){
105 this.form.endTime = timeFormat(new Date(val),true) 113 this.form.endTime = timeFormat(new Date(val),true)
106 }, 114 },
107 // 重置表单
108 resetForm () {
109 this.$refs.ruleForm.resetFields();
110 },
111 queryClick () { 115 queryClick () {
112 getRecordLogPage({ ...this.form, ...this.pageData }).then(res => { 116 getRecordLogPage({ ...this.form, ...this.pageData }).then(res => {
113 if (res.code === 200) { 117 if (res.code === 200) {
114 let { records, total } = res.result 118 let { records, total, current } = res.result
115 this.tableData.data = records ? records : [] 119 this.tableData.data = records ? records : []
116 this.tableData.total = total ? total : 0 120 this.tableData.total = total ? total : 0
121 this.pageData.current = current
117 } 122 }
118 }) 123 })
119 } 124 },
125 // 重置
126 resetForm () {
127 this.$refs.ruleForm.resetFields();
128 this.form.currentPage = 1
129 this.queryClick();
130 },
131 featchData () {
132 this.queryClick();
133 },
120 } 134 }
121 } 135 }
122 </script> 136 </script>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <el-col :span="6"> 33 <el-col :span="6">
34 <el-form-item label="汇交状态" prop="state"> 34 <el-form-item label="汇交状态" prop="state">
35 <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态"> 35 <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
36 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> 36 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
37 </el-option> 37 </el-option>
38 </el-select> 38 </el-select>
39 </el-form-item> 39 </el-form-item>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
71 </div> 71 </div>
72 <!-- 列表 --> 72 <!-- 列表 -->
73 <div class="from-clues-content"> 73 <div class="from-clues-content">
74 <lb-table :page-size="pageData.pageSize" :current-page.sync="pageData.currentPage" :total="tableData.total" 74 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="tableData.total"
75 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 75 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
76 :data="tableData.data"> 76 :data="tableData.data">
77 </lb-table> 77 </lb-table>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 // 引入表头数据 86 // 引入表头数据
87 import { datas, sendThis } from "./data"; 87 import { datas, sendThis } from "./data";
88 // 引入表格混入方法 88 // 引入表格混入方法
89 import table from "@/utils/mixin/table"; 89 import tableMixin from "@/mixins/tableMixin.js";
90 // 引入详情弹框 90 // 引入详情弹框
91 import dataDetails from "@/components/EditDialog"; 91 import dataDetails from "@/components/EditDialog";
92 import { getDataReportPage } from "@/api/dataReport.js"; 92 import { getDataReportPage } from "@/api/dataReport.js";
...@@ -94,7 +94,7 @@ import { getDataReportPage } from "@/api/dataReport.js"; ...@@ -94,7 +94,7 @@ import { getDataReportPage } from "@/api/dataReport.js";
94 import {timeFormat } from "@/utils/operation"; 94 import {timeFormat } from "@/utils/operation";
95 export default { 95 export default {
96 name: "sbbwcx", 96 name: "sbbwcx",
97 mixins: [table], 97 mixins: [tableMixin],
98 // 注册组件 98 // 注册组件
99 components: { 99 components: {
100 dataDetails, 100 dataDetails,
...@@ -131,6 +131,12 @@ export default { ...@@ -131,6 +131,12 @@ export default {
131 rkjg: "", //入库结果 131 rkjg: "", //入库结果
132 currentPage: 1, 132 currentPage: 1,
133 }, 133 },
134 // 分页
135 pageData: {
136 total: 0,
137 pageSize: 10,
138 current: 1
139 },
134 // table数据 140 // table数据
135 tableData: { 141 tableData: {
136 // 表头数据 142 // 表头数据
...@@ -156,7 +162,7 @@ export default { ...@@ -156,7 +162,7 @@ export default {
156 }, 162 },
157 ]), 163 ]),
158 total: 0, 164 total: 0,
159 data: [{}], 165 data: [],
160 }, 166 },
161 title: "", 167 title: "",
162 }; 168 };
...@@ -169,21 +175,20 @@ export default { ...@@ -169,21 +175,20 @@ export default {
169 endTimeChange(val){ 175 endTimeChange(val){
170 this.form.exchangeEndTime = timeFormat(new Date(val),true) 176 this.form.exchangeEndTime = timeFormat(new Date(val),true)
171 }, 177 },
172 // 重置表单
173 resetForm () {
174 this.$refs.ruleForm.resetFields();
175 this.form.exchangeEndTime = ""
176 },
177 // 初始化数据 178 // 初始化数据
178 queryClick () { 179 queryClick () {
179 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { 180 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
180 if (res.code === 200) { 181 if (res.code === 200) {
181 let { total, records } = res.result; 182 let { total, records, current } = res.result;
182 this.tableData.total = total; 183 this.tableData.total = total;
183 this.tableData.data = records ? records : []; 184 this.tableData.data = records ? records : [];
185 this.pageData.current = current
184 } 186 }
185 }); 187 });
186 }, 188 },
189 featchData () {
190 this.queryClick();
191 },
187 // 多选 192 // 多选
188 handleSelectionChange (val) { }, 193 handleSelectionChange (val) { },
189 // 上报 194 // 上报
...@@ -193,6 +198,13 @@ export default { ...@@ -193,6 +198,13 @@ export default {
193 this.title = row.rectypeName; 198 this.title = row.rectypeName;
194 this.$refs.editLog.isShow(row); 199 this.$refs.editLog.isShow(row);
195 }, 200 },
201 // 重置
202 resetForm () {
203 this.$refs.ruleForm.resetFields();
204 this.form.exchangeEndTime = ""
205 this.form.currentPage = 1
206 this.queryClick();
207 },
196 }, 208 },
197 }; 209 };
198 </script> 210 </script>
......
...@@ -290,7 +290,7 @@ export default { ...@@ -290,7 +290,7 @@ export default {
290 type: "warning", 290 type: "warning",
291 }) 291 })
292 .then(() => { 292 .then(() => {
293 removeTreeListItem(this.tableData, row.dictid); 293 removeTreeListItem(this.tableData, row.dictid, 'dictid');
294 this.$message({ 294 this.$message({
295 type: "success", 295 type: "success",
296 message: "删除成功!", 296 message: "删除成功!",
...@@ -358,7 +358,7 @@ export default { ...@@ -358,7 +358,7 @@ export default {
358 }, 358 },
359 // 上移下移 359 // 上移下移
360 moveUpward (index, row) { 360 moveUpward (index, row) {
361 console.log("row上移",row); 361 console.log("row上移", row);
362 362
363 realMove(row.dictid, "UP", this.tableData); 363 realMove(row.dictid, "UP", this.tableData);
364 let id = findParents(this.tableData, row.dictid); 364 let id = findParents(this.tableData, row.dictid);
...@@ -366,7 +366,7 @@ export default { ...@@ -366,7 +366,7 @@ export default {
366 this.key++; 366 this.key++;
367 }, 367 },
368 moveDown (index, row) { 368 moveDown (index, row) {
369 console.log("row下移",row); 369 console.log("row下移", row);
370 realMove(row.dictid, "DOWN", this.tableData); 370 realMove(row.dictid, "DOWN", this.tableData);
371 let id = findParents(this.tableData, row.dictid); 371 let id = findParents(this.tableData, row.dictid);
372 this.keyList = id; 372 this.keyList = id;
......