Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
44 changed files
with
277 additions
and
120 deletions
... | @@ -56,12 +56,15 @@ export default { | ... | @@ -56,12 +56,15 @@ export default { |
56 | 56 | ||
57 | <style lang="scss" scoped> | 57 | <style lang="scss" scoped> |
58 | .breadcrumb { | 58 | .breadcrumb { |
59 | box-sizing: border-box; | 59 | width: 80%; |
60 | text-indent: 10px; | 60 | text-indent: 10px; |
61 | background: linear-gradient(90deg, #0047B8 0%, rgba(0, 26, 95, 0.1) 100%); | 61 | background: url("~@/image/breadcrumb.png") no-repeat; |
62 | background-size: 100% 100%; | ||
62 | line-height: 32px; | 63 | line-height: 32px; |
63 | color: #FFFFFF; | 64 | height: 32px; |
64 | margin-bottom: 8px; | 65 | padding-left: 35px; |
66 | margin: 8px 0 8px 6px; | ||
67 | color: #CEF8FF; | ||
65 | } | 68 | } |
66 | 69 | ||
67 | /deep/.el-icon-arrow-right { | 70 | /deep/.el-icon-arrow-right { |
... | @@ -73,7 +76,7 @@ export default { | ... | @@ -73,7 +76,7 @@ export default { |
73 | } | 76 | } |
74 | 77 | ||
75 | /deep/.el-breadcrumb__inner { | 78 | /deep/.el-breadcrumb__inner { |
76 | color: #FFFFFF !important; | 79 | color: #CEF8FF !important; |
77 | } | 80 | } |
78 | 81 | ||
79 | .breadcrumb1366 { | 82 | .breadcrumb1366 { | ... | ... |
... | @@ -175,7 +175,7 @@ export default { | ... | @@ -175,7 +175,7 @@ export default { |
175 | clearInterval(this.intervalId); | 175 | clearInterval(this.intervalId); |
176 | } | 176 | } |
177 | this.intervalId = setInterval(() => { | 177 | this.intervalId = setInterval(() => { |
178 | _self.reSelectMapRandomArea(); | 178 | this.$refs.centreLeft2ChartRef && _self.reSelectMapRandomArea(); |
179 | }, time); | 179 | }, time); |
180 | }, | 180 | }, |
181 | // 重新随机选中地图区域 | 181 | // 重新随机选中地图区域 | ... | ... |
... | @@ -27,22 +27,7 @@ export default { | ... | @@ -27,22 +27,7 @@ export default { |
27 | watch: { | 27 | watch: { |
28 | cdata: { | 28 | cdata: { |
29 | handler(newData) { | 29 | handler(newData) { |
30 | let pieColors = ["#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de"]; | ||
31 | let richColor = {}; | ||
32 | pieColors.forEach((item, idx) => { | ||
33 | richColor[`color${idx}`] = { | ||
34 | fontSize: 10, | ||
35 | color: item, | ||
36 | }; | ||
37 | }); | ||
38 | 30 | ||
39 | let chartData = [ | ||
40 | { value: 1048, name: "Search Engine" }, | ||
41 | { value: 735, name: "Direct" }, | ||
42 | { value: 580, name: "Email" }, | ||
43 | { value: 484, name: "Union Ads" }, | ||
44 | { value: 300, name: "Video Ads" }, | ||
45 | ]; | ||
46 | this.options = { | 31 | this.options = { |
47 | color: [ | 32 | color: [ |
48 | "#37a2da", | 33 | "#37a2da", |
... | @@ -64,9 +49,8 @@ export default { | ... | @@ -64,9 +49,8 @@ export default { |
64 | label: { | 49 | label: { |
65 | formatter: (params) => { | 50 | formatter: (params) => { |
66 | // console.log(params) | 51 | // console.log(params) |
67 | return `{color${params.dataIndex}|${params.name}(${params.value})}`; | 52 | return `${params.name}(${params.value}`; |
68 | }, | 53 | }, |
69 | rich: richColor, | ||
70 | }, | 54 | }, |
71 | labelLine: { | 55 | labelLine: { |
72 | lineStyle: { | 56 | lineStyle: { | ... | ... |
... | @@ -17,11 +17,11 @@ | ... | @@ -17,11 +17,11 @@ |
17 | <span>业务报文ID:</span> | 17 | <span>业务报文ID:</span> |
18 | <p>{{ dataReport.BizMsgId }}</p> | 18 | <p>{{ dataReport.BizMsgId }}</p> |
19 | </el-col> | 19 | </el-col> |
20 | <el-col :span="7"> | 20 | <el-col :span="6"> |
21 | <span>接入报文ID:</span> | 21 | <span>接入报文ID:</span> |
22 | <p>{{ dataReport.ASID }}</p> | 22 | <p>{{ dataReport.ASID }}</p> |
23 | </el-col> | 23 | </el-col> |
24 | <el-col :span="5"> | 24 | <el-col :span="6"> |
25 | <span>行政区划编码:</span> | 25 | <span>行政区划编码:</span> |
26 | <p>{{ dataReport.AreaCode }}</p> | 26 | <p>{{ dataReport.AreaCode }}</p> |
27 | </el-col> | 27 | </el-col> |
... | @@ -35,13 +35,13 @@ | ... | @@ -35,13 +35,13 @@ |
35 | <span>业务编码:</span> | 35 | <span>业务编码:</span> |
36 | <p>{{ dataReport.RecType }}</p> | 36 | <p>{{ dataReport.RecType }}</p> |
37 | </el-col> | 37 | </el-col> |
38 | <el-col :span="7"> | 38 | <el-col :span="6"> |
39 | <span>权利类型:</span> | 39 | <span>权利类型:</span> |
40 | <p>{{ dataReport.RightType }}</p> | 40 | <p>{{ this.dicStatus(dataReport.RightType, 'A8') }}</p> |
41 | </el-col> | 41 | </el-col> |
42 | <el-col :span="5"> | 42 | <el-col :span="6"> |
43 | <span>登记类型:</span> | 43 | <span>登记类型:</span> |
44 | <p>{{ dataReport.RegType }}</p> | 44 | <p>{{ this.dicStatus(dataReport.RegType, 'A21') }}</p> |
45 | </el-col> | 45 | </el-col> |
46 | <el-col :span="7"> | 46 | <el-col :span="7"> |
47 | <span>不动产权证书数量:</span> | 47 | <span>不动产权证书数量:</span> |
... | @@ -53,13 +53,13 @@ | ... | @@ -53,13 +53,13 @@ |
53 | <span>创建时间:</span> | 53 | <span>创建时间:</span> |
54 | <p>{{ dataReport.createDate }}</p> | 54 | <p>{{ dataReport.createDate }}</p> |
55 | </el-col> | 55 | </el-col> |
56 | <el-col :span="7"> | 56 | <el-col :span="6"> |
57 | <span>业务流水号:</span> | 57 | <span>业务流水号:</span> |
58 | <p>{{ dataReport.RecFlowID }}</p> | 58 | <p>{{ dataReport.RecFlowID }}</p> |
59 | </el-col> | 59 | </el-col> |
60 | <el-col :span="5"> | 60 | <el-col :span="6"> |
61 | <span>登记机构:</span> | 61 | <span>宗地/宗海代码:</span> |
62 | <p>{{ dataReport.RegOrgID }}</p> | 62 | <p>{{ dataReport.ParcelID }}</p> |
63 | </el-col> | 63 | </el-col> |
64 | <el-col :span="7"> | 64 | <el-col :span="7"> |
65 | <span>证明数量:</span> | 65 | <span>证明数量:</span> |
... | @@ -67,15 +67,15 @@ | ... | @@ -67,15 +67,15 @@ |
67 | </el-col> | 67 | </el-col> |
68 | </el-row> | 68 | </el-row> |
69 | <el-row> | 69 | <el-row> |
70 | <el-col :span="5"> | 70 | <el-col :span="6"> |
71 | <span>宗地/宗海代码:</span> | ||
72 | <p>{{ dataReport.ParcelID }}</p> | ||
73 | </el-col> | ||
74 | <el-col :span="7"> | ||
75 | <span>不动产单元号:</span> | 71 | <span>不动产单元号:</span> |
76 | <p>{{ dataReport.EstateNum }}</p> | 72 | <p>{{ dataReport.EstateNum }}</p> |
77 | </el-col> | 73 | </el-col> |
78 | <el-col :span="12"> | 74 | <el-col :span="8"> |
75 | <span>登记机构:</span> | ||
76 | <p>{{ dataReport.RegOrgID }}</p> | ||
77 | </el-col> | ||
78 | <el-col :span="11"> | ||
79 | <span>上次不动产权证号/不动产登记证明:</span> | 79 | <span>上次不动产权证号/不动产登记证明:</span> |
80 | <p>{{ dataReport.PreCertID }}</p> | 80 | <p>{{ dataReport.PreCertID }}</p> |
81 | </el-col> | 81 | </el-col> |
... | @@ -127,6 +127,7 @@ export default { | ... | @@ -127,6 +127,7 @@ export default { |
127 | default: false | 127 | default: false |
128 | } | 128 | } |
129 | }, | 129 | }, |
130 | |||
130 | computed: { | 131 | computed: { |
131 | ...mapGetters(["dicData"]), | 132 | ...mapGetters(["dicData"]), |
132 | }, | 133 | }, |
... | @@ -168,6 +169,18 @@ export default { | ... | @@ -168,6 +169,18 @@ export default { |
168 | }; | 169 | }; |
169 | }, | 170 | }, |
170 | methods: { | 171 | methods: { |
172 | dicStatus (val, code) { | ||
173 | let data = this.dicData[code], | ||
174 | name = '' | ||
175 | if (data) { | ||
176 | data.map((item) => { | ||
177 | if (item.DCODE == val) { | ||
178 | name = item.DNAME | ||
179 | } | ||
180 | }) | ||
181 | return name | ||
182 | } | ||
183 | }, | ||
171 | handleTitleTab (val) { | 184 | handleTitleTab (val) { |
172 | console.log(val); | 185 | console.log(val); |
173 | }, | 186 | }, | ... | ... |
... | @@ -64,7 +64,6 @@ export default { | ... | @@ -64,7 +64,6 @@ export default { |
64 | this.visible = show | 64 | this.visible = show |
65 | }, | 65 | }, |
66 | handleClick(tab, event) { | 66 | handleClick(tab, event) { |
67 | console.log(tab, event) | ||
68 | }, | 67 | }, |
69 | changeData(iconName) { | 68 | changeData(iconName) { |
70 | this.visible = false | 69 | this.visible = false | ... | ... |
... | @@ -18,10 +18,8 @@ export default { | ... | @@ -18,10 +18,8 @@ export default { |
18 | }, | 18 | }, |
19 | methods: { | 19 | methods: { |
20 | onJsonChange (value) { | 20 | onJsonChange (value) { |
21 | console.log('value:', value); | ||
22 | }, | 21 | }, |
23 | onJsonSave (value) { | 22 | onJsonSave (value) { |
24 | console.log('value:', value); | ||
25 | } | 23 | } |
26 | } | 24 | } |
27 | } | 25 | } | ... | ... |
... | @@ -69,7 +69,6 @@ export default { | ... | @@ -69,7 +69,6 @@ export default { |
69 | }, | 69 | }, |
70 | onJsonSave () { | 70 | onJsonSave () { |
71 | const value = this.resultInfo | 71 | const value = this.resultInfo |
72 | console.log(this.resultInfo, 'resultInfo') | ||
73 | if (this.hasJsonFlag === false) { | 72 | if (this.hasJsonFlag === false) { |
74 | this.$message.error({ message: 'json格式验证失败', showClose: true }) | 73 | this.$message.error({ message: 'json格式验证失败', showClose: true }) |
75 | // alert("json验证失败") | 74 | // alert("json验证失败") |
... | @@ -87,7 +86,6 @@ export default { | ... | @@ -87,7 +86,6 @@ export default { |
87 | this.dialogVisible = true | 86 | this.dialogVisible = true |
88 | }, | 87 | }, |
89 | cancel () { | 88 | cancel () { |
90 | console.log(this.tmpResultInfo, 'tmpResultInfo') | ||
91 | this.resultInfo = this.tmpResultInfo | 89 | this.resultInfo = this.tmpResultInfo |
92 | this.dialogVisible = false | 90 | this.dialogVisible = false |
93 | }, | 91 | }, | ... | ... |
... | @@ -39,7 +39,7 @@ | ... | @@ -39,7 +39,7 @@ |
39 | 39 | ||
40 | <br> | 40 | <br> |
41 | <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background | 41 | <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background |
42 | :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange" | 42 | layout="total, prev, pager, next" @current-change="paginationCurrentChange" |
43 | :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }"> | 43 | :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }"> |
44 | </el-pagination> | 44 | </el-pagination> |
45 | </div> | 45 | </div> | ... | ... |
... | @@ -32,8 +32,6 @@ export default { | ... | @@ -32,8 +32,6 @@ export default { |
32 | if (typeof val !== 'string') return | 32 | if (typeof val !== 'string') return |
33 | const themeCluster = this.getThemeCluster(val.replace('#', '')) | 33 | const themeCluster = this.getThemeCluster(val.replace('#', '')) |
34 | const originalCluster = this.getThemeCluster(oldVal.replace('#', '')) | 34 | const originalCluster = this.getThemeCluster(oldVal.replace('#', '')) |
35 | console.log(themeCluster, originalCluster) | ||
36 | |||
37 | const $message = this.$message({ | 35 | const $message = this.$message({ |
38 | message: ' Compiling the theme', | 36 | message: ' Compiling the theme', |
39 | customClass: 'theme-message', | 37 | customClass: 'theme-message', | ... | ... |
src/image/breadcrumb.png
0 → 100644
170 KB
... | @@ -46,7 +46,6 @@ export default { | ... | @@ -46,7 +46,6 @@ export default { |
46 | } | 46 | } |
47 | 47 | ||
48 | this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) | 48 | this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) |
49 | console.log(this.levelList) | ||
50 | }, | 49 | }, |
51 | isDashboard (route) { | 50 | isDashboard (route) { |
52 | const name = route && route.name | 51 | const name = route && route.name | ... | ... |
... | @@ -28,6 +28,16 @@ let mixin = { | ... | @@ -28,6 +28,16 @@ let mixin = { |
28 | this.formData.pageSize = val | 28 | this.formData.pageSize = val |
29 | this.featchData() | 29 | this.featchData() |
30 | }, | 30 | }, |
31 | handleSearch () { | ||
32 | this.form.currentPage = 1 | ||
33 | this.tableData.data = [] | ||
34 | if (this.featchData) { | ||
35 | this.featchData() | ||
36 | } | ||
37 | if (this.queryClick) { | ||
38 | this.queryClick() | ||
39 | } | ||
40 | }, | ||
31 | handleCurrentChange (val) { | 41 | handleCurrentChange (val) { |
32 | this.form.currentPage = val | 42 | this.form.currentPage = val |
33 | this.featchData() | 43 | this.featchData() | ... | ... |
... | @@ -348,6 +348,11 @@ aside { | ... | @@ -348,6 +348,11 @@ aside { |
348 | position: relative; | 348 | position: relative; |
349 | } | 349 | } |
350 | 350 | ||
351 | .fail { | ||
352 | color: #F56C6C; | ||
353 | position: relative; | ||
354 | } | ||
355 | |||
351 | 356 | ||
352 | .adopt::before { | 357 | .adopt::before { |
353 | position: absolute; | 358 | position: absolute; | ... | ... |
... | @@ -50,7 +50,7 @@ | ... | @@ -50,7 +50,7 @@ |
50 | 50 | ||
51 | &-header { | 51 | &-header { |
52 | width: 100%; | 52 | width: 100%; |
53 | padding: 5px 30px 20px 20px; | 53 | padding: 5px 30px 20px 24px; |
54 | box-sizing: border-box; | 54 | box-sizing: border-box; |
55 | background: url("~@/image/formHeader.png") no-repeat; | 55 | background: url("~@/image/formHeader.png") no-repeat; |
56 | background-size: 100% 100%; | 56 | background-size: 100% 100%; |
... | @@ -110,7 +110,7 @@ | ... | @@ -110,7 +110,7 @@ |
110 | margin-top: 15px; | 110 | margin-top: 15px; |
111 | background: url("~@/image/formContent.png") no-repeat; | 111 | background: url("~@/image/formContent.png") no-repeat; |
112 | background-size: 100% 100%; | 112 | background-size: 100% 100%; |
113 | padding: 20px 30px 20px 30px; | 113 | padding: 22px 42px 20px; |
114 | //修改表头的背景颜色横向渐变色 | 114 | //修改表头的背景颜色横向渐变色 |
115 | @extend .tableClass; | 115 | @extend .tableClass; |
116 | 116 | ... | ... |
... | @@ -68,7 +68,7 @@ | ... | @@ -68,7 +68,7 @@ |
68 | 68 | ||
69 | <el-col :span="4" class="btnColRight"> | 69 | <el-col :span="4" class="btnColRight"> |
70 | <btn nativeType="cz" @click="resetForm">重置</btn> | 70 | <btn nativeType="cz" @click="resetForm">重置</btn> |
71 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 71 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
72 | </el-col> | 72 | </el-col> |
73 | </el-row> | 73 | </el-row> |
74 | </el-form> | 74 | </el-form> | ... | ... |
... | @@ -58,7 +58,7 @@ | ... | @@ -58,7 +58,7 @@ |
58 | 58 | ||
59 | <el-col :span="6" class="btnColRight"> | 59 | <el-col :span="6" class="btnColRight"> |
60 | <btn nativeType="cz" @click="resetForm">重置</btn> | 60 | <btn nativeType="cz" @click="resetForm">重置</btn> |
61 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 61 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
62 | </el-col> | 62 | </el-col> |
63 | </el-row> | 63 | </el-row> |
64 | </el-form> | 64 | </el-form> | ... | ... |
... | @@ -63,7 +63,7 @@ | ... | @@ -63,7 +63,7 @@ |
63 | <el-col :span="4" class="btnColRight"> | 63 | <el-col :span="4" class="btnColRight"> |
64 | <el-form-item> | 64 | <el-form-item> |
65 | <btn nativeType="cz" @click="resetForm">重置</btn> | 65 | <btn nativeType="cz" @click="resetForm">重置</btn> |
66 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 66 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
67 | </el-form-item> | 67 | </el-form-item> |
68 | </el-col> | 68 | </el-col> |
69 | </el-row> | 69 | </el-row> | ... | ... |
... | @@ -55,7 +55,7 @@ | ... | @@ -55,7 +55,7 @@ |
55 | </el-col> | 55 | </el-col> |
56 | <el-col :span="6" class="btnColRight"> | 56 | <el-col :span="6" class="btnColRight"> |
57 | <btn nativeType="cz" @click="resetForm">重置</btn> | 57 | <btn nativeType="cz" @click="resetForm">重置</btn> |
58 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 58 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
59 | </el-col> | 59 | </el-col> |
60 | </el-row> | 60 | </el-row> |
61 | </el-form> | 61 | </el-form> | ... | ... |
... | @@ -27,7 +27,7 @@ | ... | @@ -27,7 +27,7 @@ |
27 | </el-col> | 27 | </el-col> |
28 | <el-col :span="9" class="btnColRight"> | 28 | <el-col :span="9" class="btnColRight"> |
29 | <btn nativeType="cz" @click="resetForm">重置</btn> | 29 | <btn nativeType="cz" @click="resetForm">重置</btn> |
30 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 30 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
31 | </el-col> | 31 | </el-col> |
32 | </el-row> | 32 | </el-row> |
33 | </el-form> | 33 | </el-form> | ... | ... |
... | @@ -55,7 +55,7 @@ | ... | @@ -55,7 +55,7 @@ |
55 | </el-col> | 55 | </el-col> |
56 | <el-col :span="6" class="btnColRight"> | 56 | <el-col :span="6" class="btnColRight"> |
57 | <btn nativeType="cz" @click="resetForm">重置</btn> | 57 | <btn nativeType="cz" @click="resetForm">重置</btn> |
58 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 58 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
59 | </el-col> | 59 | </el-col> |
60 | </el-row> | 60 | </el-row> |
61 | </el-form> | 61 | </el-form> | ... | ... |
... | @@ -52,7 +52,7 @@ | ... | @@ -52,7 +52,7 @@ |
52 | </el-col> | 52 | </el-col> |
53 | <el-col :span="6" class="btnColRight mt-10"> | 53 | <el-col :span="6" 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="handleSearch">查询</btn> |
56 | </el-col> | 56 | </el-col> |
57 | </el-row> | 57 | </el-row> |
58 | </el-form> | 58 | </el-form> | ... | ... |
... | @@ -52,7 +52,7 @@ | ... | @@ -52,7 +52,7 @@ |
52 | </el-col> | 52 | </el-col> |
53 | <el-col :span="6" class="btnColRight mt-10"> | 53 | <el-col :span="6" 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="handleSearch">查询</btn> |
56 | </el-col> | 56 | </el-col> |
57 | </el-row> | 57 | </el-row> |
58 | </el-form> | 58 | </el-form> | ... | ... |
... | @@ -50,7 +50,7 @@ | ... | @@ -50,7 +50,7 @@ |
50 | </el-col> | 50 | </el-col> |
51 | <el-col :span="12" class="btnColRight"> | 51 | <el-col :span="12" class="btnColRight"> |
52 | <btn nativeType="cz" @click="resetForm">重置</btn> | 52 | <btn nativeType="cz" @click="resetForm">重置</btn> |
53 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 53 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
54 | </el-col> | 54 | </el-col> |
55 | </el-row> | 55 | </el-row> |
56 | </el-form> | 56 | </el-form> | ... | ... |
... | @@ -47,7 +47,7 @@ | ... | @@ -47,7 +47,7 @@ |
47 | </el-col> | 47 | </el-col> |
48 | <el-col :span="12" class="btnColRight mt-10"> | 48 | <el-col :span="12" class="btnColRight mt-10"> |
49 | <btn nativeType="cz" @click="resetForm">重置</btn> | 49 | <btn nativeType="cz" @click="resetForm">重置</btn> |
50 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 50 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
51 | </el-col> | 51 | </el-col> |
52 | </el-row> | 52 | </el-row> |
53 | 53 | ... | ... |
... | @@ -52,7 +52,7 @@ | ... | @@ -52,7 +52,7 @@ |
52 | </el-col> | 52 | </el-col> |
53 | <el-col :span="6" class="btnColRight mt-10"> | 53 | <el-col :span="6" 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="handleSearch">查询</btn> |
56 | </el-col> | 56 | </el-col> |
57 | </el-row> | 57 | </el-row> |
58 | </el-form> | 58 | </el-form> | ... | ... |
... | @@ -49,7 +49,7 @@ | ... | @@ -49,7 +49,7 @@ |
49 | </el-col> | 49 | </el-col> |
50 | <el-col :span="12" class="btnColRight"> | 50 | <el-col :span="12" class="btnColRight"> |
51 | <btn nativeType="cz" @click="resetForm">重置</btn> | 51 | <btn nativeType="cz" @click="resetForm">重置</btn> |
52 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 52 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
53 | </el-col> | 53 | </el-col> |
54 | </el-row> | 54 | </el-row> |
55 | </el-form> | 55 | </el-form> | ... | ... |
... | @@ -58,7 +58,7 @@ | ... | @@ -58,7 +58,7 @@ |
58 | </el-col> | 58 | </el-col> |
59 | <el-col :span="6" class="btnColRight"> | 59 | <el-col :span="6" class="btnColRight"> |
60 | <btn nativeType="cz" @click="resetForm">重置</btn> | 60 | <btn nativeType="cz" @click="resetForm">重置</btn> |
61 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 61 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
62 | </el-col> | 62 | </el-col> |
63 | </el-row> | 63 | </el-row> |
64 | </el-form> | 64 | </el-form> | ... | ... |
... | @@ -48,7 +48,7 @@ | ... | @@ -48,7 +48,7 @@ |
48 | </el-col> | 48 | </el-col> |
49 | <el-col :span="19" class="btnColRight"> | 49 | <el-col :span="19" class="btnColRight"> |
50 | <btn nativeType="cz" @click="resetForm">重置</btn> | 50 | <btn nativeType="cz" @click="resetForm">重置</btn> |
51 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 51 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
52 | </el-col> | 52 | </el-col> |
53 | </el-row> | 53 | </el-row> |
54 | </el-form> | 54 | </el-form> | ... | ... |
... | @@ -52,7 +52,7 @@ | ... | @@ -52,7 +52,7 @@ |
52 | </el-col> | 52 | </el-col> |
53 | <el-col :span="18" 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="handleSearch">查询</btn> |
56 | </el-col> | 56 | </el-col> |
57 | </el-row> | 57 | </el-row> |
58 | </el-form> | 58 | </el-form> | ... | ... |
src/views/home/dataView/box.vue
0 → 100644
1 | <template> | ||
2 | <div | ||
3 | class="ScaleBox" | ||
4 | ref="ScaleBox" | ||
5 | :style="{ | ||
6 | width: width + 'px', | ||
7 | height: height + 'px', | ||
8 | }" | ||
9 | > | ||
10 | <slot></slot> | ||
11 | </div> | ||
12 | </template> | ||
13 | |||
14 | <script> | ||
15 | export default { | ||
16 | name: "ScaleBox", | ||
17 | props: {}, | ||
18 | data() { | ||
19 | return { | ||
20 | scale: 0, | ||
21 | width: 1920, | ||
22 | height: 1080, | ||
23 | }; | ||
24 | }, | ||
25 | mounted() { | ||
26 | this.setScale(); | ||
27 | window.addEventListener("resize", this.debounce(this.setScale)); | ||
28 | }, | ||
29 | methods: { | ||
30 | getScale() { | ||
31 | // 固定好16:9的宽高比,计算出最合适的缩放比 | ||
32 | const { width, height } = this; | ||
33 | const wh = window.innerHeight / height; | ||
34 | const ww = window.innerWidth / width; | ||
35 | return ww < wh ? ww : wh; | ||
36 | }, | ||
37 | setScale() { | ||
38 | // 获取到缩放比例,设置它 | ||
39 | this.scale = this.getScale(); | ||
40 | if (this.$refs.ScaleBox) { | ||
41 | this.$refs.ScaleBox.style.setProperty("--scale", this.scale); | ||
42 | } | ||
43 | }, | ||
44 | debounce(fn, delay) { | ||
45 | const delays = delay || 500; | ||
46 | let timer; | ||
47 | return function () { | ||
48 | const th = this; | ||
49 | const args = arguments; | ||
50 | if (timer) { | ||
51 | clearTimeout(timer); | ||
52 | } | ||
53 | timer = setTimeout(function () { | ||
54 | timer = null; | ||
55 | fn.apply(th, args); | ||
56 | }, delays); | ||
57 | }; | ||
58 | }, | ||
59 | }, | ||
60 | }; | ||
61 | </script> | ||
62 | |||
63 | <style lang="scss"> | ||
64 | #ScaleBox { | ||
65 | --scale: 1; | ||
66 | } | ||
67 | .ScaleBox { | ||
68 | position: absolute; | ||
69 | transform: scale(var(--scale)) translate(-50%, -50%); | ||
70 | display: flex; | ||
71 | flex-direction: column; | ||
72 | transform-origin: 0 0; | ||
73 | left: 50%; | ||
74 | top: 50%; | ||
75 | transition: 0.1s; | ||
76 | z-index: 999; | ||
77 | // background: rgba(255, 0, 0, 0.3); | ||
78 | } | ||
79 | </style> |
... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
3 | <div class="card1 cardCon d-center"> | 3 | <div class="card1 cardCon d-center"> |
4 | <div class="cardhead">新建国有房屋信息</div> | 4 | <div class="cardhead">新建国有房屋信息</div> |
5 | <div class="cardcontent" style="margin-top: .3646rem"> | 5 | <div class="cardcontent" style="margin-top: .3646rem"> |
6 | <dv-scroll-board v-if="config.data.length>0" :config="config" class="board" /> | 6 | <dv-scroll-board v-if="config.data.length > 0" :config="config" class="board" /> |
7 | <div v-else="config.data.length==0" class="nodata">暂无数据</div> | 7 | <div v-else="config.data.length==0" class="nodata">暂无数据</div> |
8 | </div> | 8 | </div> |
9 | </div> | 9 | </div> |
... | @@ -31,7 +31,7 @@ export default { | ... | @@ -31,7 +31,7 @@ export default { |
31 | evenRowBGC: '#154295', | 31 | evenRowBGC: '#154295', |
32 | header: ['序号', '用途', '性质', '面积'], | 32 | header: ['序号', '用途', '性质', '面积'], |
33 | data: [], | 33 | data: [], |
34 | key:0 | 34 | key: 0 |
35 | } | 35 | } |
36 | } | 36 | } |
37 | }, | 37 | }, |
... | @@ -43,15 +43,14 @@ export default { | ... | @@ -43,15 +43,14 @@ export default { |
43 | methods: { | 43 | methods: { |
44 | async addhousetotal () { | 44 | async addhousetotal () { |
45 | try { | 45 | try { |
46 | let {result:res}= await work.addhousetotal(); | 46 | let { result: res } = await work.addhousetotal(); |
47 | res.map((item,index) => { | 47 | res.map((item, index) => { |
48 | return ( | 48 | return ( |
49 | this.config.data.push([index,item.fwyt,item.fwxz,item.mj]) | 49 | this.config.data.push([index, item.fwyt, item.fwxz, item.mj]) |
50 | ) | 50 | ) |
51 | |||
52 | }); | 51 | }); |
53 | } catch (error) { | 52 | } catch (error) { |
54 | console.log("error",error); | 53 | console.log("error", error); |
55 | } | 54 | } |
56 | } | 55 | } |
57 | } | 56 | } |
... | @@ -85,11 +84,12 @@ export default { | ... | @@ -85,11 +84,12 @@ export default { |
85 | height: 100%; | 84 | height: 100%; |
86 | display: -webkit-box; | 85 | display: -webkit-box; |
87 | overflow: hidden; | 86 | overflow: hidden; |
88 | .nodata{ | 87 | |
88 | .nodata { | ||
89 | font-size: .1042rem; | 89 | font-size: .1042rem; |
90 | color: #02D9FD; | 90 | color: #02D9FD; |
91 | font-weight: bold; | 91 | font-weight: bold; |
92 | margin:auto; | 92 | margin: auto; |
93 | margin-top: 120px; | 93 | margin-top: 120px; |
94 | } | 94 | } |
95 | } | 95 | } |
... | @@ -136,6 +136,7 @@ export default { | ... | @@ -136,6 +136,7 @@ export default { |
136 | background: url("~@/image/djlxzl.png") no-repeat; | 136 | background: url("~@/image/djlxzl.png") no-repeat; |
137 | background-size: 100% 100%; | 137 | background-size: 100% 100%; |
138 | padding-bottom: 0; | 138 | padding-bottom: 0; |
139 | |||
139 | .cardhead { | 140 | .cardhead { |
140 | top: .0417rem; | 141 | top: .0417rem; |
141 | } | 142 | } | ... | ... |
... | @@ -57,7 +57,7 @@ import efficient from "@/api/efficient"; | ... | @@ -57,7 +57,7 @@ import efficient from "@/api/efficient"; |
57 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; | 57 | import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; |
58 | export default { | 58 | export default { |
59 | name: "jktj", | 59 | name: "jktj", |
60 | data () { | 60 | data() { |
61 | return { | 61 | return { |
62 | // 开始日期限制 | 62 | // 开始日期限制 |
63 | pickerOptionsStart: { | 63 | pickerOptionsStart: { |
... | @@ -83,7 +83,7 @@ export default { | ... | @@ -83,7 +83,7 @@ export default { |
83 | pieChartsData: [], | 83 | pieChartsData: [], |
84 | }; | 84 | }; |
85 | }, | 85 | }, |
86 | created () {}, | 86 | created() {}, |
87 | mounted() { | 87 | mounted() { |
88 | this.getProcessCounts(); | 88 | this.getProcessCounts(); |
89 | }, | 89 | }, |
... | @@ -91,11 +91,11 @@ export default { | ... | @@ -91,11 +91,11 @@ export default { |
91 | ...mapGetters(["dicData"]), | 91 | ...mapGetters(["dicData"]), |
92 | }, | 92 | }, |
93 | methods: { | 93 | methods: { |
94 | endTimeChange(val){ | 94 | endTimeChange(val) { |
95 | this.form.endTime = timeFormat(new Date(val),true) | 95 | this.form.endTime = timeFormat(new Date(val), true); |
96 | }, | 96 | }, |
97 | //查询各区县办件数量 | 97 | //查询各区县办件数量 |
98 | async getProcessCounts () { | 98 | async getProcessCounts() { |
99 | this.pieChartsData = []; | 99 | this.pieChartsData = []; |
100 | let { result: res } = await efficient.getProcessCounts( | 100 | let { result: res } = await efficient.getProcessCounts( |
101 | this.form.startTime, | 101 | this.form.startTime, |
... | @@ -113,14 +113,15 @@ export default { | ... | @@ -113,14 +113,15 @@ export default { |
113 | groupId: item.recType, | 113 | groupId: item.recType, |
114 | }); | 114 | }); |
115 | }); | 115 | }); |
116 | res.length && this.$nextTick(() => { | 116 | res.length && |
117 | this.$nextTick(() => { | ||
117 | // 初始化图表 | 118 | // 初始化图表 |
118 | this.echartInit(); | 119 | this.echartInit(); |
119 | this.barChartInit(res[0].recType); | 120 | this.barChartInit(res[0].recType); |
120 | }); | 121 | }); |
121 | }, | 122 | }, |
122 | // 重置 | 123 | // 重置 |
123 | resetForm () { | 124 | resetForm() { |
124 | this.form = { | 125 | this.form = { |
125 | startTime: getFirstDayOfSeason(), | 126 | startTime: getFirstDayOfSeason(), |
126 | endTime: timeFormat(new Date(), true), | 127 | endTime: timeFormat(new Date(), true), |
... | @@ -128,7 +129,7 @@ export default { | ... | @@ -128,7 +129,7 @@ export default { |
128 | this.getProcessCounts(); | 129 | this.getProcessCounts(); |
129 | }, | 130 | }, |
130 | //玫瑰图初始化 | 131 | //玫瑰图初始化 |
131 | echartInit () { | 132 | echartInit() { |
132 | let _this = this; | 133 | let _this = this; |
133 | // 基于准备好的dom,初始化echarts实例 | 134 | // 基于准备好的dom,初始化echarts实例 |
134 | let myChart = this.$echarts.init(document.getElementById("myChart")); | 135 | let myChart = this.$echarts.init(document.getElementById("myChart")); |
... | @@ -189,7 +190,7 @@ export default { | ... | @@ -189,7 +190,7 @@ export default { |
189 | }); | 190 | }); |
190 | }, | 191 | }, |
191 | //柱图初始化 | 192 | //柱图初始化 |
192 | async barChartInit (recType) { | 193 | async barChartInit(recType) { |
193 | //请求recType对应业务的各区县数据 | 194 | //请求recType对应业务的各区县数据 |
194 | let { result: res } = await efficient.getProcessDays( | 195 | let { result: res } = await efficient.getProcessDays( |
195 | recType, | 196 | recType, |
... | @@ -274,19 +275,46 @@ export default { | ... | @@ -274,19 +275,46 @@ export default { |
274 | series: [ | 275 | series: [ |
275 | { | 276 | { |
276 | type: "bar", | 277 | type: "bar", |
277 | barMaxWidth: '60', | 278 | //显示数值 |
279 | itemStyle: { | ||
280 | normal: { | ||
281 | label: { | ||
282 | show: true, //开启显示 | ||
283 | position: "top", //在上方显示 | ||
284 | }, | ||
285 | }, | ||
286 | }, | ||
287 | barMaxWidth: "60", | ||
278 | name: "最短用时", | 288 | name: "最短用时", |
279 | data: dealArr.map((item) => item.minDay), | 289 | data: dealArr.map((item) => item.minDay), |
280 | }, | 290 | }, |
281 | { | 291 | { |
282 | type: "bar", | 292 | type: "bar", |
283 | barMaxWidth: '60', | 293 | //显示数值 |
294 | itemStyle: { | ||
295 | normal: { | ||
296 | label: { | ||
297 | show: true, //开启显示 | ||
298 | position: "top", //在上方显示 | ||
299 | }, | ||
300 | }, | ||
301 | }, | ||
302 | barMaxWidth: "60", | ||
284 | name: "平均用时", | 303 | name: "平均用时", |
285 | data: dealArr.map((item) => item.avgDay), | 304 | data: dealArr.map((item) => item.avgDay), |
286 | }, | 305 | }, |
287 | { | 306 | { |
288 | type: "bar", | 307 | type: "bar", |
289 | barMaxWidth: '60', | 308 | //显示数值 |
309 | itemStyle: { | ||
310 | normal: { | ||
311 | label: { | ||
312 | show: true, //开启显示 | ||
313 | position: "top", //在上方显示 | ||
314 | }, | ||
315 | }, | ||
316 | }, | ||
317 | barMaxWidth: "60", | ||
290 | name: "最长用时", | 318 | name: "最长用时", |
291 | data: dealArr.map((item) => item.maxDay), | 319 | data: dealArr.map((item) => item.maxDay), |
292 | }, | 320 | }, | ... | ... |
... | @@ -246,6 +246,15 @@ export default { | ... | @@ -246,6 +246,15 @@ export default { |
246 | { | 246 | { |
247 | name: "成功", | 247 | name: "成功", |
248 | type: "bar", | 248 | type: "bar", |
249 | //显示数值 | ||
250 | itemStyle: { | ||
251 | normal: { | ||
252 | label: { | ||
253 | show: true, //开启显示 | ||
254 | position: "top", //在上方显示 | ||
255 | }, | ||
256 | }, | ||
257 | }, | ||
249 | barMaxWidth: '60', | 258 | barMaxWidth: '60', |
250 | data: this.chartData.map((item) => { | 259 | data: this.chartData.map((item) => { |
251 | return item.success; | 260 | return item.success; |
... | @@ -254,6 +263,15 @@ export default { | ... | @@ -254,6 +263,15 @@ export default { |
254 | { | 263 | { |
255 | name: "失败", | 264 | name: "失败", |
256 | type: "bar", | 265 | type: "bar", |
266 | //显示数值 | ||
267 | itemStyle: { | ||
268 | normal: { | ||
269 | label: { | ||
270 | show: true, //开启显示 | ||
271 | position: "top", //在上方显示 | ||
272 | }, | ||
273 | }, | ||
274 | }, | ||
257 | barMaxWidth: '60', | 275 | barMaxWidth: '60', |
258 | data: this.chartData.map((item) => { | 276 | data: this.chartData.map((item) => { |
259 | return item.failure; | 277 | return item.failure; |
... | @@ -261,6 +279,15 @@ export default { | ... | @@ -261,6 +279,15 @@ export default { |
261 | }, | 279 | }, |
262 | { | 280 | { |
263 | name: "成功率", | 281 | name: "成功率", |
282 | //显示数值 | ||
283 | itemStyle: { | ||
284 | normal: { | ||
285 | label: { | ||
286 | show: true, //开启显示 | ||
287 | position: "top", //在上方显示 | ||
288 | }, | ||
289 | }, | ||
290 | }, | ||
264 | type: "line", | 291 | type: "line", |
265 | barMaxWidth: '60', | 292 | barMaxWidth: '60', |
266 | yAxisIndex: 1, | 293 | yAxisIndex: 1, | ... | ... |
... | @@ -210,9 +210,18 @@ export default { | ... | @@ -210,9 +210,18 @@ export default { |
210 | ], | 210 | ], |
211 | series: [ | 211 | series: [ |
212 | { | 212 | { |
213 | data: chartArr.map(item=>item.counts), | ||
214 | type: "bar", | 213 | type: "bar", |
214 | //显示数值 | ||
215 | itemStyle: { | ||
216 | normal: { | ||
217 | label: { | ||
218 | show: true, //开启显示 | ||
219 | position: "top", //在上方显示 | ||
220 | }, | ||
221 | }, | ||
222 | }, | ||
215 | barMaxWidth: '60', | 223 | barMaxWidth: '60', |
224 | data: chartArr.map(item=>item.counts), | ||
216 | }, | 225 | }, |
217 | ], | 226 | ], |
218 | }); | 227 | }); | ... | ... |
... | @@ -37,8 +37,8 @@ | ... | @@ -37,8 +37,8 @@ |
37 | </el-row> | 37 | </el-row> |
38 | <el-row class="mt-10"> | 38 | <el-row class="mt-10"> |
39 | <el-col :span="6"> | 39 | <el-col :span="6"> |
40 | <el-form-item label="业务号流水号" prop="ywh"> | 40 | <el-form-item label="业务流水号" prop="ywh"> |
41 | <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务号流水号"></el-input> | 41 | <el-input v-model.trim="form.ywh" clearable class="width100" placeholder="业务流水号"></el-input> |
42 | </el-form-item> | 42 | </el-form-item> |
43 | </el-col> | 43 | </el-col> |
44 | <el-col :span="3"> | 44 | <el-col :span="3"> |
... | @@ -80,7 +80,7 @@ | ... | @@ -80,7 +80,7 @@ |
80 | <el-col :span="6" class="btnColRight"> | 80 | <el-col :span="6" class="btnColRight"> |
81 | <el-form-item> | 81 | <el-form-item> |
82 | <btn nativeType="cz" @click="resetForm">重置</btn> | 82 | <btn nativeType="cz" @click="resetForm">重置</btn> |
83 | <btn nativeType="cx" @click="featchData">查询</btn> | 83 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
84 | <btn nativeType="cx">存量导入</btn> | 84 | <btn nativeType="cx">存量导入</btn> |
85 | </el-form-item> | 85 | </el-form-item> |
86 | </el-col> | 86 | </el-col> | ... | ... |
... | @@ -32,7 +32,7 @@ | ... | @@ -32,7 +32,7 @@ |
32 | <!-- 操作按钮 --> | 32 | <!-- 操作按钮 --> |
33 | <el-col :span="6" class="btnColRight"> | 33 | <el-col :span="6" class="btnColRight"> |
34 | <btn nativeType="cz" @click="resetForm">重置</btn> | 34 | <btn nativeType="cz" @click="resetForm">重置</btn> |
35 | <btn nativeType="cx" @click="queryClick">查询</btn> | 35 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
36 | </el-col> | 36 | </el-col> |
37 | </el-row> | 37 | </el-row> |
38 | </el-form> | 38 | </el-form> |
... | @@ -120,8 +120,8 @@ export default { | ... | @@ -120,8 +120,8 @@ export default { |
120 | endTimeChange (val) { | 120 | endTimeChange (val) { |
121 | this.form.endTime = timeFormat(new Date(val), true) | 121 | this.form.endTime = timeFormat(new Date(val), true) |
122 | }, | 122 | }, |
123 | queryClick () { | 123 | featchData () { |
124 | getRecordLogPage({ ...this.form, ...this.pageData }).then(res => { | 124 | getRecordLogPage({ ...this.form }).then(res => { |
125 | if (res.code === 200) { | 125 | if (res.code === 200) { |
126 | let { records, total, current } = res.result | 126 | let { records, total, current } = res.result |
127 | this.tableData.data = records ? records : [] | 127 | this.tableData.data = records ? records : [] |
... | @@ -134,11 +134,8 @@ export default { | ... | @@ -134,11 +134,8 @@ export default { |
134 | resetForm () { | 134 | resetForm () { |
135 | this.$refs.ruleForm.resetFields(); | 135 | this.$refs.ruleForm.resetFields(); |
136 | this.form.currentPage = 1 | 136 | this.form.currentPage = 1 |
137 | this.queryClick(); | 137 | this.featchData(); |
138 | }, | 138 | } |
139 | featchData () { | ||
140 | this.queryClick(); | ||
141 | }, | ||
142 | } | 139 | } |
143 | } | 140 | } |
144 | </script> | 141 | </script> | ... | ... |
... | @@ -11,13 +11,13 @@ class data extends filter { | ... | @@ -11,13 +11,13 @@ class data extends filter { |
11 | return [ | 11 | return [ |
12 | { | 12 | { |
13 | label: '汇交状态', | 13 | label: '汇交状态', |
14 | width: '110', | 14 | width: '130', |
15 | render: (h, scope) => { | 15 | render: (h, scope) => { |
16 | return ( | 16 | return ( |
17 | <div> | 17 | <div> |
18 | <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span> | 18 | <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span> |
19 | <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span> | 19 | <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span> |
20 | <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报响应失败</span> | 20 | <span v-show={scope.row.exchangeState == 2} class='fail'>上报响应失败</span> |
21 | <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span> | 21 | <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span> |
22 | </div> | 22 | </div> |
23 | ) | 23 | ) |
... | @@ -62,7 +62,7 @@ class data extends filter { | ... | @@ -62,7 +62,7 @@ class data extends filter { |
62 | label: "业务名称", | 62 | label: "业务名称", |
63 | }, | 63 | }, |
64 | { | 64 | { |
65 | prop: "uploadtime", | 65 | prop: "exchangeDate", |
66 | label: "汇交时间", | 66 | label: "汇交时间", |
67 | width: 140, | 67 | width: 140, |
68 | } | 68 | } | ... | ... |
... | @@ -18,7 +18,7 @@ | ... | @@ -18,7 +18,7 @@ |
18 | </el-col> | 18 | </el-col> |
19 | <el-col :span="6"> | 19 | <el-col :span="6"> |
20 | <el-form-item label="汇交时间" prop="exchangeStartTime"> | 20 | <el-form-item label="汇交时间" prop="exchangeStartTime"> |
21 | <el-date-picker type="date" class="width100" placeholder="开始日期" clearable | 21 | <el-date-picker type="date" class="width100 hjsj" placeholder="开始日期" clearable |
22 | :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime" | 22 | :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime" |
23 | value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> | 23 | value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> |
24 | </el-form-item> | 24 | </el-form-item> |
... | @@ -41,8 +41,8 @@ | ... | @@ -41,8 +41,8 @@ |
41 | </el-row> | 41 | </el-row> |
42 | <el-row class="mt-10"> | 42 | <el-row class="mt-10"> |
43 | <el-col :span="6"> | 43 | <el-col :span="6"> |
44 | <el-form-item label="业务号流水号" prop="ywh"> | 44 | <el-form-item label="业务流水号" prop="ywh"> |
45 | <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务号流水号"></el-input> | 45 | <el-input v-model.trim="form.ywh" class="width100" clearable placeholder="业务流水号"></el-input> |
46 | </el-form-item> | 46 | </el-form-item> |
47 | </el-col> | 47 | </el-col> |
48 | <el-col :span="6"> | 48 | <el-col :span="6"> |
... | @@ -64,7 +64,7 @@ | ... | @@ -64,7 +64,7 @@ |
64 | <!-- 操作按钮 --> | 64 | <!-- 操作按钮 --> |
65 | <el-col :span="6" class="btnColRight"> | 65 | <el-col :span="6" class="btnColRight"> |
66 | <btn nativeType="cz" @click="resetForm">重置</btn> | 66 | <btn nativeType="cz" @click="resetForm">重置</btn> |
67 | <btn nativeType="cx" @click="queryClick">查询</btn> | 67 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
68 | </el-col> | 68 | </el-col> |
69 | </el-row> | 69 | </el-row> |
70 | </el-form> | 70 | </el-form> |
... | @@ -185,8 +185,8 @@ export default { | ... | @@ -185,8 +185,8 @@ export default { |
185 | this.form.exchangeEndTime = timeFormat(new Date(val), true) | 185 | this.form.exchangeEndTime = timeFormat(new Date(val), true) |
186 | }, | 186 | }, |
187 | // 初始化数据 | 187 | // 初始化数据 |
188 | queryClick () { | 188 | featchData () { |
189 | getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { | 189 | getDataReportPage({ ...this.form }).then((res) => { |
190 | if (res.code === 200) { | 190 | if (res.code === 200) { |
191 | let { total, records, current } = res.result; | 191 | let { total, records, current } = res.result; |
192 | this.tableData.total = total; | 192 | this.tableData.total = total; |
... | @@ -195,11 +195,6 @@ export default { | ... | @@ -195,11 +195,6 @@ export default { |
195 | } | 195 | } |
196 | }); | 196 | }); |
197 | }, | 197 | }, |
198 | featchData () { | ||
199 | this.queryClick(); | ||
200 | }, | ||
201 | // 多选 | ||
202 | handleSelectionChange (val) { }, | ||
203 | // 上报 | 198 | // 上报 |
204 | handleEscalation () { }, | 199 | handleEscalation () { }, |
205 | // 详情 | 200 | // 详情 |
... | @@ -212,7 +207,7 @@ export default { | ... | @@ -212,7 +207,7 @@ export default { |
212 | this.$refs.ruleForm.resetFields(); | 207 | this.$refs.ruleForm.resetFields(); |
213 | this.form.exchangeEndTime = "" | 208 | this.form.exchangeEndTime = "" |
214 | this.form.currentPage = 1 | 209 | this.form.currentPage = 1 |
215 | this.queryClick(); | 210 | this.featchData(); |
216 | }, | 211 | }, |
217 | }, | 212 | }, |
218 | }; | 213 | }; | ... | ... |
... | @@ -343,7 +343,6 @@ export default { | ... | @@ -343,7 +343,6 @@ export default { |
343 | }, | 343 | }, |
344 | // 上移下移 | 344 | // 上移下移 |
345 | moveUpward (index, row) { | 345 | moveUpward (index, row) { |
346 | |||
347 | realMove(row.dictid, "UP", this.tableData); | 346 | realMove(row.dictid, "UP", this.tableData); |
348 | let id = findParents(this.tableData, row.dictid); | 347 | let id = findParents(this.tableData, row.dictid); |
349 | this.keyList = id; | 348 | this.keyList = id; | ... | ... |
... | @@ -19,8 +19,7 @@ | ... | @@ -19,8 +19,7 @@ |
19 | </el-col> | 19 | </el-col> |
20 | <!-- 操作按钮 --> | 20 | <!-- 操作按钮 --> |
21 | <el-col :span="12" class="btnColRight"> | 21 | <el-col :span="12" class="btnColRight"> |
22 | 22 | <btn nativeType="cx" @click="handleSearch">查询</btn> | |
23 | <btn nativeType="cx" @click="queryClick">查询</btn> | ||
24 | <btn nativeType="cx" @click="handleRefresh">刷新缓存</btn> | 23 | <btn nativeType="cx" @click="handleRefresh">刷新缓存</btn> |
25 | </el-col> | 24 | </el-col> |
26 | </el-row> | 25 | </el-row> |
... | @@ -83,12 +82,16 @@ export default { | ... | @@ -83,12 +82,16 @@ export default { |
83 | // 初始化数据 | 82 | // 初始化数据 |
84 | queryClick () { | 83 | queryClick () { |
85 | getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => { | 84 | getQlxxDictList({ ...this.ruleForm, ...this.pageData }).then(res => { |
86 | // this.$endLoading(); | ||
87 | let { records, total } = res.result | 85 | let { records, total } = res.result |
88 | this.tableData.data = records ? records : [] | 86 | this.tableData.data = records ? records : [] |
89 | this.tableData.total = total ? total : 0 | 87 | this.tableData.total = total ? total : 0 |
90 | }) | 88 | }) |
91 | }, | 89 | }, |
90 | handleSearch () { | ||
91 | this.pageData.currentPage = 1 | ||
92 | this.tableData.data = [] | ||
93 | this.queryClick() | ||
94 | }, | ||
92 | handleRefresh () { | 95 | handleRefresh () { |
93 | this.$confirm('是否确认刷新', '提示', { | 96 | this.$confirm('是否确认刷新', '提示', { |
94 | confirmButtonText: '确定', | 97 | confirmButtonText: '确定', | ... | ... |
... | @@ -119,7 +119,6 @@ export default { | ... | @@ -119,7 +119,6 @@ export default { |
119 | // }) | 119 | // }) |
120 | }, | 120 | }, |
121 | handleSelectionChange (val) { | 121 | handleSelectionChange (val) { |
122 | console.log("vadddl",val); | ||
123 | this.multipleSelection = val | 122 | this.multipleSelection = val |
124 | } | 123 | } |
125 | } | 124 | } | ... | ... |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | </el-form-item> | 12 | </el-form-item> |
13 | </el-col> | 13 | </el-col> |
14 | <el-col :span="18" class="btnColRight"> | 14 | <el-col :span="18" class="btnColRight"> |
15 | <btn nativeType="cx" @click="handleSubmit">搜索</btn> | 15 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
16 | <btn nativeType="cx" @click="handleAdd">新增</btn> | 16 | <btn nativeType="cx" @click="handleAdd">新增</btn> |
17 | </el-col> | 17 | </el-col> |
18 | </el-row> | 18 | </el-row> |
... | @@ -112,6 +112,11 @@ export default { | ... | @@ -112,6 +112,11 @@ export default { |
112 | this.taskData = null | 112 | this.taskData = null |
113 | this.$refs.task.isShow() | 113 | this.$refs.task.isShow() |
114 | }, | 114 | }, |
115 | handleSearch () { | ||
116 | this.form.currentPage = 1 | ||
117 | this.tableData.data = [] | ||
118 | this.queryClick() | ||
119 | }, | ||
115 | async featchData () { | 120 | async featchData () { |
116 | try { | 121 | try { |
117 | this.form = Object.assign(this.form, this.formData) | 122 | this.form = Object.assign(this.form, this.formData) | ... | ... |
... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
25 | <!-- 操作按钮 --> | 25 | <!-- 操作按钮 --> |
26 | <el-col :span="6" class="btnColRight"> | 26 | <el-col :span="6" class="btnColRight"> |
27 | <btn nativeType="cx" @click="handleUpdateDic">刷新缓存</btn> | 27 | <btn nativeType="cx" @click="handleUpdateDic">刷新缓存</btn> |
28 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 28 | <btn nativeType="cx" @click="handleSearch">查询</btn> |
29 | </el-col> | 29 | </el-col> |
30 | </el-row> | 30 | </el-row> |
31 | </el-form> | 31 | </el-form> |
... | @@ -134,6 +134,11 @@ export default { | ... | @@ -134,6 +134,11 @@ export default { |
134 | this.$refs.msg.messageShow(); | 134 | this.$refs.msg.messageShow(); |
135 | } | 135 | } |
136 | }, | 136 | }, |
137 | handleSearch () { | ||
138 | this.form.currentPage = 1 | ||
139 | this.tableData.data = [] | ||
140 | this.featchData() | ||
141 | }, | ||
137 | async handleEdit (index, row) { | 142 | async handleEdit (index, row) { |
138 | try { | 143 | try { |
139 | let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB); | 144 | let { result: res } = await ruleConfig.eidtConfigRule(row.BSM_YWSJB); | ... | ... |
-
Please register or sign in to post a comment