Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
944a09ed by yangwei
Options

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

2 parents dcba8aa1 02c931f0
Inline Side-by-side
Showing 11 changed files with 59 additions and 25 deletions
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 "babel-plugin-dynamic-import-node": "2.3.3", 38 "babel-plugin-dynamic-import-node": "2.3.3",
39 "chalk": "2.4.2", 39 "chalk": "2.4.2",
40 "connect": "3.6.6", 40 "connect": "3.6.6",
41 "element-ui": "^2.15.8", 41 "element-ui": "^2.15.13",
42 "html-webpack-plugin": "3.2.0", 42 "html-webpack-plugin": "3.2.0",
43 "runjs": "4.3.2", 43 "runjs": "4.3.2",
44 "sass-loader": "8.0.2", 44 "sass-loader": "8.0.2",
......
...@@ -26,7 +26,8 @@ export default { ...@@ -26,7 +26,8 @@ export default {
26 color: #ffffff; 26 color: #ffffff;
27 margin: 0 5px; 27 margin: 0 5px;
28 cursor: pointer; 28 cursor: pointer;
29 border: 0 29 border: 0;
30 font-size: 14px;
30 } 31 }
31 32
32 .cx { 33 .cx {
......
...@@ -68,9 +68,13 @@ ...@@ -68,9 +68,13 @@
68 .el-input__inner { 68 .el-input__inner {
69 background: #07388B; 69 background: #07388B;
70 border-radius: 2px; 70 border-radius: 2px;
71 color: #CEF8FF; 71 color: #CEF8FF !important;
72 border: 1px solid #6BC1FC; 72 border: 1px solid #6BC1FC;
73 } 73 }
74
75 .el-input__inner::placeholder {
76 color: #92BEDC !important;
77 }
74 } 78 }
75 79
76 .advanced-search { 80 .advanced-search {
......
...@@ -149,7 +149,7 @@ export function getCurrentDate (date = 'firstDay') { ...@@ -149,7 +149,7 @@ export function getCurrentDate (date = 'firstDay') {
149 149
150 export function setExport2Excel (exportName) { 150 export function setExport2Excel (exportName) {
151 /* generate workbook object from table */ 151 /* generate workbook object from table */
152 var wb = XLSX2.utils.table_to_sheet(document.querySelector("#mytable"));//mytable为表格的id名 152 var wb = XLSX2.utils.table_to_sheet(document.querySelector("#mytable"), { raw: true });//mytable为表格的id名
153 if (!wb['!merges']) { 153 if (!wb['!merges']) {
154 this.$message.warning('无法导出：报表无数据'); 154 this.$message.warning('无法导出：报表无数据');
155 return 155 return
......
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
196 color: "#fff", 196 color: "#fff",
197 fontSize: "16", 197 fontSize: "16",
198 }, 198 },
199 interval: this.interval, 199 // interval: this.interval,
200 axisLabel: { 200 axisLabel: {
201 formatter: "{value}", 201 formatter: "{value}",
202 textStyle: { 202 textStyle: {
......
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
105 // 初始化图表 105 // 初始化图表
106 this.chartData.length && this.echartInit(this.chartData) 106 this.chartData.length && this.echartInit(this.chartData)
107 }); 107 });
108 108
109 }, 109 },
110 // 重置 110 // 重置
111 resetForm () { 111 resetForm () {
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
132 }, 132 },
133 grid: { 133 grid: {
134 top: 120, 134 top: 120,
135 bottom:100, 135 bottom: 100,
136 }, 136 },
137 xAxis: [ 137 xAxis: [
138 { 138 {
...@@ -188,6 +188,7 @@ export default { ...@@ -188,6 +188,7 @@ export default {
188 }, 188 },
189 }, 189 },
190 ], 190 ],
191
191 series: [ 192 series: [
192 { 193 {
193 type: "bar", 194 type: "bar",
......
...@@ -17,4 +17,9 @@ ...@@ -17,4 +17,9 @@
17 17
18 .export-excel-wrapper { 18 .export-excel-wrapper {
19 display: inline-block; 19 display: inline-block;
20 }
21
22 /deep/.el-table--group,
23 .el-table--border {
24 border: 1px solid #458ACF !important;
20 } 25 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -87,7 +87,10 @@ class data extends filter { ...@@ -87,7 +87,10 @@ class data extends filter {
87 prop: 'failReportRatio24To48h', 87 prop: 'failReportRatio24To48h',
88 render: (h, scope) => { 88 render: (h, scope) => {
89 return ( 89 return (
90 <span>{(scope.row.failReportRatio24To48h * 100).toFixed(2)}%</span> 90 <div>
91 <span>{(scope.row.failReportRatio24To48h * 100).toFixed(2)}</span>
92 %
93 </div>
91 ); 94 );
92 }, 95 },
93 } 96 }
......
...@@ -173,5 +173,9 @@ export default { ...@@ -173,5 +173,9 @@ export default {
173 // 引入表单整体样式 173 // 引入表单整体样式
174 // @import "~@/styles/public.scss"; 174 // @import "~@/styles/public.scss";
175 @import "../css/index.scss"; 175 @import "../css/index.scss";
176
177 /deep/th.el-table__cell {
178 height: 0 !important;
179 }
176 </style> 180 </style>
177 181
......
...@@ -14,13 +14,11 @@ class data extends filter { ...@@ -14,13 +14,11 @@ class data extends filter {
14 label: '分项', 14 label: '分项',
15 children: [ 15 children: [
16 { 16 {
17 width:1
18 },
19 {
20 label: '国有建设用地使用权登记得分及空项率', 17 label: '国有建设用地使用权登记得分及空项率',
21 children: [ 18 children: [
22 { 19 {
23 prop: 'gyjsydsyqRate', 20 prop: 'gyjsydsyqRate',
21 width: 150,
24 render: (h, scope) => { 22 render: (h, scope) => {
25 return ( 23 return (
26 <span>{scope.row.gyjsydsyqRate.toFixed(2)}</span> 24 <span>{scope.row.gyjsydsyqRate.toFixed(2)}</span>
...@@ -29,6 +27,7 @@ class data extends filter { ...@@ -29,6 +27,7 @@ class data extends filter {
29 }, 27 },
30 { 28 {
31 prop: 'gyjsydsyqRadio', 29 prop: 'gyjsydsyqRadio',
30 width: 150,
32 render: (h, scope) => { 31 render: (h, scope) => {
33 return ( 32 return (
34 <span>{(scope.row.gyjsydsyqRadio * 100).toFixed(2)}%</span> 33 <span>{(scope.row.gyjsydsyqRadio * 100).toFixed(2)}%</span>
......
1 <!-- 1 <!--
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-17 16:32:50 3 * @Date: 2023-02-17 16:32:50
4 * @LastEditors: yangwei 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-09 11:19:43 5 * @LastEditTime: 2023-03-14 13:19:18
6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue 6 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
21 <el-col :span="6"> 21 <el-col :span="6">
22 <el-form-item label="接收日期" prop="startTime"> 22 <el-form-item label="接收日期" prop="startTime">
23 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 23 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
24 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker> 24 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
25 </el-form-item> 25 </el-form-item>
26 </el-col> 26 </el-col>
27 <el-col :span="6"> 27 <el-col :span="6">
28 <el-form-item label="至" prop="endTime" label-width="35px"> 28 <el-form-item label="至" prop="endTime" label-width="35px">
29 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 29 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
30 v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker> 30 v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
31 </el-form-item> 31 </el-form-item>
32 </el-col> 32 </el-col>
...@@ -43,10 +43,11 @@ ...@@ -43,10 +43,11 @@
43 </div> 43 </div>
44 <!-- 列表区域 --> 44 <!-- 列表区域 -->
45 <div class="from-clues-content"> 45 <div class="from-clues-content">
46 <lb-table ref="table" :pagination="false" :header-cell-style="headerStyle" :column="tableData.columns" :data="tableData.data"> 46 <lb-table ref="table" :pagination="false" :border="true" :header-cell-style="headerStyle"
47 :column="tableData.columns" :data="tableData.data">
47 </lb-table> 48 </lb-table>
48 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false" 49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"
49 :column="tableData.columns" :data="tableData.data" :downTitle="downTitle"> 50 :pagination="false" :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
50 </down-lb-table> 51 </down-lb-table>
51 </div> 52 </div>
52 </div> 53 </div>
...@@ -138,6 +139,17 @@ export default { ...@@ -138,6 +139,17 @@ export default {
138 this.handleResetForm() 139 this.handleResetForm()
139 this.generateFileName() 140 this.generateFileName()
140 }, 141 },
142 mounted () {
143 this.$nextTick(function () {
144 let c = document.getElementsByClassName("el-table__header")
145 let k = c[0].getElementsByClassName("is-group has-gutter");
146 let f = k[0].children
147 let d = f[1].getElementsByClassName("el-table__cell")
148 let p = d[0]
149 p.setAttribute("rowspan", 2)
150 })
151
152 },
141 methods: { 153 methods: {
142 handleSearch () { }, 154 handleSearch () { },
143 // 生成文件名 155 // 生成文件名
...@@ -150,15 +162,16 @@ export default { ...@@ -150,15 +162,16 @@ export default {
150 }, 162 },
151 headerStyle ({ row, rowIndex }) { 163 headerStyle ({ row, rowIndex }) {
152 if (rowIndex == 1) { 164 if (rowIndex == 1) {
153 row[0].colSpan = 2 165 row.forEach(item => {
154 row.forEach(item=>{ 166 item.rowSpan = 2
167 })
168 }
169 },
170 headerStyle1 ({ row, rowIndex }) {
171 if (rowIndex == 2) {
172 row.forEach(item => {
155 item.rowSpan = 2 173 item.rowSpan = 2
156 }) 174 })
157 // row[0].rowSpan = 2;
158 // row[1].rowSpan = 2;
159 // row[2].rowSpan = 2;
160 // row[3].rowSpan = 2;
161 // row[4].rowSpan = 2;
162 } 175 }
163 }, 176 },
164 // 初始化数据 177 // 初始化数据
...@@ -181,5 +194,9 @@ export default { ...@@ -181,5 +194,9 @@ export default {
181 // 引入表单整体样式 194 // 引入表单整体样式
182 // @import "~@/styles/public.scss"; 195 // @import "~@/styles/public.scss";
183 @import "../css/index.scss"; 196 @import "../css/index.scss";
197
198 /deep/.el-table thead.is-group th.el-table__cell {
199 height: 14px !important;
200 }
184 </style> 201 </style>
185 202
......