Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
99d50281 by xiaomiao
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 95524904 0c9e3da0
Inline Side-by-side
Showing 14 changed files with 33 additions and 24 deletions
...@@ -214,6 +214,10 @@ aside { ...@@ -214,6 +214,10 @@ aside {
214 white-space: nowrap; //文本不会换行 214 white-space: nowrap; //文本不会换行
215 } 215 }
216 216
217 .tooltip-width {
218 max-width: 300px;
219 }
220
217 //main-container全局样式 221 //main-container全局样式
218 .app-container { 222 .app-container {
219 padding: 20px; 223 padding: 20px;
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <span v-if="!['djyy','fj'].includes(item.prop)"> 55 <span v-if="!['djyy','fj'].includes(item.prop)">
56 {{ row[item.prop] }} 56 {{ row[item.prop] }}
57 </span> 57 </span>
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
59 <span class="ellipsis-line"> 59 <span class="ellipsis-line">
60 {{ row[item.prop] }} 60 {{ row[item.prop] }}
61 </span> 61 </span>
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 <span v-if="!['djyy','fj'].includes(item.prop)"> 65 <span v-if="!['djyy','fj'].includes(item.prop)">
66 {{ row[item.prop] }} 66 {{ row[item.prop] }}
67 </span> 67 </span>
68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
69 <span class="ellipsis-line"> 69 <span class="ellipsis-line">
70 {{ row[item.prop] }} 70 {{ row[item.prop] }}
71 </span> 71 </span>
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 <span v-if="!['djyy','fj'].includes(item.prop)"> 59 <span v-if="!['djyy','fj'].includes(item.prop)">
60 {{ row[item.prop] }} 60 {{ row[item.prop] }}
61 </span> 61 </span>
62 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 62 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
63 <span class="ellipsis-line"> 63 <span class="ellipsis-line">
64 {{ row[item.prop] }} 64 {{ row[item.prop] }}
65 </span> 65 </span>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 {{ getQsztName(row[item.prop]) }} 46 {{ getQsztName(row[item.prop]) }}
47 </span> 47 </span>
48 48
49 <el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top"> 49 <el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
50 <span class="ellipsis-line"> 50 <span class="ellipsis-line">
51 {{ row[item.prop] }} 51 {{ row[item.prop] }}
52 </span> 52 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:54:50 4 * @LastEditTime: 2023-08-24 16:14:57
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
65 <span v-if="!['djyy','fj'].includes(item.prop)"> 65 <span v-if="!['djyy','fj'].includes(item.prop)">
66 {{ row[item.prop] }} 66 {{ row[item.prop] }}
67 </span> 67 </span>
68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
69 <span class="ellipsis-line"> 69 <span class="ellipsis-line">
70 {{ row[item.prop] }} 70 {{ row[item.prop] }}
71 </span> 71 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:54:45 4 * @LastEditTime: 2023-08-24 16:15:01
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 54 <span v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }} 55 {{ row[item.prop] }}
56 </span> 56 </span>
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
59 {{ row[item.prop] }} 59 {{ row[item.prop] }}
60 </span> 60 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:54:51 4 * @LastEditTime: 2023-08-24 16:15:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -51,10 +51,11 @@ ...@@ -51,10 +51,11 @@
51 {{ getQsztName(row[item.prop]) }} 51 {{ getQsztName(row[item.prop]) }}
52 </span> 52 </span>
53 53
54 <span v-if="item.prop != 'djyy'"> 54 <span v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }} 55 {{ row[item.prop] }}
56 </span> 56 </span>
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 57
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 59 <span class="ellipsis-line">
59 {{ row[item.prop] }} 60 {{ row[item.prop] }}
60 </span> 61 </span>
...@@ -99,7 +100,7 @@ ...@@ -99,7 +100,7 @@
99 <span v-if="!['djyy','fj'].includes(item.prop)"> 100 <span v-if="!['djyy','fj'].includes(item.prop)">
100 {{ row[item.prop] }} 101 {{ row[item.prop] }}
101 </span> 102 </span>
102 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 103 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
103 <span class="ellipsis-line"> 104 <span class="ellipsis-line">
104 {{ row[item.prop] }} 105 {{ row[item.prop] }}
105 </span> 106 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:54:56 4 * @LastEditTime: 2023-08-24 16:15:38
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 54 <span v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }} 55 {{ row[item.prop] }}
56 </span> 56 </span>
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
59 {{ row[item.prop] }} 59 {{ row[item.prop] }}
60 </span> 60 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:55:02 4 * @LastEditTime: 2023-08-24 16:15:42
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <span v-if="!['djyy','fj'].includes(item.prop)"> 53 <span v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }} 54 {{ row[item.prop] }}
55 </span> 55 </span>
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 57 <span class="ellipsis-line">
58 {{ row[item.prop] }} 58 {{ row[item.prop] }}
59 </span> 59 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:55:15 4 * @LastEditTime: 2023-08-24 16:15:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <span v-if="!['djyy','fj'].includes(item.prop)"> 53 <span v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }} 54 {{ row[item.prop] }}
55 </span> 55 </span>
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 57 <span class="ellipsis-line">
58 {{ row[item.prop] }} 58 {{ row[item.prop] }}
59 </span> 59 </span>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 09:48:00 4 * @LastEditTime: 2023-08-24 15:38:52
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -194,8 +194,9 @@ ...@@ -194,8 +194,9 @@
194 box-sizing: border-box; 194 box-sizing: border-box;
195 padding-right: 15px; 195 padding-right: 15px;
196 width: 100%; 196 width: 100%;
197 height: 600px; 197 height: 100%;
198 overflow-y: scroll; 198 overflow-y: scroll;
199 padding-bottom: 55px;
199 200
200 .box-card { 201 .box-card {
201 float: left; 202 float: left;
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 10:24:48 4 * @LastEditTime: 2023-08-24 15:45:43
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -63,7 +63,9 @@ class data extends filter { ...@@ -63,7 +63,9 @@ class data extends filter {
63 }, 63 },
64 { 64 {
65 prop: "mj", 65 prop: "mj",
66 label: "面积（㎡）" 66 label: "面积（㎡）",
67 width: '100',
68 showOverflowTooltip: true
67 }, 69 },
68 { 70 {
69 prop: "zl", 71 prop: "zl",
...@@ -127,6 +129,7 @@ class data extends filter { ...@@ -127,6 +129,7 @@ class data extends filter {
127 prop: "mj", 129 prop: "mj",
128 label: "面积（㎡）", 130 label: "面积（㎡）",
129 width: '100', 131 width: '100',
132 showOverflowTooltip: true
130 }, 133 },
131 { 134 {
132 prop: "zl", 135 prop: "zl",
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:56:52 4 * @LastEditTime: 2023-08-24 16:15:50
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }" 7 <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <span v-if="!['djyy','fj'].includes(item.prop)"> 53 <span v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }} 54 {{ row[item.prop] }}
55 </span> 55 </span>
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 57 <span class="ellipsis-line">
58 {{ row[item.prop] }} 58 {{ row[item.prop] }}
59 </span> 59 </span>
......