style:样式修改

任超
Showing 7 changed files with 48 additions and 20 deletions
package.json
src/utils/tools.js
src/views/statistics/css/index.scss
src/views/statistics/dataReceiveQuality/data/index.js
src/views/statistics/dataReceiveQuality/index.vue
src/views/statistics/registerBookQuality/data/index.js
src/views/statistics/registerBookQuality/index.vue
--- a/package.json
View file @9bdcd19
+++ b/package.json
View file @9bdcd19
@@ -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",
--- a/src/utils/tools.js
View file @9bdcd19
+++ b/src/utils/tools.js
View file @9bdcd19
@@ -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
--- a/src/views/statistics/css/index.scss
View file @9bdcd19
+++ b/src/views/statistics/css/index.scss
View file @9bdcd19
@@ -17,4 +17,9 @@
 .export-excel-wrapper {
  display: inline-block;
+}
+/deep/.el-table--group,
+.el-table--border {
+  border: 1px solid #458ACF !important;
 }
\ No newline at end of file
--- a/src/views/statistics/dataReceiveQuality/data/index.js
View file @9bdcd19
+++ b/src/views/statistics/dataReceiveQuality/data/index.js
View file @9bdcd19
@@ -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>
                          );
                        },
                      }
--- a/src/views/statistics/dataReceiveQuality/index.vue
View file @9bdcd19
+++ b/src/views/statistics/dataReceiveQuality/index.vue
View file @9bdcd19
@@ -173,5 +173,9 @@ export default {
 // 引入表单整体样式
 // @import "~@/styles/public.scss";
 @import "../css/index.scss";
+/deep/th.el-table__cell {
+  height: 0 !important;
+}
 </style>
--- a/src/views/statistics/registerBookQuality/data/index.js
View file @9bdcd19
+++ b/src/views/statistics/registerBookQuality/data/index.js
View file @9bdcd19
@@ -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>
--- a/src/views/statistics/registerBookQuality/index.vue
View file @9bdcd19
+++ b/src/views/statistics/registerBookQuality/index.vue
View file @9bdcd19
 <!--
 * @Author: yangwei
 * @Date: 2023-02-17 16:32:50
- * @LastEditors: yangwei
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-09 11:19:43
+ * @LastEditTime: 2023-03-14 13:19:18
 * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
 * @Description: 
 * 
@@ -21,12 +21,12 @@
          <el-col :span="6">
            <el-form-item label="接收日期" prop="startTime">
              <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
+                v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="至" prop="endTime" label-width="35px">
-              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 
+              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
                v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
            </el-form-item>
          </el-col>
@@ -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"
+      <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"
-        :column="tableData.columns" :data="tableData.data" :downTitle="downTitle">
+        :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>