Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
9a703417 by yangwei
Options

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

2 parents f52d2b61 37d6b4e4
Inline Side-by-side
Showing 9 changed files with 47 additions and 29 deletions
...@@ -97,6 +97,10 @@ export default { ...@@ -97,6 +97,10 @@ export default {
97 type: String, 97 type: String,
98 default: 'left', 98 default: 'left',
99 }, 99 },
100 calcHeight: {
101 type: Number,
102 default: 230
103 },
100 merge: Array, 104 merge: Array,
101 }, 105 },
102 components: { 106 components: {
...@@ -137,9 +141,9 @@ export default { ...@@ -137,9 +141,9 @@ export default {
137 _this.$nextTick(() => { 141 _this.$nextTick(() => {
138 142
139 window.addEventListener('resize', () => { 143 window.addEventListener('resize', () => {
140 _this.tableHeight = _this.calcHeightx(230) 144 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
141 }); 145 });
142 _this.tableHeight = _this.calcHeightx(230) 146 _this.tableHeight = _this.calcHeightx(_this.calcHeight)
143 }) 147 })
144 } else { 148 } else {
145 _this.tableHeight = window.innerHeight - _this.heightNum 149 _this.tableHeight = window.innerHeight - _this.heightNum
......
...@@ -358,7 +358,7 @@ aside { ...@@ -358,7 +358,7 @@ aside {
358 height: 28px; 358 height: 28px;
359 background: rgba(255, 255, 255, 0.1); 359 background: rgba(255, 255, 255, 0.1);
360 border-radius: 16px; 360 border-radius: 16px;
361 color: #B06974; 361 color: #0097FF;
362 } 362 }
363 363
364 .successColor:hover { 364 .successColor:hover {
...@@ -366,6 +366,22 @@ aside { ...@@ -366,6 +366,22 @@ aside {
366 height: 28px; 366 height: 28px;
367 background: rgba(255, 255, 255, 0.1); 367 background: rgba(255, 255, 255, 0.1);
368 border-radius: 16px; 368 border-radius: 16px;
369 color: #0097FF;
370 }
371
372 .delColor {
373 width: 64px;
374 height: 28px;
375 background: rgba(255, 255, 255, 0.1);
376 border-radius: 16px;
377 color: #B06974;
378 }
379
380 .delColor:hover {
381 width: 64px;
382 height: 28px;
383 background: rgba(255, 255, 255, 0.1);
384 border-radius: 16px;
369 color: #B06974; 385 color: #B06974;
370 } 386 }
371 387
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 </div> 33 </div>
34 <!-- 列表区域 --> 34 <!-- 列表区域 -->
35 <div class="from-clues-content"> 35 <div class="from-clues-content">
36 <lb-table ref="table" :header-cell-style="headerStyle1" :pagination="false" :column="tableData.columns" 36 <lb-table ref="table" :header-cell-style="headerStyle1" :calcHeight="200" :pagination="false"
37 :data="tableData.data"> 37 :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39 39
40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :header-cell-style="headerStyle" 40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :header-cell-style="headerStyle"
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
11 <el-col :span="6"> 11 <el-col :span="6">
12 <el-form-item label="接收日期" prop="startTime"> 12 <el-form-item label="接收日期" prop="startTime">
13 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 13 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
14 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker> 14 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
15 </el-form-item> 15 </el-form-item>
16 </el-col> 16 </el-col>
17 <el-col :span="6"> 17 <el-col :span="6">
18 <el-form-item label="至" prop="endTime" label-width="35px"> 18 <el-form-item label="至" prop="endTime" label-width="35px">
19 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 19 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
20 v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker> 20 v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
21 </el-form-item> 21 </el-form-item>
22 </el-col> 22 </el-col>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </div> 34 </div>
35 <!-- 列表区域 --> 35 <!-- 列表区域 -->
36 <div class="from-clues-content"> 36 <div class="from-clues-content">
37 <lb-table ref="table" :pagination="false" :column="tableData.columns" :data="tableData.data"> 37 <lb-table ref="table" :pagination="false" :calcHeight="200" :column="tableData.columns" :data="tableData.data">
38 </lb-table> 38 </lb-table>
39 39
40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false" 40 <down-lb-table ref="table" v-show="false" :id="'mytable'" :downExcel="true" :pagination="false"
...@@ -157,5 +157,9 @@ export default { ...@@ -157,5 +157,9 @@ export default {
157 // 引入表单整体样式 157 // 引入表单整体样式
158 // @import "~@/styles/public.scss"; 158 // @import "~@/styles/public.scss";
159 @import "../css/index.scss"; 159 @import "../css/index.scss";
160
161 /deep/.el-table thead.is-group th.el-table__cell {
162 height: 14px !important;
163 }
160 </style> 164 </style>
161 165
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-02-17 16:32:50 3 * @Date: 2023-02-17 16:32:50
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-03-14 13:19:18 5 * @LastEditTime: 2023-03-15 10:42:21
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 *
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
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" :border="true" :header-cell-style="headerStyle" 46 <lb-table ref="table" :pagination="false" :border="true" :calcHeight="200" :header-cell-style="headerStyle"
47 :column="tableData.columns" :data="tableData.data"> 47 :column="tableData.columns" :data="tableData.data">
48 </lb-table> 48 </lb-table>
49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true" 49 <down-lb-table ref="table" v-show="false" :id="'mytable'" :header-cell-style="headerStyle1" :downExcel="true"
......
1 <template> 1 <template>
2 <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm" v-model="myValue"> 2 <dialogBox class="modifydialog" :isMain="true" :title="2222" @closeDialog="close" @submitForm="submitForm"
3 <div class="modifydialog-con"> 3 v-model="myValue">
4 <div class="dialogCon">
4 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
5 <el-row :gutter="24"> 6 <el-row :gutter="24">
6 <el-col :span="12"> 7 <el-col :span="12">
...@@ -217,15 +218,8 @@ export default { ...@@ -217,15 +218,8 @@ export default {
217 }, 218 },
218 close () { 219 close () {
219 this.resetForm() 220 this.resetForm()
220 this.visible = false 221 this.$emit('input', false)
221 } 222 }
222 } 223 }
223 } 224 }
224 </script> 225 </script>
225 <style scoped lang="scss">
226 .modifydialog {
227 &-con {
228 background: #031A46;
229 }
230 }
231 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
13 </el-form> 13 </el-form>
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table :pagination="false" :column="tableData.columns" :data="tablelistData" row-key="id" default-expand-all 16 <lb-table :pagination="false" :column="tableData.columns" :calcHeight="200" :data="tablelistData" row-key="id"
17 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> 17 default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
18 </lb-table> 18 </lb-table>
19 </div> 19 </div>
20 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId" 20 <edit-dialog ref="dialogForm" v-model="isDialog" :product-id="productId" :resource-category-id="resourceCategoryId"
...@@ -36,12 +36,10 @@ import { ...@@ -36,12 +36,10 @@ import {
36 findParents, 36 findParents,
37 removeTreeListItem, 37 removeTreeListItem,
38 } from "@/utils/operation"; 38 } from "@/utils/operation";
39 // import authorizationdiglog from "./authorizationdiglog.vue";
40 export default { 39 export default {
41 name: "menus", 40 name: "menus",
42 components: { 41 components: {
43 EditDialog, 42 EditDialog,
44 // authorizationdiglog,
45 }, 43 },
46 data () { 44 data () {
47 return { 45 return {
...@@ -74,6 +72,7 @@ export default { ...@@ -74,6 +72,7 @@ export default {
74 <div> 72 <div>
75 <el-button 73 <el-button
76 type="text" 74 type="text"
75 class='successColor'
77 onClick={() => { 76 onClick={() => {
78 this.handleEdit(scope.row); 77 this.handleEdit(scope.row);
79 }} 78 }}
...@@ -83,7 +82,7 @@ export default { ...@@ -83,7 +82,7 @@ export default {
83 82
84 <el-button 83 <el-button
85 type="text" 84 type="text"
86 size="mini" 85 class='delColor'
87 onClick={() => { 86 onClick={() => {
88 this.handleDelete(scope.row.id, scope.row.name); 87 this.handleDelete(scope.row.id, scope.row.name);
89 }} 88 }}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 </el-form> 13 </el-form>
14 </div> 14 </div>
15 <div class="from-clues-content"> 15 <div class="from-clues-content">
16 <lb-table :pagination="false" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 16 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200" @p-current-change="handleCurrentChange"
17 :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid"> 17 :column="tableData.columns" :data="listdata" :expand-row-keys="keyList" row-key="dictid">
18 </lb-table> 18 </lb-table>
19 </div> 19 </div>
......
1 <template> 1 <template>
2 <dialogBox :title="title" class="modifydialog" @closeDialog="close" @submitForm="submitForm" v-model="myValue"> 2 <dialogBox :title="title" class="modifydialog" @closeDialog="close" :isMain="true" @submitForm="submitForm"
3 v-model="myValue">
3 <div class="dialogCon"> 4 <div class="dialogCon">
4 <el-form ref="form" :model="form" :rules="rules"> 5 <el-form ref="form" :model="form" :rules="rules">
5 <el-row :gutter="24"> 6 <el-row :gutter="24">
...@@ -79,7 +80,7 @@ export default { ...@@ -79,7 +80,7 @@ export default {
79 }, 80 },
80 data () { 81 data () {
81 return { 82 return {
82 myValue: false, 83 myValue: this.value,
83 form: { 84 form: {
84 sex: "0", 85 sex: "0",
85 }, 86 },
...@@ -169,7 +170,7 @@ export default { ...@@ -169,7 +170,7 @@ export default {
169 }, 170 },
170 close () { 171 close () {
171 this.resetForm() 172 this.resetForm()
172 this.visible = false 173 this.$emit('input', false)
173 } 174 }
174 } 175 }
175 } 176 }
......