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

@@ -38,7 +38,7 @@
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "2.4.2",
     "connect": "3.6.6",
-    "element-ui": "^2.15.8",
+    "element-ui": "^2.15.13",
     "html-webpack-plugin": "3.2.0",
     "runjs": "4.3.2",
     "sass-loader": "8.0.2",

@@ -26,7 +26,8 @@ export default {
   color: #ffffff;
   margin: 0 5px;
   cursor: pointer;
-  border: 0
+  border: 0;
+  font-size: 14px;
 }
 
 .cx {

@@ -68,9 +68,13 @@
     .el-input__inner {
       background: #07388B;
       border-radius: 2px;
-      color: #CEF8FF;
+      color: #CEF8FF !important;
       border: 1px solid #6BC1FC;
     }
+
+    .el-input__inner::placeholder {
+      color: #92BEDC !important;
+    }
   }
 
   .advanced-search {

@@ -149,7 +149,7 @@ export function getCurrentDate (date = 'firstDay') {
 
 export function setExport2Excel (exportName) {
   /* generate workbook object from table */
-  var wb = XLSX2.utils.table_to_sheet(document.querySelector("#mytable"));//mytable为表格的id名
+  var wb = XLSX2.utils.table_to_sheet(document.querySelector("#mytable"), { raw: true });//mytable为表格的id名
   if (!wb['!merges']) {
     this.$message.warning('无法导出：报表无数据');
     return

@@ -196,7 +196,7 @@ export default {
               color: "#fff",
               fontSize: "16",
             },
-            interval: this.interval,
+            // interval: this.interval,
             axisLabel: {
               formatter: "{value}",
               textStyle: {

@@ -132,7 +132,7 @@ export default {
         },
         grid: {
           top: 120,
-          bottom:100,
+          bottom: 100,
         },
         xAxis: [
           {
@@ -188,6 +188,7 @@ export default {
             },
           },
         ],
+
         series: [
           {
             type: "bar",

@@ -18,3 +18,8 @@
 .export-excel-wrapper {
   display: inline-block;
 }
+
+/deep/.el-table--group,
+.el-table--border {
+  border: 1px solid #458ACF !important;
+}
\ No newline at end of file

@@ -87,7 +87,10 @@ class data extends filter {
                         prop: 'failReportRatio24To48h',
                         render: (h, scope) => {
                           return (
-                            <span>{(scope.row.failReportRatio24To48h * 100).toFixed(2)}%</span>
+                            <div>
+                              <span>{(scope.row.failReportRatio24To48h * 100).toFixed(2)}</span>
+                              %
+                            </div>
                           );
                         },
                       }

@@ -173,5 +173,9 @@ export default {
 // 引入表单整体样式
 // @import "~@/styles/public.scss";
 @import "../css/index.scss";
+
+/deep/th.el-table__cell {
+  height: 0 !important;
+}
 </style>
 

@@ -14,13 +14,11 @@ class data extends filter {
         label: '分项',
         children: [
           {
-            width:1
-          },
-          {
             label: '国有建设用地使用权登记得分及空项率',
             children: [
               {
                 prop: 'gyjsydsyqRate',
+                width: 150,
                 render: (h, scope) => {
                   return (
                     <span>{scope.row.gyjsydsyqRate.toFixed(2)}</span>
@@ -29,6 +27,7 @@ class data extends filter {
               },
               {
                 prop: 'gyjsydsyqRadio',
+                width: 150,
                 render: (h, scope) => {
                   return (
                     <span>{(scope.row.gyjsydsyqRadio * 100).toFixed(2)}%</span>

 <!--
  * @Author: yangwei
  * @Date: 2023-02-17 16:32:50
- * @LastEditors: yangwei
- * @LastEditTime: 2023-03-09 11:19:43
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-14 13:19:18
  * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
  * @Description: 
  * 
@@ -43,10 +43,11 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table ref="table" :pagination="false"  :header-cell-style="headerStyle" :column="tableData.columns" :data="tableData.data">
+      <lb-table ref="table" :pagination="false" :border="true" :header-cell-style="headerStyle"
+        :column="tableData.columns" :data="tableData.data">
       </lb-table>
-      <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false"
-        :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
+      <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"
+        :pagination="false" :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
       </down-lb-table>
     </div>
   </div>
@@ -138,6 +139,17 @@ export default {
     this.handleResetForm()
     this.generateFileName()
   },
+  mounted () {
+    this.$nextTick(function () {
+      let c = document.getElementsByClassName("el-table__header")
+      let k = c[0].getElementsByClassName("is-group has-gutter");
+      let f = k[0].children
+      let d = f[1].getElementsByClassName("el-table__cell")
+      let p = d[0]
+      p.setAttribute("rowspan", 2)
+    })
+
+  },
   methods: {
     handleSearch () { },
     // 生成文件名
@@ -150,15 +162,16 @@ export default {
     },
     headerStyle ({ row, rowIndex }) {
       if (rowIndex == 1) {
-        row[0].colSpan = 2
-        row.forEach(item=>{
+        row.forEach(item => {
+          item.rowSpan = 2
+        })
+      }
+    },
+    headerStyle1 ({ row, rowIndex }) {
+      if (rowIndex == 2) {
+        row.forEach(item => {
           item.rowSpan = 2
         })
-        // row[0].rowSpan = 2;
-        // row[1].rowSpan = 2;
-        // row[2].rowSpan = 2;
-        // row[3].rowSpan = 2;
-        // row[4].rowSpan = 2;
       }
     },
     // 初始化数据
@@ -181,5 +194,9 @@ export default {
 // 引入表单整体样式
 // @import "~@/styles/public.scss";
 @import "../css/index.scss";
+
+/deep/.el-table thead.is-group th.el-table__cell {
+  height: 14px !important;
+}
 </style>