Skip to content

bdc / bdcjg-web

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

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

2 parents 0570389e 30e5d464
Inline Side-by-side
Showing 7 changed files with 71 additions and 74 deletions
...@@ -364,8 +364,9 @@ ...@@ -364,8 +364,9 @@
364 分摊土地面积： <br /> 364 分摊土地面积： <br />
365 <p class="label-detail">（FTTDMJ）</p> 365 <p class="label-detail">（FTTDMJ）</p>
366 </span> 366 </span>
367 <el-input :disabled="$store.state.business.Edit" : 999999999999999, min: 0, precision: 3 }" 367 <el-input :disabled="$store.state.business.Edit"
368 placeholder="分摊土地面积" type="number" v-model.number="ruleForm.fttdmj"></el-input> 368 v-only-number="{ max: 999999999999999, min: 0, precision: 3 }" placeholder="分摊土地面积" type="number"
369 v-model.number="ruleForm.fttdmj"></el-input>
369 </el-form-item> 370 </el-form-item>
370 </el-col> 371 </el-col>
371 </el-row> 372 </el-row>
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
68 }, 68 },
69 // 如果需要自定义 tooltip样式，需要使用formatter 69 // 如果需要自定义 tooltip样式，需要使用formatter
70 formatter: params => { 70 formatter: params => {
71 return `<div style="">${params.name}:${params.value+"个"}</div>` 71 return `<div style="">${params.name}:${params.value + "个"}</div>`
72 } 72 }
73 }, 73 },
74 visualMap: { 74 visualMap: {
...@@ -90,23 +90,23 @@ export default { ...@@ -90,23 +90,23 @@ export default {
90 color: '#737373' 90 color: '#737373'
91 } 91 }
92 }, 92 },
93 geo: { 93 geo: {
94 aspectScale: 1, //长宽比 94 aspectScale: 1, //长宽比
95 zoom: 1.1, 95 zoom: 1.1,
96 mapType: '汉中市', // 自定义扩展图表类型 96 mapType: '汉中市', // 自定义扩展图表类型
97 top: '15%', 97 top: '15%',
98 left: '10%', 98 left: '10%',
99 map: '汉中市', 99 map: '汉中市',
100 itemStyle: { 100 itemStyle: {
101 normal: {//阴影 101 normal: {//阴影
102 areaColor: '#02D9FD ', 102 areaColor: '#02D9FD ',
103 shadowColor: '#01271F', 103 shadowColor: '#01271F',
104 borderWidth: 0, 104 borderWidth: 0,
105 shadowOffsetX: 2, 105 shadowOffsetX: 2,
106 shadowOffsetY: 25 106 shadowOffsetY: 25
107 } 107 }
108 } 108 }
109 }, 109 },
110 series: [ 110 series: [
111 { 111 {
112 type: 'map', 112 type: 'map',
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
121 borderColor: 'rgba(0,242,252,.5)', 121 borderColor: 'rgba(0,242,252,.5)',
122 borderWidth: 2, 122 borderWidth: 2,
123 shadowBlur: 7, 123 shadowBlur: 7,
124 borderColor:'rgba(19,54,162,.1)', 124 borderColor: 'rgba(19,54,162,.1)',
125 shadowColor: '#44f2fc', 125 shadowColor: '#44f2fc',
126 }, 126 },
127 emphasis: { 127 emphasis: {
...@@ -133,10 +133,9 @@ export default { ...@@ -133,10 +133,9 @@ export default {
133 }, 133 },
134 }, 134 },
135 label: { 135 label: {
136 136 formatter: params => {
137 formatter: params => { 137 return `${params.data?.name}\n${params.data?.value + "个"}`;
138 return `${params.data.name}\n${params.data.value+"个"}`; 138 },
139 },
140 show: true, 139 show: true,
141 position: 'insideRight', 140 position: 'insideRight',
142 textStyle: { 141 textStyle: {
......
...@@ -7,11 +7,11 @@ export default { ...@@ -7,11 +7,11 @@ export default {
7 components: { 7 components: {
8 Echart, 8 Echart,
9 }, 9 },
10 data() { 10 data () {
11 return { 11 return {
12 key:0 12 key: 0
13 } 13 }
14 }, 14 },
15 props: { 15 props: {
16 cdata: { 16 cdata: {
17 type: Object, 17 type: Object,
...@@ -21,11 +21,10 @@ export default { ...@@ -21,11 +21,10 @@ export default {
21 watch: { 21 watch: {
22 cdata: { 22 cdata: {
23 handler (newData) { 23 handler (newData) {
24 console.log("newData",newData);
25 this.options = { 24 this.options = {
26 grid: { 25 grid: {
27 right:"1%", 26 right: "1%",
28 bottom:"4%" 27 bottom: "4%"
29 }, 28 },
30 color: [ 29 color: [
31 "#37a2da", 30 "#37a2da",
...@@ -49,14 +48,14 @@ export default { ...@@ -49,14 +48,14 @@ export default {
49 { 48 {
50 name: "业务量", 49 name: "业务量",
51 type: "pie", 50 type: "pie",
52 radius: [40,100], 51 radius: [40, 100],
53 roseType: "area", 52 roseType: "area",
54 data: newData.seriesData 53 data: newData.seriesData
55 } 54 }
56 ], 55 ],
57 56
58 } 57 }
59 this.key++ 58 this.key++
60 }, 59 },
61 immediate: true, 60 immediate: true,
62 deep: true 61 deep: true
......
...@@ -19,30 +19,29 @@ export default { ...@@ -19,30 +19,29 @@ export default {
19 Chart, 19 Chart,
20 }, 20 },
21 mounted () { 21 mounted () {
22 this.getdjywltotal(); 22 this.getdjywltotal();
23 23
24 24
25 }, 25 },
26 methods: { 26 methods: {
27 // 获取登记业务量玫瑰图数据 27 // 获取登记业务量玫瑰图数据
28 async getdjywltotal () { 28 async getdjywltotal () {
29 try { 29 try {
30 let p = { 30 let p = {
31 DJLX: "", 31 DJLX: "",
32 QLLX: "", 32 QLLX: "",
33 XZQDM: "", 33 XZQDM: "",
34 }; 34 };
35 let res = await work.getdjywltotal(p); 35 let res = await work.getdjywltotal(p);
36 console.log("res",res); 36 // 遍历修改数组键，作为echars图表的参数
37 // 遍历修改数组键，作为echars图表的参数 37 res.result.map((item) => {
38 res.result.map((item) => {
39 return ( 38 return (
40 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal }) 39 this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal })
41 ) 40 )
42 }); 41 });
43 } catch (error) { 42 } catch (error) {
44 console.log(error); 43 console.log(error);
45 } 44 }
46 45
47 46
48 }, 47 },
...@@ -51,4 +50,5 @@ export default { ...@@ -51,4 +50,5 @@ export default {
51 </script> 50 </script>
52 51
53 <style lang="scss" scoped> 52 <style lang="scss" scoped>
53
54 </style> 54 </style>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </p> 18 </p>
19 <p> 19 <p>
20 <span>成功率</span> 20 <span>成功率</span>
21 <span class="cg">{{qxcgl}}</span> 21 <span class="cg">{{ qxcgl }}</span>
22 </p> 22 </p>
23 </div> 23 </div>
24 </div> 24 </div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 </p> 41 </p>
42 <p> 42 <p>
43 <span>成功率</span> 43 <span>成功率</span>
44 <span class="cg">{{stcgl}}</span> 44 <span class="cg">{{ stcgl }}</span>
45 </p> 45 </p>
46 </div> 46 </div>
47 </div> 47 </div>
...@@ -66,8 +66,8 @@ export default { ...@@ -66,8 +66,8 @@ export default {
66 stsuccess: "", 66 stsuccess: "",
67 qxjrl: "", 67 qxjrl: "",
68 stjrl: "", 68 stjrl: "",
69 qxcgl:"", 69 qxcgl: "",
70 stcgl:"" 70 stcgl: ""
71 }; 71 };
72 }, 72 },
73 mounted () { 73 mounted () {
...@@ -76,10 +76,10 @@ export default { ...@@ -76,10 +76,10 @@ export default {
76 components: { columnar }, 76 components: { columnar },
77 computed: { 77 computed: {
78 qxjrlList: function () { 78 qxjrlList: function () {
79 return this.qxjrl.toString().split(""); 79 return this.qxjrl && this.qxjrl.toString().split("");
80 }, 80 },
81 stjrlList: function () { 81 stjrlList: function () {
82 return this.stjrl.toString().split(""); 82 return this.stjrl && this.stjrl.toString().split("");
83 }, 83 },
84 }, 84 },
85 methods: { 85 methods: {
...@@ -92,19 +92,18 @@ export default { ...@@ -92,19 +92,18 @@ export default {
92 XZQDM: "", 92 XZQDM: "",
93 }; 93 };
94 let res = await work.getsthjqxjrtotal(p); 94 let res = await work.getsthjqxjrtotal(p);
95 console.log("res",res); 95 this.stjrl = res.result.sum
96 this.stjrl=res.result.sum 96 this.qxjrl = res.result.sum
97 this.qxjrl=res.result.sum 97 this.qxerrer = Number(res.result.qxjrerrer)
98 this.qxerrer=Number(res.result.qxjrerrer) 98 this.sterrer = Number(res.result.sthjerrer)
99 this.sterrer=Number(res.result.sthjerrer) 99 if (res.result.sum == "0") {
100 if(res.result.sum=="0"){ 100 this.qxcgl = "100%"
101 this.qxcgl="100%" 101 this.stcgl = "100%"
102 this.stcgl="100%" 102 } else {
103 }else{ 103 let qxcglnum = Number(res.result.qxjrsuccess) / this.qxjrl * 100
104 let qxcglnum=Number(res.result.qxjrsuccess)/this.qxjrl*100 104 let stcgl = Number(res.result.sthjsuccess) / this.qxjrl * 100
105 let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100 105 this.qxcgl = qxcglnum.toFixed(2) + "%";
106 this.qxcgl=qxcglnum.toFixed(2)+"%"; 106 this.stcgl = stcgl.toFixed(2) + "%";
107 this.stcgl=stcgl.toFixed(2)+"%";
108 } 107 }
109 108
110 } catch (error) { 109 } catch (error) {
......
...@@ -29,9 +29,8 @@ class data extends filter { ...@@ -29,9 +29,8 @@ class data extends filter {
29 <div> 29 <div>
30 <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span> 30 <span v-show={scope.row.exchangeState == 0} class='warehousing'>未上报</span>
31 <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span> 31 <span v-show={scope.row.exchangeState == 1} class='warehousing'>上报成功未响应</span>
32 <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报失败</span> 32 <span v-show={scope.row.exchangeState == 2} class='warehousing'>上报响应失败</span>
33 <span v-show={scope.row.exchangeState == 3} class='adopt'>上报成功响应成功</span> 33 <span v-show={scope.row.exchangeState == 3} class='adopt'>上报响应成功</span>
34 <span v-show={scope.row.exchangeState == 4} class='warehousing'>响应失败</span>
35 </div> 34 </div>
36 ) 35 )
37 } 36 }
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 </el-col> 30 </el-col>
31 <el-col :span="6"> 31 <el-col :span="6">
32 <el-form-item label="汇交状态" prop="state"> 32 <el-form-item label="汇交状态" prop="state">
33 <el-select v-model="form.state" class="width100" clearable placeholder="响应结果"> 33 <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
34 <el-option v-for="item in []" :key="item.value" :label="item.label" :value="item.value"> 34 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
35 </el-option> 35 </el-option>
36 </el-select> 36 </el-select>
37 </el-form-item> 37 </el-form-item>
......