Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
9216222f by 任超
Options

Merge branch 'master' into dev

2 parents 63b2dfc8 24811f05
Inline Side-by-side
Showing 33 changed files with 195 additions and 76 deletions
...@@ -36,6 +36,16 @@ class work { ...@@ -36,6 +36,16 @@ class work {
36 } 36 }
37 }) 37 })
38 } 38 }
39 // 新建国有房屋信息
40 async addhousetotal (code) {
41 return request({
42 url: SERVER.SERVERAPI + '/rest/reg/work/addhousetotal',
43 method: 'get',
44 params: {
45 code: code
46 }
47 })
48 }
39 // 地图区县成功失败统计，code区县编码，汉中为：A20 49 // 地图区县成功失败统计，code区县编码，汉中为：A20
40 async submitViews (code) { 50 async submitViews (code) {
41 return request({ 51 return request({
......
...@@ -69,6 +69,7 @@ export default { ...@@ -69,6 +69,7 @@ export default {
69 position: relative; 69 position: relative;
70 left: -10px; 70 left: -10px;
71 color: #FFFFFF; 71 color: #FFFFFF;
72 // background-color: rgb(155, 200, 200);
72 } 73 }
73 74
74 /deep/.el-breadcrumb__inner { 75 /deep/.el-breadcrumb__inner {
......
...@@ -27,8 +27,8 @@ export default { ...@@ -27,8 +27,8 @@ export default {
27 grid: { 27 grid: {
28 // 让图表占满容器 28 // 让图表占满容器
29 top: "20%", 29 top: "20%",
30 left: "18%", 30 left: "12%",
31 right: "10%", 31 right: "5%",
32 bottom: "16%", 32 bottom: "16%",
33 }, 33 },
34 xAxis: { 34 xAxis: {
......
...@@ -104,8 +104,8 @@ export default { ...@@ -104,8 +104,8 @@ export default {
104 map: '汉中市', 104 map: '汉中市',
105 itemStyle: { 105 itemStyle: {
106 normal: {//阴影 106 normal: {//阴影
107 areaColor: '#02D9FD ', 107 areaColor: '#5689FD ',
108 shadowColor: '#01271F', 108 shadowColor: '#21371d',
109 borderWidth: 0, 109 borderWidth: 0,
110 shadowOffsetX: 2, 110 shadowOffsetX: 2,
111 shadowOffsetY: 25 111 shadowOffsetY: 25
...@@ -125,17 +125,17 @@ export default { ...@@ -125,17 +125,17 @@ export default {
125 areaColor: 'rgba(19,54,162,.5)', 125 areaColor: 'rgba(19,54,162,.5)',
126 borderColor: 'rgba(0,242,252,.5)', 126 borderColor: 'rgba(0,242,252,.5)',
127 borderWidth: 2, 127 borderWidth: 2,
128 shadowBlur: 7, 128 shadowBlur: 1,
129 borderColor: 'rgba(19,54,162,.1)', 129 borderColor: 'rgb(155, 200, 200)',
130 shadowColor: '#44f2fc', 130 shadowColor: '#44f2fc',
131 }, 131 },
132 emphasis: { 132 // emphasis: {
133 areaColor: '#4f7fff', 133 // areaColor: '#4f7fff',
134 borderColor: 'rgba(0,242,252,.5)', 134 // borderColor: 'rgba(0,242,252,.5)',
135 borderWidth: 2, 135 // borderWidth: 2,
136 shadowBlur: 10, 136 // shadowBlur: 10,
137 shadowColor: '#00f2fc', 137 // shadowColor: '#00f2fc',
138 }, 138 // },
139 }, 139 },
140 label: { 140 label: {
141 formatter: params => { 141 formatter: params => {
......
...@@ -37,8 +37,7 @@ export default { ...@@ -37,8 +37,7 @@ export default {
37 let res = await work.getdjywltotal(p); 37 let res = await work.getdjywltotal(p);
38 // 遍历修改数组键，作为echars图表的参数 38 // 遍历修改数组键，作为echars图表的参数
39 res.result.map((item) => { 39 res.result.map((item) => {
40 40 return (
41 return (
42 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal }) 41 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
43 42
44 ) 43 )
......
...@@ -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()
......
...@@ -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>
......
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
119 <style lang="scss" scoped> 119 <style lang="scss" scoped>
120 .leftcard { 120 .leftcard {
121 width: 32%; 121 width: 32%;
122 height: calc(100% -0.5729rem); 122 height: calc(100% -110px);
123 display: flex; 123 display: flex;
124 flex-direction: column; 124 flex-direction: column;
125 125
...@@ -179,19 +179,21 @@ export default { ...@@ -179,19 +179,21 @@ export default {
179 179
180 .qxjr { 180 .qxjr {
181 background: url("~@/image/jrl3.png"); 181 background: url("~@/image/jrl3.png");
182 background-size: 100% 100%;
182 } 183 }
183 184
184 .sthj { 185 .sthj {
185 background: url("~@/image/jh.png"); 186 background: url("~@/image/jh.png");
187 background-size: 100% 100%;
186 } 188 }
187 189
188 p { 190 p {
189 margin: 0 .0156rem .0521rem .0156rem; 191 margin: 0 .0156rem .0521rem .0156rem;
190 font-weight: 700; 192 font-weight: 700;
191 width: .125rem; 193 width: .195rem;
192 height: .1875rem; 194 height: .2475rem;
193 font-size: .1563rem; 195 font-size: .1863rem;
194 font-size: .1667rem; 196 font-size: .1867rem;
195 } 197 }
196 } 198 }
197 199
...@@ -202,6 +204,7 @@ export default { ...@@ -202,6 +204,7 @@ export default {
202 // padding: 35px 20px 20px 20px; 204 // padding: 35px 20px 20px 20px;
203 box-sizing: border-box; 205 box-sizing: border-box;
204 color: #e3f1ff; 206 color: #e3f1ff;
207 margin-top: .1263rem;
205 208
206 .cardcontent-left { 209 .cardcontent-left {
207 width: 60%; 210 width: 60%;
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
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 :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> 8 </div>
8 </div> 9 </div>
9 <div class="card2 cardCon mt-10"> 10 <div class="card2 cardCon mt-10">
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
20 <script> 21 <script>
21 import columnarsmat from "@/components/Echart/Columnarsmat"; 22 import columnarsmat from "@/components/Echart/Columnarsmat";
22 import Rose from "@/components/Echart/Rose"; 23 import Rose from "@/components/Echart/Rose";
24 import work from "@/api/work";
23 export default { 25 export default {
24 data () { 26 data () {
25 return { 27 return {
...@@ -28,24 +30,34 @@ export default { ...@@ -28,24 +30,34 @@ export default {
28 oddRowBGC: '#154295', 30 oddRowBGC: '#154295',
29 evenRowBGC: '#154295', 31 evenRowBGC: '#154295',
30 header: ['序号', '用途', '性质', '面积'], 32 header: ['序号', '用途', '性质', '面积'],
31 data: [ 33 data: [],
32 ['住宅', '自建房', '转移登记', '73.94'], 34 key:0
33 ['商业服务', '市场化商品房', '转移登记', '1067.14'],
34 ['住宅', '成本售价房', '转移登记', '601.47'],
35 ['住宅', '市场化商品房', '转移登记', '38111.37'],
36 ['住宅', '移民搬迁安置房', '转移登记', '104.16'],
37 ['办公', '自建房', '转移登记', '14913.86'],
38 ['柴房', '市场化商品房', '转移登记', '615.55'],
39 ['住宅', '经济适用住房', '转移登记', '173.17'],
40 ['车库/车位', '市场化商品房', '转移登记', '105.27'],
41 ['住宅', '房改房', '转移登记', '372.4']
42 ]
43 } 35 }
44 } 36 }
45 }, 37 },
46 components: { columnarsmat, Rose }, 38 components: { columnarsmat, Rose },
47 mounted () { 39 mounted () {
40 this.addhousetotal();
48 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动 41 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
42 },
43 methods: {
44 async addhousetotal () {
45 try {
46 let {result:res}= await work.addhousetotal();
47 console.log("resultssssssssssss",res);
48 res.map((item,index) => {
49 console.log("item",item);
50 console.log("index",index);
51 return (
52 this.config.data.push([index,item.fwyt,item.fwxz,item.mj])
53 )
54
55 });
56 console.log("this.config.data",this.config.data);
57 } catch (error) {
58 console.log("error",error);
59 }
60 }
49 } 61 }
50 } 62 }
51 </script> 63 </script>
...@@ -77,6 +89,13 @@ export default { ...@@ -77,6 +89,13 @@ export default {
77 height: 100%; 89 height: 100%;
78 display: -webkit-box; 90 display: -webkit-box;
79 overflow: hidden; 91 overflow: hidden;
92 .nodata{
93 font-size: .1042rem;
94 color: #02D9FD;
95 font-weight: bold;
96 margin:auto;
97 margin-top: 120px;
98 }
80 } 99 }
81 100
82 .cardCon { 101 .cardCon {
...@@ -94,8 +113,8 @@ export default { ...@@ -94,8 +113,8 @@ export default {
94 .board { 113 .board {
95 width: 90%; 114 width: 90%;
96 margin: 0 auto; 115 margin: 0 auto;
97 height: .7031rem; 116 height: 1.1031rem;
98 margin-top: .2083rem; 117 margin-top: .0521rem;
99 } 118 }
100 } 119 }
101 120
......
...@@ -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 // 初始化图表 117 this.$nextTick(() => {
118 this.echartInit(); 118 // 初始化图表
119 this.barChartInit(res[0].recType); 119 this.echartInit();
120 }); 120 this.barChartInit(res[0].recType);
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 });
......
...@@ -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>
......
...@@ -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 }
......
...@@ -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>
......
...@@ -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: '确定',
......
...@@ -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);
......