Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
68b86f0e by 任超
Options

Merge branch 'master' into dev

2 parents 20dc04b9 9076825c
Inline Side-by-side
Showing 58 changed files with 345 additions and 251 deletions
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 "axios": "^0.21.1", 12 "axios": "^0.21.1",
13 "clipboard": "^2.0.11", 13 "clipboard": "^2.0.11",
14 "core-js": "^3.6.5", 14 "core-js": "^3.6.5",
15 "echarts": "^4.6.0", 15 "echarts": "^5.3.3",
16 "file-saver": "^2.0.5", 16 "file-saver": "^2.0.5",
17 "js-cookie": "2.2.0", 17 "js-cookie": "2.2.0",
18 "jsoneditor": "^9.9.2", 18 "jsoneditor": "^9.9.2",
......
1 /*
2 * @Description: 这个是所有api的前缀配置文件
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 17:14:19
5 */
6
7 export default {
8 TITLE: '汉中市数据上报系统',
9 SERVERAPI: '/bdcsjsb', //赵千
10 MANAGEMENTAPI: 'http://192.168.2.236/management'
11 }
...\ No newline at end of file ...\ No newline at end of file
1 {
2 "TITLE": "汉中市数据上报系统"
3 }
...\ No newline at end of file ...\ No newline at end of file
1 /* 1 /*
2 * @Description: 这个是所有api的前缀配置文件 2 * @Description: 这个是所有api的前缀配置文件
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-01 15:35:44 4 * @LastEditTime: 2023-03-16 13:37:11
5 */ 5 */
6 export default { 6 export default {
7 TITLE: '汉中市数据上报系统',
8 SERVERAPI: '/bdcsjsb', //赵千 7 SERVERAPI: '/bdcsjsb', //赵千
9 MANAGEMENTAPI: 'http://192.168.2.236/management' 8 MANAGEMENTAPI: 'http://192.168.2.236/management'
10 } 9 }
......
1 import Vue from 'vue'
1 import request from '@/utils/request' 2 import request from '@/utils/request'
3 console.log(Vue.prototype, Vue.prototype.$BASE_API);
2 import SERVER from './config' 4 import SERVER from './config'
3 // 获取用户信息 5 // 获取用户信息
4 export function getUserInfo () { 6 export function getUserInfo () {
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
4 </template> 4 </template>
5 5
6 <script> 6 <script>
7 import Echart from "@/common/echart"; 7 import Echart from "@/common/echart";
8 export default { 8 export default {
9 data () { 9 data () {
10 return { 10 return {
11 xAxisData: {}, 11 xAxisData: {},
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
35 } 35 }
36 return rgbaColor; 36 return rgbaColor;
37 }, 37 },
38 fontSize(res) { 38 fontSize (res) {
39 let docEl = document.documentElement, 39 let docEl = document.documentElement,
40 clientWidth = 40 clientWidth =
41 window.innerWidth || 41 window.innerWidth ||
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
44 if (!clientWidth) return; 44 if (!clientWidth) return;
45 let fontSize = clientWidth / 1920; 45 let fontSize = clientWidth / 1920;
46 return res * fontSize; 46 return res * fontSize;
47 } 47 }
48 }, 48 },
49 watch: { 49 watch: {
50 cdata: { 50 cdata: {
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
61 data: newData.legendItem, 61 data: newData.legendItem,
62 textStyle: { 62 textStyle: {
63 color: "#00DEFF", 63 color: "#00DEFF",
64 fontSize:this.fontSize(12), 64 fontSize: this.fontSize(12),
65 }, 65 },
66 }, 66 },
67 // calculable: true, 67 // calculable: true,
...@@ -151,10 +151,7 @@ export default { ...@@ -151,10 +151,7 @@ export default {
151 zlevel: 3, 151 zlevel: 3,
152 lineStyle: { 152 lineStyle: {
153 normal: { 153 normal: {
154 color: newData.color[0], 154 color: newData.color[0]
155 shadowBlur: 3,
156 shadowColor: this.hexToRgba(newData.color[0], 0.5),
157 shadowOffsetY: 0,
158 }, 155 },
159 }, 156 },
160 data: this.yAxisData1, 157 data: this.yAxisData1,
...@@ -170,9 +167,6 @@ export default { ...@@ -170,9 +167,6 @@ export default {
170 lineStyle: { 167 lineStyle: {
171 normal: { 168 normal: {
172 color: newData.color[1], 169 color: newData.color[1],
173 shadowBlur: 0,
174 shadowColor: this.hexToRgba(newData.color[1], 0.5),
175 shadowOffsetY: 0,
176 }, 170 },
177 }, 171 },
178 data: this.yAxisData2, 172 data: this.yAxisData2,
...@@ -188,9 +182,6 @@ export default { ...@@ -188,9 +182,6 @@ export default {
188 lineStyle: { 182 lineStyle: {
189 normal: { 183 normal: {
190 color: newData.color[2], 184 color: newData.color[2],
191 shadowBlur: 3,
192 shadowColor: this.hexToRgba(newData.color[2], 0.5),
193 shadowOffsetY: 0,
194 }, 185 },
195 }, 186 },
196 data: this.yAxisData3, 187 data: this.yAxisData3,
...@@ -202,5 +193,5 @@ export default { ...@@ -202,5 +193,5 @@ export default {
202 deep: true, 193 deep: true,
203 }, 194 },
204 }, 195 },
205 }; 196 };
206 </script> 197 </script>
......
...@@ -33,6 +33,20 @@ ...@@ -33,6 +33,20 @@
33 axisPointer: { 33 axisPointer: {
34 type: "shadow", 34 type: "shadow",
35 }, 35 },
36 formatter: function (params) {
37 let html = "";
38 params.forEach((v) => {
39 html += `<div style="color: #000;font-size: 14px;line-height: 24px background-color: #000000">
40 <span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params[v.componentIndex].color
41 };"></span>
42 ${v.seriesName}.${v.name}
43 <span style="color:blue;font-weight:700;font-size: 18px">${v.value}</span>
44 个`;
45 });
46 return html;
47 },
48 extraCssText:
49 "background: #85a2eb; border-radius: 2;box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);color: #333;",
36 }, 50 },
37 grid: { 51 grid: {
38 left: "5%", 52 left: "5%",
...@@ -86,7 +100,7 @@ ...@@ -86,7 +100,7 @@
86 }, 100 },
87 itemStyle: { 101 itemStyle: {
88 normal: { 102 normal: {
89 color: "#5fba7d", 103 color: "#12ba7d",
90 }, 104 },
91 }, 105 },
92 data: newData.barData, 106 data: newData.barData,
......
...@@ -38,21 +38,8 @@ export default { ...@@ -38,21 +38,8 @@ export default {
38 handler (newData) { 38 handler (newData) {
39 let _this = this; 39 let _this = this;
40 // 设置点的位置(经纬度) 40 // 设置点的位置(经纬度)
41 const geoCoordMap = {
42 汉台区: [107.03187, 33.06774, 20],
43 南郑区: [106.94024, 33.00299, 20],
44 城固县: [107.33367, 33.15661, 20],
45 洋县: [107.545837, 33.222739, 20],
46 西乡县: [107.76867, 32.98411, 20],
47 镇巴县: [107.89648, 32.53487, 20],
48 勉县: [106.673221, 33.153553, 20],
49 留坝县: [106.92233, 33.61606, 20],
50 佛坪县: [107.98974, 33.52496, 20],
51 宁强县: [106.25958, 32.82881, 20],
52 略阳县: [106.15399, 33.33009, 20],
53 };
54 this.options = { 41 this.options = {
55 showLegendSymbol: true, 42 showLegendSymbol: false,
56 tooltip: { 43 tooltip: {
57 trigger: "item", 44 trigger: "item",
58 textStyle: { 45 textStyle: {
...@@ -72,24 +59,25 @@ export default { ...@@ -72,24 +59,25 @@ export default {
72 visualMap: { 59 visualMap: {
73 min: 0, 60 min: 0,
74 max: _this.max, 61 max: _this.max,
75 bottom: "12%", 62 bottom: "6%",
76 left: 50, 63 left: 50,
77 splitNumber: 6, 64 splitNumber: 6,
78 seriesIndex: [0], 65 seriesIndex: [0],
79 itemWidth: 20, // 每个图元的宽度 66 itemWidth: 20, // 每个图元的宽度
80 itemGap: 2, // 每两个图元之间的间隔距离，单位为px 67 itemGap: 4, // 每两个图元之间的间隔距离，单位为px
68 selectedMode: false, // 是否允许点击
81 pieces: [ 69 pieces: [
82 // 自定义每一段的范围，以及每一段的文字 70 // 自定义每一段的范围，以及每一段的文字
83 { gte: 100, label: "5000以上", color: "#035cf5" }, // 不指定 max，表示 max 为无限大（Infinity）。 71 { gte: 5000, label: "≥5000", color: "#056BEC" }, // 不指定 max，表示 max 为无限大（Infinity）。
84 { gte: 50, lte: 6000, label: "1000-5000", color: "#3375e4" }, 72 { gte: 1000, lte: 5000, label: "1000-5000", color: "#48BDE3" },
85 { gte: 20, lte: 2000, label: "500-1000", color: "#6797ef" }, 73 { gte: 500, lte: 1000, label: "500-1000", color: "#0494F3" },
86 { gte: 1, lte: 1000, label: "0-500", color: "#96b5ef" }, 74 { gte: 0, lte: 500, label: "≤500", color: "#1872CC" },
87 ], 75 ],
88 textStyle: { 76 textStyle: {
89 color: "#737373", 77 color: "#CEF8FF",
90 }, 78 }
91 }, 79 },
92 geo: { 80 geo: [{
93 aspectScale: 1, //长宽比 81 aspectScale: 1, //长宽比
94 zoom: 1.1, 82 zoom: 1.1,
95 mapType: "", // 自定义扩展图表类型 83 mapType: "", // 自定义扩展图表类型
...@@ -99,14 +87,39 @@ export default { ...@@ -99,14 +87,39 @@ export default {
99 itemStyle: { 87 itemStyle: {
100 normal: { 88 normal: {
101 //阴影 89 //阴影
102 areaColor: "#5689FD ", 90 areaColor: "#5689FD",
103 shadowColor: "#21371d", 91 // shadowColor: "#21371d",
104 borderWidth: 0, 92 borderWidth: 1,
105 shadowOffsetX: 2, 93 // shadowOffsetX: 2,
106 shadowOffsetY: 25, 94 // shadowOffsetY: 20,
107 }, 95 },
108 }, 96 },
97 },{
98 aspectScale: 1, //长宽比
99 zoom: 1.1,
100 mapType: "", // 自定义扩展图表类型
101 top: "18%",
102 left: "10%",
103 map: "汉中市",
104 itemStyle: {
105 color:'#21371d',
106 areaColor: "#21371d",
107 borderWidth: 1,
108 borderColor:"#00A3CB",
109 shadowColor: "#01C5E9",
110 shadowBlur:10,
111 shadowOffsetX: 0,
112 shadowOffsetY: -12,
113 // normal: {
114 // //阴影
115 // color:'#21371d',
116 // areaColor: "#21371d",
117 // },
109 }, 118 },
119 emphasis: {
120 disabled:true
121 }
122 }],
110 series: [ 123 series: [
111 { 124 {
112 type: "map", 125 type: "map",
...@@ -117,13 +130,37 @@ export default { ...@@ -117,13 +130,37 @@ export default {
117 left: "10%", 130 left: "10%",
118 itemStyle: { 131 itemStyle: {
119 normal: { 132 normal: {
120 areaColor: "rgba(19,54,162,.5)", 133 // areaColor: "rgba(19,54,162,.1)",
121 borderColor: "rgba(0,242,252,.5)", 134 borderWidth: 1.6,
122 borderWidth: 2, 135 // shadowBlur: 2,
123 shadowBlur: 1, 136 borderColor: "#9DFFFC",
124 borderColor: "rgb(155, 200, 200)", 137 // shadowColor: "#44f2fc",
125 shadowColor: "#44f2fc",
126 }, 138 },
139 emphasis: {
140 // itemStyle:{
141 // 地图区域的高亮颜色
142 areaColor: {
143 type: 'linear',
144 x: 0,
145 y: 0,
146 x2: 0,
147 y2: 1,
148 colorStops: [{
149 offset: 0, color: '#4DD1B4' // 0% 处的颜色
150 }, {
151 offset: 1, color: '#15BFCE' // 100% 处的颜色
152 }],
153 global: false // 缺省为 false
154 },
155 borderType: 'dottod',
156 borderWidth: 0,
157 borderColor:'#F8F071',
158 shadowColor: '#000',
159 shadowBlur: 10,
160 shadowOffsetY:4
161 // }
162
163 }
127 }, 164 },
128 label: { 165 label: {
129 formatter: (params) => { 166 formatter: (params) => {
...@@ -141,12 +178,18 @@ export default { ...@@ -141,12 +178,18 @@ export default {
141 }, 178 },
142 }, 179 },
143 }, 180 },
181 // 选中区域颜色
182 // select:{
183 // itemStyle:{
184 // areaColor:'red'
185 // }
186 // },
144 data: newData, 187 data: newData,
145 }, 188 },
146 ], 189 ],
147 }; 190 };
148 // 重新选择区域 191 // 重新选择区域
149 this.handleMapRandomSelect(); 192 // this.handleMapRandomSelect();
150 }, 193 },
151 194
152 immediate: true, 195 immediate: true,
......
1 <template> 1 <template>
2 <Echart 2 <Echart :options="options" id="centreLeft1Chart" :key="key" height="1.0417rem" width="80%"></Echart>
3 :options="options"
4 id="centreLeft1Chart"
5 :key="key"
6 height="1.0417rem"
7 width="80%"></Echart>
8 </template> 3 </template>
9 <script> 4 <script>
10 import Echart from "@/common/echart"; 5 import Echart from "@/common/echart";
...@@ -26,7 +21,7 @@ ...@@ -26,7 +21,7 @@
26 watch: { 21 watch: {
27 cdata: { 22 cdata: {
28 handler (newData) { 23 handler (newData) {
29 console.log("newData", newData); 24
30 this.options = { 25 this.options = {
31 color: [ 26 color: [
32 "#37a2da", 27 "#37a2da",
...@@ -41,7 +36,20 @@ ...@@ -41,7 +36,20 @@
41 ], 36 ],
42 tooltip: { 37 tooltip: {
43 trigger: "item", 38 trigger: "item",
44 formatter: "<br/>{b} : {c} ({d}%)", 39 formatter: function (params) {
40 let html = "";
41 html += `<div style="font-size: 14px;line-height: 24px >
42 <span style="display:inline-block;"></span>
43 ${params.name}
44 <span style="color:blue;font-weight:700;font-size: 18px">${params.value}</span>
45 个`;
46 return html;
47 },
48 extraCssText:
49 "background: #85a2eb; border-radius: 0;box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);color: #333;",
50 },
51 label: {
52 color: 'inherit',
45 }, 53 },
46 series: [ 54 series: [
47 { 55 {
...@@ -50,16 +58,18 @@ ...@@ -50,16 +58,18 @@
50 radius: '60%', 58 radius: '60%',
51 avoidLabelOverlap: true, 59 avoidLabelOverlap: true,
52 label: { 60 label: {
61 color: 'inherit',
53 formatter: (params) => { 62 formatter: (params) => {
54 return `${params.name}`; 63 return `${params.name}`;
55 }, 64 },
56 position: "outer", 65 position: "outer",
57 alignTo: "edge", 66 alignTo: "edge",
58 margin: 10, 67 margin: 10,
68
59 normal: { 69 normal: {
60 show: true, 70 show: true,
61 textStyle: { 71 textStyle: {
62 fontSize: 12 72 fontSize: 12,
63 } 73 }
64 }, 74 },
65 }, 75 },
......
1 <!--
2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 15:24:53
4 * @LastEditors: xiaomiao 1158771342@qq.com
5 * @LastEditTime: 2023-03-16 15:58:03
6 * @FilePath: \上报\bdcjg-web\src\components\Echart\Rose\index.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 -->
1 <template> 9 <template>
2 <div> 10 <div>
3 <Chart :cdata="cdata" /> 11 <Chart :cdata="cdata" />
...@@ -28,7 +36,7 @@ ...@@ -28,7 +36,7 @@
28 methods: { 36 methods: {
29 async addhousetotal () { 37 async addhousetotal () {
30 if (this.cdata == 0) { 38 if (this.cdata == 0) {
31 this.getdata = []; 39 this.cdata = [];
32 try { 40 try {
33 let { result: res } = await work.addhousetotal(); 41 let { result: res } = await work.addhousetotal();
34 res.map((item) => { 42 res.map((item) => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-13 11:09:01 4 * @LastEditTime: 2023-03-17 10:25:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class='result'> 7 <div class='result'>
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
51 height: 100%; 51 height: 100%;
52 52
53 /deep/.el-textarea__inner { 53 /deep/.el-textarea__inner {
54 height: 30vh !important; 54 height: 50%;
55 color: #ffffff; 55 color: #ffffff;
56 border: none !important; 56 border: none !important;
57 color: #ffffff; 57 color: #ffffff;
...@@ -62,6 +62,7 @@ export default { ...@@ -62,6 +62,7 @@ export default {
62 border-radius: 2px; 62 border-radius: 2px;
63 padding: 10px; 63 padding: 10px;
64 box-sizing: border-box; 64 box-sizing: border-box;
65 height: 49%;
65 66
66 p { 67 p {
67 color: #2997E8; 68 color: #2997E8;
......
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
116 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'"> 116 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
117 <Xyjg :form-data='dataReport'></Xyjg> 117 <Xyjg :form-data='dataReport'></Xyjg>
118 </div> 118 </div>
119 </div>
120 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'"> 119 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'">
121 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn> 120 <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
122 <btn nativeType="cx" @click="submitForm">保 存</btn> 121 <btn nativeType="cx" @click="submitForm">保 存</btn>
...@@ -124,6 +123,7 @@ ...@@ -124,6 +123,7 @@
124 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'"> 123 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
125 <btn nativeType="cx" @click="handleResubmit">重新上报</btn> 124 <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
126 </div> 125 </div>
126 </div>
127 </el-dialog> 127 </el-dialog>
128 </template> 128 </template>
129 129
......
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
94 }, 94 },
95 onJsonSave () { 95 onJsonSave () {
96 const value = this.resultInfo 96 const value = this.resultInfo
97 console.log(this.resultInfo, 'resultInfo')
98 if (this.hasJsonFlag === false) { 97 if (this.hasJsonFlag === false) {
99 this.$message.error({ message: 'json格式验证失败', showClose: true }) 98 this.$message.error({ message: 'json格式验证失败', showClose: true })
100 // alert("json验证失败") 99 // alert("json验证失败")
...@@ -112,7 +111,6 @@ ...@@ -112,7 +111,6 @@
112 this.dialogVisible = true 111 this.dialogVisible = true
113 }, 112 },
114 cancel () { 113 cancel () {
115 console.log(this.tmpResultInfo, 'tmpResultInfo')
116 this.resultInfo = this.tmpResultInfo 114 this.resultInfo = this.tmpResultInfo
117 this.dialogVisible = false 115 this.dialogVisible = false
118 }, 116 },
......

1.4 KB | W: | H:

1.34 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

9.58 KB | W: | H:

3.53 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -134,9 +134,8 @@ export default { ...@@ -134,9 +134,8 @@ export default {
134 @extend .xuanzhong; 134 @extend .xuanzhong;
135 } 135 }
136 136
137 /deep/.el-menu-item.is-active { 137 /deep/.is-active {
138 @extend .xuanzhong; 138 @extend .xuanzhong;
139
140 } 139 }
141 140
142 .navbar { 141 .navbar {
......
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
9 </template> 9 </template>
10 10
11 <script> 11 <script>
12 import { mapGetters } from 'vuex' 12 import { mapGetters } from 'vuex'
13 import Logo from './Logo' 13 import Logo from './Logo'
14 import SidebarItem from './SidebarItem' 14 import SidebarItem from './SidebarItem'
15 import variables from '@/styles/variables.scss' 15 import variables from '@/styles/variables.scss'
16 import { asyncRoutes } from '@/router' 16 import { asyncRoutes } from '@/router'
17 export default { 17 export default {
18 components: { SidebarItem, Logo }, 18 components: { SidebarItem, Logo },
19 computed: { 19 computed: {
20 ...mapGetters(['permission_routes', 'sidebar']), 20 ...mapGetters(['permission_routes', 'sidebar']),
...@@ -34,15 +34,12 @@ ...@@ -34,15 +34,12 @@
34 asyncRoutes () { 34 asyncRoutes () {
35 return asyncRoutes.slice(0, 3) 35 return asyncRoutes.slice(0, 3)
36 } 36 }
37 },
38 mounted () {
39 console.log("permission_routes", this.permission_routes);
40 }
41 } 37 }
38 }
42 </script> 39 </script>
43 <style scoped lang="scss"> 40 <style scoped lang="scss">
44 .el-menu--horizontal { 41 .el-menu--horizontal {
45 display: flex; 42 display: flex;
46 background: none !important; 43 background: none !important;
47 } 44 }
48 </style> 45 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-10 14:59:43 4 * @LastEditTime: 2023-03-16 11:15:48
5 --> 5 -->
6 <template> 6 <template>
7 <div class="app-wrapper jgWrapper"> 7 <div class="app-wrapper jgWrapper">
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
12 </div> 12 </div>
13 </template> 13 </template>
14 <script> 14 <script>
15 import { AppMain, Navbar, Sidebar, TagsView } from './components' 15 import { AppMain, Navbar, Sidebar, TagsView } from './components'
16 import ResizeMixin from './mixin/ResizeHandler' 16 import ResizeMixin from './mixin/ResizeHandler'
17 import { mapState } from 'vuex' 17 import { mapState } from 'vuex'
18 export default { 18 export default {
19 name: 'Layout', 19 name: 'Layout',
20 components: { 20 components: {
21 AppMain, 21 AppMain,
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
25 }, 25 },
26 created () { 26 created () {
27 this.$store.dispatch("products/setData", "BDCJGPT"); 27 this.$store.dispatch("products/setData", "BDCJGPT");
28 console.log("ZOULEJG");
29 }, 28 },
30 mixins: [ResizeMixin], 29 mixins: [ResizeMixin],
31 computed: { 30 computed: {
...@@ -35,15 +34,15 @@ ...@@ -35,15 +34,15 @@
35 fixedHeader: state => state.settings.fixedHeader 34 fixedHeader: state => state.settings.fixedHeader
36 }) 35 })
37 } 36 }
38 } 37 }
39 </script> 38 </script>
40 <style lang="scss"> 39 <style lang="scss">
41 @import "~@/styles/jgSidebar.scss"; 40 @import "~@/styles/jgSidebar.scss";
42 </style> 41 </style>
43 <style lang="scss" scoped> 42 <style lang="scss" scoped>
44 @import "~@/styles/mixin.scss"; 43 @import "~@/styles/mixin.scss";
45 44
46 .app-wrapper { 45 .app-wrapper {
47 @include clearfix; 46 @include clearfix;
48 position: relative; 47 position: relative;
49 height: 100%; 48 height: 100%;
...@@ -58,9 +57,9 @@ ...@@ -58,9 +57,9 @@
58 position: fixed; 57 position: fixed;
59 top: 0; 58 top: 0;
60 } 59 }
61 } 60 }
62 61
63 .appMain { 62 .appMain {
64 // min-width: 1280px; 63 // min-width: 1280px;
65 height: calc(100vh - 101px) !important; 64 height: calc(100vh - 101px) !important;
66 box-sizing: border-box; 65 box-sizing: border-box;
...@@ -68,5 +67,5 @@ ...@@ -68,5 +67,5 @@
68 .app-main { 67 .app-main {
69 height: 100%; 68 height: 100%;
70 } 69 }
71 } 70 }
72 </style> 71 </style>
......
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
53 } 53 }
54 }, 54 },
55 mounted () { 55 mounted () {
56 console.log("this. permission_routes", this.permission_routes);
57 56
58 } 57 }
59 } 58 }
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
13 </div> 13 </div>
14 </template> 14 </template>
15 <script> 15 <script>
16 import { AppMain, Navbar, Sidebar, TagsView } from './components' 16 import { AppMain, Navbar, Sidebar, TagsView } from './components'
17 import ResizeMixin from './mixin/ResizeHandler' 17 import ResizeMixin from './mixin/ResizeHandler'
18 import { mapState } from 'vuex' 18 import { mapState } from 'vuex'
19 export default { 19 export default {
20 name: 'Layout', 20 name: 'Layout',
21 components: { 21 components: {
22 AppMain, 22 AppMain,
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
27 mixins: [ResizeMixin], 27 mixins: [ResizeMixin],
28 created () { 28 created () {
29 this.$store.dispatch("products/setData", "BDCSBPT"); 29 this.$store.dispatch("products/setData", "BDCSBPT");
30 console.log("ZOULEJG");
31 }, 30 },
32 computed: { 31 computed: {
33 ...mapState({ 32 ...mapState({
...@@ -36,13 +35,13 @@ ...@@ -36,13 +35,13 @@
36 fixedHeader: state => state.settings.fixedHeader 35 fixedHeader: state => state.settings.fixedHeader
37 }) 36 })
38 } 37 }
39 } 38 }
40 </script> 39 </script>
41 <style lang="scss"> 40 <style lang="scss">
42 @import "~@/styles/mixin.scss"; 41 @import "~@/styles/mixin.scss";
43 @import "~@/styles/sbSidebar.scss"; 42 @import "~@/styles/sbSidebar.scss";
44 43
45 .app-wrapper { 44 .app-wrapper {
46 @include clearfix; 45 @include clearfix;
47 position: relative; 46 position: relative;
48 height: 100%; 47 height: 100%;
...@@ -54,9 +53,9 @@ ...@@ -54,9 +53,9 @@
54 position: fixed; 53 position: fixed;
55 top: 0; 54 top: 0;
56 } 55 }
57 } 56 }
58 57
59 .drawer-bg { 58 .drawer-bg {
60 background: #000; 59 background: #000;
61 opacity: 0.3; 60 opacity: 0.3;
62 width: 100%; 61 width: 100%;
...@@ -64,15 +63,15 @@ ...@@ -64,15 +63,15 @@
64 height: 100%; 63 height: 100%;
65 position: absolute; 64 position: absolute;
66 z-index: 999; 65 z-index: 999;
67 } 66 }
68 67
69 .fixed-header { 68 .fixed-header {
70 width: 100%; 69 width: 100%;
71 transition: width 0.28s; 70 transition: width 0.28s;
72 } 71 }
73 72
74 .el-dropdown-menu--small { 73 .el-dropdown-menu--small {
75 padding: 0; 74 padding: 0;
76 width: 5px; 75 width: 5px;
77 } 76 }
78 </style> 77 </style>
......
1 /*
2 * @Author: yangwei
3 * @Date: 2023-01-16 09:10:12
4 * @LastEditors: yangwei
5 * @LastEditTime: 2023-03-16 09:33:27
6 * @FilePath: \bdcjg-web\src\main.js
7 * @Description:
8 *
9 * Copyright (c) 2023 by ${yangwei}, All Rights Reserved.
10 */
1 import Vue from 'vue' 11 import Vue from 'vue'
2 import App from './App' 12 import App from './App'
3 import 'normalize.css/normalize.css' // a modern alternative to CSS resets 13 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
...@@ -6,9 +16,10 @@ import '@/styles/element-variables.scss' ...@@ -6,9 +16,10 @@ import '@/styles/element-variables.scss'
6 import '@/styles/index.scss' 16 import '@/styles/index.scss'
7 import Base from './base' // 全局组件引入 17 import Base from './base' // 全局组件引入
8 import mixin from '@/utils/mixin/theme.js' 18 import mixin from '@/utils/mixin/theme.js'
9 19 import axios from 'axios'
10 import dataV from '@jiaminghi/data-view'; 20 import dataV from '@jiaminghi/data-view';
11 import echarts from "echarts" 21 import * as echarts from "echarts"
22
12 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading' 23 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
13 Vue.mixin(mixin) 24 Vue.mixin(mixin)
14 import './directive/vxe-table' 25 import './directive/vxe-table'
...@@ -41,15 +52,21 @@ import './image/icons' // icon ...@@ -41,15 +52,21 @@ import './image/icons' // icon
41 import store from './store' 52 import store from './store'
42 import router from './router' 53 import router from './router'
43 import _ from 'lodash' 54 import _ from 'lodash'
44 import './permission' // permission control
45 Vue.use(Element, { size: 'small', zIndex: 1000 }) 55 Vue.use(Element, { size: 'small', zIndex: 1000 })
46 Vue.use(Base) 56 Vue.use(Base)
47 Vue.component('icon', Icon); 57 Vue.component('icon', Icon);
48 Vue.prototype.$echarts = echarts 58 Vue.prototype.$echarts = echarts
49 Vue.use(dataV) 59 Vue.use(dataV)
50 new Vue({ 60 axios.get("./config.json")
61 .then((res) => {
62 Vue.prototype.BASE_API = res.data
63 require('./permission')
64 new Vue({
51 el: '#app', 65 el: '#app',
52 router, 66 router,
53 store, 67 store,
54 render: h => h(App) 68 render: h => h(App)
55 }) 69 })
70
71 })
72
......
...@@ -58,7 +58,7 @@ export const TableListMixin = { ...@@ -58,7 +58,7 @@ export const TableListMixin = {
58 } 58 }
59 }) 59 })
60 .catch(error => { 60 .catch(error => {
61 console.log('errrrrrorrrrr', error) 61 console.log('error', error)
62 this.loading = false 62 this.loading = false
63 }) 63 })
64 }, 64 },
...@@ -83,7 +83,6 @@ export const TableListMixin = { ...@@ -83,7 +83,6 @@ export const TableListMixin = {
83 if (this.queryOptions !== '') { 83 if (this.queryOptions !== '') {
84 this.queryParam.queryOptions = JSON.stringify(this.queryOptions) 84 this.queryParam.queryOptions = JSON.stringify(this.queryOptions)
85 } 85 }
86 // console.log(this.$filterNullObj(this.queryParam), '查询条件')
87 return this.$filterNullObj(this.queryParam) 86 return this.$filterNullObj(this.queryParam)
88 }, 87 },
89 // 新增 88 // 新增
......
...@@ -69,9 +69,8 @@ ...@@ -69,9 +69,8 @@
69 69
70 .regularHeight { 70 .regularHeight {
71 display: flex; 71 display: flex;
72 flex: 1;
73 height: 100%;
74 flex-direction: column; 72 flex-direction: column;
73 height: 87vh;
75 74
76 .editDialogBox-con, 75 .editDialogBox-con,
77 .JsonEditor { 76 .JsonEditor {
......
...@@ -139,7 +139,7 @@ input[type="number"] { ...@@ -139,7 +139,7 @@ input[type="number"] {
139 } 139 }
140 140
141 ::-webkit-scrollbar-thumb { 141 ::-webkit-scrollbar-thumb {
142 background: #458ACF; 142 background: rgba(69, 138, 207,.3);
143 background-clip: padding-box; 143 background-clip: padding-box;
144 min-height: 28px; 144 min-height: 28px;
145 -webkit-border-radius: 6px; 145 -webkit-border-radius: 6px;
...@@ -148,7 +148,12 @@ input[type="number"] { ...@@ -148,7 +148,12 @@ input[type="number"] {
148 } 148 }
149 149
150 ::-webkit-scrollbar-thumb:hover { 150 ::-webkit-scrollbar-thumb:hover {
151 background: #458ACF; 151 background: rgba(69, 138, 207,.3);
152 }
153 // 滚动条位置
154 .el-scrollbar__wrap{
155 // margin-bottom: 0px!important;
156 margin-right: 0px!important;
152 } 157 }
153 158
154 // element 样式补丁 159 // element 样式补丁
...@@ -329,6 +334,7 @@ table td { ...@@ -329,6 +334,7 @@ table td {
329 padding-top: 13px; 334 padding-top: 13px;
330 padding-bottom: 13px; 335 padding-bottom: 13px;
331 border: none; 336 border: none;
337
332 margin-top: 5px !important; 338 margin-top: 5px !important;
333 339
334 table { 340 table {
...@@ -396,11 +402,18 @@ table td { ...@@ -396,11 +402,18 @@ table td {
396 color: #DBFAFF 402 color: #DBFAFF
397 } 403 }
398 404
405 .el-date-table td span:hover {
406 background-color: #074487;
407 border: 1px solid #02D9FD;
408 color: #02D9FD
409 }
410
399 .el-date-table td.current:not(.disabled) span { 411 .el-date-table td.current:not(.disabled) span {
400 background-color: #074487; 412 background-color: #074487;
401 // border:1px solid saddlebrown; 413 // border:1px solid saddlebrown;
402 box-shadow: inset 0 0 7px #02D9FD; 414 box-shadow: inset 0 0 7px #02D9FD;
403 border: 1px solid #02D9FD; 415 border: 1px solid #02D9FD;
416 color: #02D9FD
404 } 417 }
405 418
406 } 419 }
...@@ -479,6 +492,12 @@ table td { ...@@ -479,6 +492,12 @@ table td {
479 } 492 }
480 } 493 }
481 494
495 .el-button--text {
496 display: flex;
497 align-items: center;
498 justify-content: center;
499 }
500
482 // 时间组件input框部分 501 // 时间组件input框部分
483 .el-date-editor { 502 .el-date-editor {
484 503
...@@ -504,7 +523,7 @@ table td { ...@@ -504,7 +523,7 @@ table td {
504 height: 26px; 523 height: 26px;
505 line-height: 26px; 524 line-height: 26px;
506 background-size: 100% 100%; 525 background-size: 100% 100%;
507 margin-bottom: 7px; 526 margin-bottom: 12px;
508 color: #02D9FD !important; 527 color: #02D9FD !important;
509 } 528 }
510 529
...@@ -515,6 +534,7 @@ table td { ...@@ -515,6 +534,7 @@ table td {
515 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover, 534 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover,
516 .el-select-dropdown__item:hover, 535 .el-select-dropdown__item:hover,
517 .el-select-dropdown__item.selected, 536 .el-select-dropdown__item.selected,
537 .el-menu--horizontal .el-menu .el-menu-item.is-active,
518 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus { 538 .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):focus {
519 background: url("~@/image/xzslitembg.png") no-repeat; 539 background: url("~@/image/xzslitembg.png") no-repeat;
520 background-size: 100% 100%; 540 background-size: 100% 100%;
...@@ -572,3 +592,8 @@ table td { ...@@ -572,3 +592,8 @@ table td {
572 background-clip: initial; 592 background-clip: initial;
573 background-color: rgb(80, 142, 235); 593 background-color: rgb(80, 142, 235);
574 } 594 }
595
596 // 下拉框
597 .el-menu--popup {
598 padding-top: 20px;
599 }
......
...@@ -137,7 +137,8 @@ ul li { ...@@ -137,7 +137,8 @@ ul li {
137 } 137 }
138 138
139 .mb-5 { 139 .mb-5 {
140 margin-bottom: 5px; 140 margin-bottom: 10px!important;
141 margin-top: 10px!important;
141 } 142 }
142 143
143 .pr-5 { 144 .pr-5 {
...@@ -149,7 +150,8 @@ ul li { ...@@ -149,7 +150,8 @@ ul li {
149 } 150 }
150 151
151 .mt-10 { 152 .mt-10 {
152 margin-top: 10px; 153 margin-top: 20px!important;
154 margin-bottom: 5px!important;
153 } 155 }
154 156
155 //flex 公共样式 157 //flex 公共样式
...@@ -365,14 +367,14 @@ aside { ...@@ -365,14 +367,14 @@ aside {
365 height: 28px; 367 height: 28px;
366 background: rgba(255, 255, 255, 0.1); 368 background: rgba(255, 255, 255, 0.1);
367 border-radius: 16px; 369 border-radius: 16px;
368 color: #04c0a7; 370 color: #b0e4dd;
369 } 371 }
370 .resetbtnColor { 372 .resetbtnColor {
371 width: 64px; 373 width: 64px;
372 height: 28px; 374 height: 28px;
373 background: rgba(255, 255, 255, 0.1); 375 background: rgba(255, 255, 255, 0.1);
374 border-radius: 16px; 376 border-radius: 16px;
375 color: #04c0a7; 377 color: #A5CBDA;
376 } 378 }
377 .movebtnColor { 379 .movebtnColor {
378 width: 64px; 380 width: 64px;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 17:14:42 4 * @LastEditTime: 2023-03-16 13:31:27
5 */ 5 */
6 // 获取浏览器便签标题 6 // 获取浏览器便签标题
7 import config from '/public/config' 7 import Vue from 'vue'
8 const title = config.TITLE 8 const title = Vue.prototype.BASE_API.TITLE
9 9
10 export default function getPageTitle (pageTitle) { 10 export default function getPageTitle (pageTitle) {
11 if (pageTitle) { 11 if (pageTitle) {
......
...@@ -216,7 +216,6 @@ function addRangeBorder (range, ws) { ...@@ -216,7 +216,6 @@ function addRangeBorder (range, ws) {
216 range.forEach(item => { 216 range.forEach(item => {
217 let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r); 217 let startColNumber = Number(item.s.r), endColNumber = Number(item.e.r);
218 let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c); 218 let startRowNumber = Number(item.s.c), endRowNumber = Number(item.e.c);
219 console.log(startColNumber);
220 const test = ws[arr[startRowNumber] + (startColNumber + 1)]; 219 const test = ws[arr[startRowNumber] + (startColNumber + 1)];
221 for (let col = startColNumber; col <= endColNumber; col++) { 220 for (let col = startColNumber; col <= endColNumber; col++) {
222 for (let row = startRowNumber; row <= endRowNumber; row++) { 221 for (let row = startRowNumber; row <= endRowNumber; row++) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="5"> 9 <el-col :span="5">
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="行政区">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 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="行政区">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="5"> 9 <el-col :span="5">
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="行政区">
...@@ -81,12 +81,12 @@ ...@@ -81,12 +81,12 @@
81 </template> 81 </template>
82 82
83 <script> 83 <script>
84 // 地役权登记 84 // 地役权登记
85 import data from "./data" 85 import data from "./data"
86 import qlfQlDyiq from '@/api/qlfQlDyiq' 86 import qlfQlDyiq from '@/api/qlfQlDyiq'
87 import tableMixin from '@/mixins/tableMixin.js' 87 import tableMixin from '@/mixins/tableMixin.js'
88 import treeSelect from '@/components/TreeSelect.vue' 88 import treeSelect from '@/components/TreeSelect.vue'
89 export default { 89 export default {
90 name: "dyiq", 90 name: "dyiq",
91 mixins: [tableMixin], 91 mixins: [tableMixin],
92 components: { 92 components: {
...@@ -157,8 +157,8 @@ export default { ...@@ -157,8 +157,8 @@ export default {
157 } 157 }
158 } 158 }
159 } 159 }
160 } 160 }
161 </script> 161 </script>
162 <style scoped lang="scss"> 162 <style scoped lang="scss">
163 // @import "~@/styles/public.scss"; 163 // @import "~@/styles/public.scss";
164 </style> 164 </style>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="5"> 9 <el-col :span="5">
10 <el-form-item label="业务号"> 10 <el-form-item label="业务号">
11 <el-input v-model="form.YWH" clearable placeholder="业务号"></el-input> 11 <el-input v-model="form.YWH" clearable placeholder="业务号"></el-input>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -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="6"> 9 <el-col :span="6" class="mb-5">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
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">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -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="6"> 9 <el-col :span="6" class="mb-5">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
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">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区" label-width="106px"> 10 <el-form-item label="行政区" label-width="106px">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -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="5" class="mb-5">
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">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-form-item> 5 <el-form-item>
6 <Breadcrumb /> 6 <Breadcrumb />
7 </el-form-item> 7 </el-form-item>
8 <el-row> 8 <el-row class="mb-5">
9 <el-col :span="6"> 9 <el-col :span="6">
10 <el-form-item label="行政区"> 10 <el-form-item label="行政区">
11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区"> 11 <el-select v-model="form.XZQDM" class="width100" clearable placeholder="行政区">
......
...@@ -40,11 +40,8 @@ ...@@ -40,11 +40,8 @@
40 mounted () { 40 mounted () {
41 this.getdjywltotal(); 41 this.getdjywltotal();
42 window.addEventListener("resize", () => { 42 window.addEventListener("resize", () => {
43 this.cdata.seriesData = []; 43 this.config.data = [];
44 this.getdjywltotal(); 44 this.getdjywltotal();
45 window.addEventListener("resize", () => {
46 this.getdjywltotal();
47 });
48 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动 45 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
49 }) 46 })
50 }, 47 },
......
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
39 </div> 39 </div>
40 </template> 40 </template>
41 <script> 41 <script>
42 import { mapGetters } from "vuex"; 42 import { mapGetters } from "vuex";
43 import efficient from "@/api/efficient"; 43 import efficient from "@/api/efficient";
44 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 44 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
45 export default { 45 export default {
46 name: "jktj", 46 name: "jktj",
47 data () { 47 data () {
48 return { 48 return {
...@@ -133,6 +133,9 @@ export default { ...@@ -133,6 +133,9 @@ export default {
133 trigger: "item", 133 trigger: "item",
134 formatter: "{b} : {c}", 134 formatter: "{b} : {c}",
135 }, 135 },
136 label: {
137 color: 'inherit',
138 },
136 series: [ 139 series: [
137 { 140 {
138 name: "各业务类型办理数量", 141 name: "各业务类型办理数量",
...@@ -259,6 +262,9 @@ export default { ...@@ -259,6 +262,9 @@ export default {
259 }, 262 },
260 }, 263 },
261 ], 264 ],
265 label: {
266 color: 'inherit',
267 },
262 series: [ 268 series: [
263 { 269 {
264 type: "bar", 270 type: "bar",
...@@ -268,6 +274,7 @@ export default { ...@@ -268,6 +274,7 @@ export default {
268 label: { 274 label: {
269 show: true, //开启显示 275 show: true, //开启显示
270 position: "top", //在上方显示 276 position: "top", //在上方显示
277
271 }, 278 },
272 }, 279 },
273 }, 280 },
...@@ -283,6 +290,7 @@ export default { ...@@ -283,6 +290,7 @@ export default {
283 label: { 290 label: {
284 show: true, //开启显示 291 show: true, //开启显示
285 position: "top", //在上方显示 292 position: "top", //在上方显示
293
286 }, 294 },
287 }, 295 },
288 }, 296 },
...@@ -298,6 +306,7 @@ export default { ...@@ -298,6 +306,7 @@ export default {
298 label: { 306 label: {
299 show: true, //开启显示 307 show: true, //开启显示
300 position: "top", //在上方显示 308 position: "top", //在上方显示
309
301 }, 310 },
302 }, 311 },
303 }, 312 },
...@@ -309,12 +318,12 @@ export default { ...@@ -309,12 +318,12 @@ export default {
309 }); 318 });
310 }, 319 },
311 }, 320 },
312 }; 321 };
313 </script> 322 </script>
314 <style scoped lang="scss"> 323 <style scoped lang="scss">
315 // @import "~@/styles/public.scss"; 324 // @import "~@/styles/public.scss";
316 325
317 .jktjDetail { 326 .jktjDetail {
318 height: 100%; 327 height: 100%;
319 display: flex; 328 display: flex;
320 flex-direction: column; 329 flex-direction: column;
...@@ -348,8 +357,8 @@ export default { ...@@ -348,8 +357,8 @@ export default {
348 height: 100%; 357 height: 100%;
349 color: #b6b5b5; 358 color: #b6b5b5;
350 } 359 }
351 } 360 }
352 </style> 361 </style>
353 <style scoped lang="scss"> 362 <style scoped lang="scss">
354 // @import "~@/styles/public.scss"; 363 // @import "~@/styles/public.scss";
355 </style> 364 </style>
......
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { mapGetters } from "vuex"; 50 import { mapGetters } from "vuex";
51 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 51 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
52 import business from "@/api/business"; 52 import business from "@/api/business";
53 export default { 53 export default {
54 name: "jktj", 54 name: "jktj",
55 data () { 55 data () {
56 return { 56 return {
...@@ -101,7 +101,6 @@ export default { ...@@ -101,7 +101,6 @@ export default {
101 this.form.qxdm 101 this.form.qxdm
102 ); 102 );
103 this.chartData = res; 103 this.chartData = res;
104 console.log(this.chartData);
105 104
106 let maxData = Math.max.apply(Math, this.chartData.map(item => { return item.failure })) 105 let maxData = Math.max.apply(Math, this.chartData.map(item => { return item.failure }))
107 this.interval = Math.ceil(maxData / 10) 106 this.interval = Math.ceil(maxData / 10)
...@@ -150,6 +149,9 @@ export default { ...@@ -150,6 +149,9 @@ export default {
150 fontSize: "16", 149 fontSize: "16",
151 }, 150 },
152 }, 151 },
152 label: {
153 color: 'inherit',
154 },
153 xAxis: [ 155 xAxis: [
154 { 156 {
155 type: "category", 157 type: "category",
...@@ -281,12 +283,12 @@ export default { ...@@ -281,12 +283,12 @@ export default {
281 }); 283 });
282 }, 284 },
283 }, 285 },
284 }; 286 };
285 </script> 287 </script>
286 <style scoped lang="scss"> 288 <style scoped lang="scss">
287 // @import "~@/styles/public.scss"; 289 // @import "~@/styles/public.scss";
288 290
289 .jktjDetail { 291 .jktjDetail {
290 height: 100%; 292 height: 100%;
291 display: flex; 293 display: flex;
292 flex-direction: column; 294 flex-direction: column;
...@@ -298,7 +300,7 @@ export default { ...@@ -298,7 +300,7 @@ export default {
298 .center { 300 .center {
299 line-height: 50vh; 301 line-height: 50vh;
300 text-align: center; 302 text-align: center;
301 color: #b6b5b5 303 color: #b6b5b5;
302 } 304 }
303 305
304 .echarts-box { 306 .echarts-box {
...@@ -316,8 +318,8 @@ export default { ...@@ -316,8 +318,8 @@ export default {
316 flex: 1; 318 flex: 1;
317 height: 100%; 319 height: 100%;
318 } 320 }
319 } 321 }
320 </style> 322 </style>
321 <style scoped lang="scss"> 323 <style scoped lang="scss">
322 // @import "~@/styles/public.scss"; 324 // @import "~@/styles/public.scss";
323 </style> 325 </style>
......
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 </template> 47 </template>
48 48
49 <script> 49 <script>
50 import { mapGetters } from "vuex"; 50 import { mapGetters } from "vuex";
51 import efficient from "@/api/efficient"; 51 import efficient from "@/api/efficient";
52 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation"; 52 import { getFirstDayOfSeason, timeFormat } from "@/utils/operation";
53 export default { 53 export default {
54 name: "jktj", 54 name: "jktj",
55 data () { 55 data () {
56 return { 56 return {
...@@ -134,6 +134,9 @@ export default { ...@@ -134,6 +134,9 @@ export default {
134 top: 120, 134 top: 120,
135 bottom: 100, 135 bottom: 100,
136 }, 136 },
137 label: {
138 color: 'inherit',
139 },
137 xAxis: [ 140 xAxis: [
138 { 141 {
139 type: "category", 142 type: "category",
...@@ -208,12 +211,12 @@ export default { ...@@ -208,12 +211,12 @@ export default {
208 }); 211 });
209 }, 212 },
210 }, 213 },
211 }; 214 };
212 </script> 215 </script>
213 <style scoped lang="scss"> 216 <style scoped lang="scss">
214 // @import "~@/styles/public.scss"; 217 // @import "~@/styles/public.scss";
215 218
216 .jktjDetail { 219 .jktjDetail {
217 height: 100%; 220 height: 100%;
218 display: flex; 221 display: flex;
219 flex-direction: column; 222 flex-direction: column;
...@@ -225,7 +228,7 @@ export default { ...@@ -225,7 +228,7 @@ export default {
225 .center { 228 .center {
226 line-height: 50vh; 229 line-height: 50vh;
227 text-align: center; 230 text-align: center;
228 color: #b6b5b5 231 color: #b6b5b5;
229 } 232 }
230 233
231 .echarts-box { 234 .echarts-box {
...@@ -243,8 +246,8 @@ export default { ...@@ -243,8 +246,8 @@ export default {
243 flex: 1; 246 flex: 1;
244 height: 100%; 247 height: 100%;
245 } 248 }
246 } 249 }
247 </style> 250 </style>
248 <style scoped lang="scss"> 251 <style scoped lang="scss">
249 // @import "~@/styles/public.scss"; 252 // @import "~@/styles/public.scss";
250 </style> 253 </style>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-15 14:08:59 4 * @LastEditTime: 2023-03-16 13:44:11
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -51,7 +51,7 @@ class data extends filter { ...@@ -51,7 +51,7 @@ class data extends filter {
51 { 51 {
52 prop: "bizMsgid", 52 prop: "bizMsgid",
53 label: "业务报文ID", 53 label: "业务报文ID",
54 minWidth: 100, 54 minWidth: 150,
55 }, 55 },
56 { 56 {
57 prop: "createdate", 57 prop: "createdate",
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 <el-col :span="3"> 59 <el-col :span="3">
60 <el-form-item label="检查结果" prop="jcjg"> 60 <el-form-item label="检查结果" prop="jcjg">
61 <el-select v-model="form.jcjg" class="width100" clearable placeholder="检查结果"> 61 <el-select v-model="form.jcjg" class="width100" clearable placeholder="检查结果">
62 <el-option v-for="item in dicData['sysSjsbCkeck']" :key="item.DCODE" :label="item.DNAME" 62 <el-option v-for="item in dicData['sysSjsbCkeck']" class="lastdom" :key="item.DCODE" :label="item.DNAME"
63 :value="item.DCODE"> 63 :value="item.DCODE">
64 </el-option> 64 </el-option>
65 </el-select> 65 </el-select>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <el-col :span="3"> 69 <el-col :span="3">
70 <el-form-item label="入库结果" prop="rkjg"> 70 <el-form-item label="入库结果" prop="rkjg">
71 <el-select v-model="form.rkjg" class="width100" clearable placeholder="入库结果"> 71 <el-select v-model="form.rkjg" class="width100" clearable placeholder="入库结果">
72 <el-option v-for="item in dicData['sysSjsbStorage']" :key="item.DCODE" :label="item.DNAME" 72 <el-option v-for="item in dicData['sysSjsbStorage']" class="lastdom" :key="item.DCODE" :label="item.DNAME"
73 :value="item.DCODE"> 73 :value="item.DCODE">
74 </el-option> 74 </el-option>
75 </el-select> 75 </el-select>
...@@ -99,17 +99,17 @@ ...@@ -99,17 +99,17 @@
99 </template> 99 </template>
100 100
101 <script> 101 <script>
102 // 接收报文查询 102 // 接收报文查询
103 // 引入表格头部数据 103 // 引入表格头部数据
104 import data from "./data"; 104 import data from "./data";
105 // 引入table混入方法 105 // 引入table混入方法
106 import tableMixin from "@/mixins/tableMixin.js"; 106 import tableMixin from "@/mixins/tableMixin.js";
107 import { getReceiveDataReportPage } from "@/api/dataReport.js"; 107 import { getReceiveDataReportPage } from "@/api/dataReport.js";
108 // 引入详情弹框 108 // 引入详情弹框
109 import dataDetails from "@/components/EditDialog"; 109 import dataDetails from "@/components/EditDialog";
110 //引入日期处理方法 110 //引入日期处理方法
111 import { timeFormat } from "@/utils/operation"; 111 import { timeFormat } from "@/utils/operation";
112 export default { 112 export default {
113 name: "jsbwcx", 113 name: "jsbwcx",
114 mixins: [tableMixin], 114 mixins: [tableMixin],
115 // 注册组件 115 // 注册组件
...@@ -288,12 +288,16 @@ export default { ...@@ -288,12 +288,16 @@ export default {
288 } 288 }
289 }, 289 },
290 } 290 }
291 } 291 }
292 </script> 292 </script>
293 <style scoped lang="scss"> 293 <style scoped lang="scss">
294 // 引入表单整体样式 294 // 引入表单整体样式
295 // // @import "~@/styles/public.scss"; 295 // // @import "~@/styles/public.scss";
296 // 引入当前css 296 // 引入当前css
297 @import "./index.scss"; 297 @import "./index.scss";
298 .lastdom:nth-child(3) {
299 margin-bottom: 0px;
300 }
301
298 </style> 302 </style>
299 303
......
...@@ -59,11 +59,9 @@ ...@@ -59,11 +59,9 @@
59 //根据子系统code获取子系统详细信息 59 //根据子系统code获取子系统详细信息
60 getAction(api.subsystem, params).then((res) => { 60 getAction(api.subsystem, params).then((res) => {
61 if (res.status === 1) { 61 if (res.status === 1) {
62 console.log(" res.contentJJJGGG", res.content);
63 this.productName = res.content[0].name; 62 this.productName = res.content[0].name;
64 this.$store.dispatch("products/setData", res.content[0].code); 63 this.$store.dispatch("products/setData", res.content[0].code);
65 sessionStorage.setItem("products", res.content[0].code) 64 sessionStorage.setItem("products", res.content[0].code)
66 console.log("jjjggg的product");
67 } else { 65 } else {
68 this.$message.error({ message: res.message, showClose: true }); 66 this.$message.error({ message: res.message, showClose: true });
69 } 67 }
......
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
104 this.$store.dispatch('business/setInitRules', "layout1") 104 this.$store.dispatch('business/setInitRules', "layout1")
105 //存储token 105 //存储token
106 localStorage.setItem("token", `Bearer ${res.content}`); 106 localStorage.setItem("token", `Bearer ${res.content}`);
107 this.$store.dispatch("products/setData", res.content[0].code);
108 sessionStorage.setItem("products", res.content[0].code)
107 //登录成功后需判断有无重定向，没有重定向则跳转首页 109 //登录成功后需判断有无重定向，没有重定向则跳转首页
108 this.$router.replace(this.$route.query.redirect || "/"); 110 this.$router.replace(this.$route.query.redirect || "/");
109 } else { 111 } else {
......
...@@ -484,8 +484,7 @@ export default { ...@@ -484,8 +484,7 @@ export default {
484 .regularHeight { 484 .regularHeight {
485 display: flex; 485 display: flex;
486 flex-direction: column; 486 flex-direction: column;
487 flex: 1; 487 height: 87vh;
488 height: 100%;
489 margin-bottom: 5px; 488 margin-bottom: 5px;
490 489
491 .editDialogBox-con, 490 .editDialogBox-con,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: xiaomiao 1158771342@qq.com 2 * @Author: xiaomiao 1158771342@qq.com
3 * @Date: 2023-03-09 20:54:28 3 * @Date: 2023-03-09 20:54:28
4 * @LastEditors: xiaomiao 1158771342@qq.com 4 * @LastEditors: xiaomiao 1158771342@qq.com
5 * @LastEditTime: 2023-03-15 15:45:01 5 * @LastEditTime: 2023-03-16 19:40:40
6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue 6 * @FilePath: \上报\bdcjg-web\src\views\system\information\index.vue
7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE 7 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
8 --> 8 -->
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
14 <Breadcrumb /> 14 <Breadcrumb />
15 </el-form-item> 15 </el-form-item>
16 <el-row class="mb-5"> 16 <el-row class="mb-5">
17 <el-col :span="4" class="btnColRight"> 17 <el-col class="btnColRight">
18 <btn nativeType="cx" type="primary" @click="information"> 18 <btn nativeType="cx" @click="information">
19 基本信息 19 基本信息
20 </btn> 20 </btn>
21 <btn nativeType="cz" @click="password"> 21 <btn nativeType="cx" @click="password">
22 修改密码 22 修改密码
23 </btn> 23 </btn>
24 </el-col> 24 </el-col>
...@@ -73,18 +73,11 @@ ...@@ -73,18 +73,11 @@
73 display: flex; 73 display: flex;
74 flex-direction: column; 74 flex-direction: column;
75 .btnColRight { 75 .btnColRight {
76 margin-top: 10px;
77 display: flex;
78 justify-content: center;
76 // background-color: cadetblue; 79 // background-color: cadetblue;
77 height: 60px; 80 height: 30px;
78 .button:nth-child(1) {
79 position: absolute;
80 left: 30px;
81 top: 20px;
82 }
83 .button:nth-child(2) {
84 position: absolute;
85 top: 20px;
86 left: 120px;
87 }
88 } 81 }
89 /deep/.content { 82 /deep/.content {
90 .el-input__inner { 83 .el-input__inner {
......
...@@ -214,11 +214,10 @@ ...@@ -214,11 +214,10 @@
214 214
215 // @import "~@/styles/public.scss"; 215 // @import "~@/styles/public.scss";
216 .btnColRight { 216 .btnColRight {
217 height: 60px; 217 height: 30px;
218 .button { 218 .button {
219 position: absolute; 219 position: absolute;
220 left: 30px; 220 left: 30px;
221 top: 20px;
222 } 221 }
223 } 222 }
224 /deep/.el-table__expand-icon { 223 /deep/.el-table__expand-icon {
......
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
180 class="configurationbtnColor" 180 class="configurationbtnColor"
181 icon="el-icon-video-pause" 181 icon="el-icon-video-pause"
182 onClick={() => { 182 onClick={() => {
183 this.getUserList(scope.row); 183 this.getList(scope.row);
184 }} 184 }}
185 > 185 >
186 配置 186 配置
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
351 }, 351 },
352 352
353 // 配置 353 // 配置
354 getUserList (row) { 354 getList (row) {
355 this.getTableList() 355 this.getTableList()
356 const params = {}; 356 const params = {};
357 const queryOptions = { 357 const queryOptions = {
...@@ -485,11 +485,10 @@ ...@@ -485,11 +485,10 @@
485 485
486 // @import "~@/styles/public.scss"; 486 // @import "~@/styles/public.scss";
487 .btnColRight { 487 .btnColRight {
488 height: 60px; 488 height: 30px;
489 .button { 489 .button {
490 position: absolute; 490 position: absolute;
491 left: 30px; 491 left: 30px;
492 top: 20px;
493 } 492 }
494 } 493 }
495 /deep/.el-button.is-disabled.el-button--text { 494 /deep/.el-button.is-disabled.el-button--text {
......
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
168 // 获取授权主体的菜单权限 168 // 获取授权主体的菜单权限
169 // getMenuAuthorityList 169 // getMenuAuthorityList
170 menulist (operationList, id, Code, menutablelistData, operationCodes) { 170 menulist (operationList, id, Code, menutablelistData, operationCodes) {
171 console.log("Code", Code);
172 this.selectedSubsystemCode = Code 171 this.selectedSubsystemCode = Code
173 this.menuList = menutablelistData; 172 this.menuList = menutablelistData;
174 getRoleAuthorityList( 173 getRoleAuthorityList(
......
...@@ -113,7 +113,6 @@ export default { ...@@ -113,7 +113,6 @@ export default {
113 this.form = Object.assign(this.form, this.formData) 113 this.form = Object.assign(this.form, this.formData)
114 let { result } = await sjsbTask.getTaskListByName(this.form) 114 let { result } = await sjsbTask.getTaskListByName(this.form)
115 this.tableData.data = result.list 115 this.tableData.data = result.list
116 console.log(this.tableData.data, 'fffffffffffffffffff')
117 } catch (error) { 116 } catch (error) {
118 this.message = error 117 this.message = error
119 } 118 }
......
...@@ -332,11 +332,10 @@ ...@@ -332,11 +332,10 @@
332 <style scoped lang="scss"> 332 <style scoped lang="scss">
333 @import "~@/styles/mixin.scss"; 333 @import "~@/styles/mixin.scss";
334 .btnColRight { 334 .btnColRight {
335 height: 60px; 335 height: 30px;
336 .button { 336 .button {
337 position: absolute; 337 position: absolute;
338 left: 30px; 338 left: 30px;
339 top: 20px;
340 } 339 }
341 } 340 }
342 /deep/.el-button.is-disabled.el-button--text { 341 /deep/.el-button.is-disabled.el-button--text {
......