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

@@ -97,6 +97,10 @@ export default {
       type: String,
       default: 'left',
     },
+    calcHeight: {
+      type: Number,
+      default: 230
+    },
     merge: Array,
   },
   components: {
@@ -137,9 +141,9 @@ export default {
           _this.$nextTick(() => {
 
             window.addEventListener('resize', () => {
-              _this.tableHeight = _this.calcHeightx(230)
+              _this.tableHeight = _this.calcHeightx(_this.calcHeight)
             });
-            _this.tableHeight = _this.calcHeightx(230)
+            _this.tableHeight = _this.calcHeightx(_this.calcHeight)
           })
         } else {
           _this.tableHeight = window.innerHeight - _this.heightNum

@@ -358,7 +358,7 @@ aside {
   height: 28px;
   background: rgba(255, 255, 255, 0.1);
   border-radius: 16px;
-  color: #B06974;
+  color: #0097FF;
 }
 
 .successColor:hover {
@@ -366,6 +366,22 @@ aside {
   height: 28px;
   background: rgba(255, 255, 255, 0.1);
   border-radius: 16px;
+  color: #0097FF;
+}
+
+.delColor {
+  width: 64px;
+  height: 28px;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 16px;
+  color: #B06974;
+}
+
+.delColor:hover {
+  width: 64px;
+  height: 28px;
+  background: rgba(255, 255, 255, 0.1);
+  border-radius: 16px;
   color: #B06974;
 }
 

@@ -33,8 +33,8 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table ref="table" :header-cell-style="headerStyle1" :pagination="false" :column="tableData.columns"
-        :data="tableData.data">
+      <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="200" :pagination="false"
+        :column="tableData.columns" :data="tableData.data">
       </lb-table>
 
       <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :header-cell-style="headerStyle"

@@ -11,12 +11,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>
@@ -34,7 +34,7 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table ref="table" :pagination="false" :column="tableData.columns" :data="tableData.data">
+      <lb-table ref="table" :pagination="false" :calcHeight="200" :column="tableData.columns" :data="tableData.data">
       </lb-table>
 
       <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false"
@@ -157,5 +157,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>
 

@@ -2,7 +2,7 @@
  * @Author: yangwei
  * @Date: 2023-02-17 16:32:50
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-03-14 13:19:18
+ * @LastEditTime: 2023-03-15 10:42:21
  * @FilePath: \bdcjg-web\src\views\statistics\registerBookQuality\index.vue
  * @Description: 
  * 
@@ -43,7 +43,7 @@
     </div>
     <!-- 列表区域 -->
     <div class="from-clues-content">
-      <lb-table ref="table" :pagination="false" :border="true" :header-cell-style="headerStyle"
+      <lb-table ref="table" :pagination="false" :border="true" :calcHeight="200" :header-cell-style="headerStyle"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
       <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"

 <template>
-  <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm" v-model="myValue">
-    <div class="modifydialog-con">
+  <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm"
+    v-model="myValue">
+    <div class="dialogCon">
       <el-form ref="form" :model="form" :rules="rules">
         <el-row :gutter="24">
           <el-col :span="12">
@@ -217,15 +218,8 @@ export default {
     },
     close () {
       this.resetForm()
-      this.visible = false
+      this.$emit('input', false)
     }
   }
 }
 </script>
-<style scoped lang="scss">
-.modifydialog {
-  &-con {
-    background: #031A46;
-  }
-}
-</style>
\ No newline at end of file

@@ -13,8 +13,8 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :pagination="false" :column="tableData.columns" :data="tablelistData" row-key="id" default-expand-all
-        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+      <lb-table :pagination="false" :column="tableData.columns" :calcHeight="200" :data="tablelistData" row-key="id"
+        default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       </lb-table>
     </div>
     <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId"
@@ -36,12 +36,10 @@ import {
   findParents,
   removeTreeListItem,
 } from "@/utils/operation";
-// import authorizationdiglog from "./authorizationdiglog.vue";
 export default {
   name: "menus",
   components: {
     EditDialog,
-    // authorizationdiglog,
   },
   data () {
     return {
@@ -74,6 +72,7 @@ export default {
                 <div>
                   <el-button
                     type="text"
+                    class='successColor'
                     onClick={() => {
                       this.handleEdit(scope.row);
                     }}
@@ -83,7 +82,7 @@ export default {
 
                   <el-button
                     type="text"
-                    size="mini"
+                    class='delColor'
                     onClick={() => {
                       this.handleDelete(scope.row.id, scope.row.name);
                     }}

@@ -13,7 +13,7 @@
       </el-form>
     </div>
     <div class="from-clues-content">
-      <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+      <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid">
       </lb-table>
     </div>

 <template>
-  <dialogBox :title="title" class="modifydialog" @closeDialog="close" @submitForm="submitForm" v-model="myValue">
+  <dialogBox :title="title" class="modifydialog" @closeDialog="close" :isMain="true" @submitForm="submitForm"
+    v-model="myValue">
     <div class="dialogCon">
       <el-form ref="form" :model="form" :rules="rules">
         <el-row :gutter="24">
@@ -79,7 +80,7 @@ export default {
   },
   data () {
     return {
-      myValue: false,
+      myValue: this.value,
       form: {
         sex: "0",
       },
@@ -169,7 +170,7 @@ export default {
     },
     close () {
       this.resetForm()
-      this.visible = false
+      this.$emit('input', false)
     }
   }
 }