Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
29648765 by xiaomiao
Options

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

2 parents 96066548 999bc88c
Inline Side-by-side
Showing 12 changed files with 314 additions and 304 deletions
...@@ -52,7 +52,14 @@ ...@@ -52,7 +52,14 @@
52 </div> 52 </div>
53 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span> 53 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
54 54
55 <span v-else>{{ row[item.prop] }}</span> 55 <span v-if="!['djyy','fj'].includes(item.prop)">
56 {{ row[item.prop] }}
57 </span>
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
59 <span class="ellipsis-line">
60 {{ row[item.prop] }}
61 </span>
62 </el-tooltip>
56 </td> 63 </td>
57 <td v-for="count in emptycolNum" :key="~count"></td> 64 <td v-for="count in emptycolNum" :key="~count"></td>
58 </tr> 65 </tr>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:54:00 4 * @LastEditTime: 2023-08-23 15:54:12
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 {{ getQsztName(row[item.prop]) }} 62 {{ getQsztName(row[item.prop]) }}
63 </span> 63 </span>
64 64
65 <span v-if="item.prop != 'djyy'"> 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">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:52:10 4 * @LastEditTime: 2023-08-23 15:54:23
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 {{ getQsztName(row[item.prop]) }} 56 {{ getQsztName(row[item.prop]) }}
57 </span> 57 </span>
58 58
59 <span v-if="item.prop != 'djyy'"> 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">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 15:00:12 4 * @LastEditTime: 2023-08-23 15:57:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="content"> 7 <div class="content">
...@@ -14,17 +14,15 @@ ...@@ -14,17 +14,15 @@
14 :default-expand-all="true" 14 :default-expand-all="true"
15 :expand-on-click-node="false" 15 :expand-on-click-node="false"
16 node-key="id" 16 node-key="id"
17 :default-checked-keys="[showTab]" 17 :default-checked-keys="[showTab]">
18 >
19 </el-tree> 18 </el-tree>
20 <el-collapse v-model="activeName" accordion> 19 <el-collapse v-model="activeName" accordion>
21 <el-collapse-item 20 <el-collapse-item
22 class="sfqqq" 21 class="sfqqq"
23 ref="sfq" 22 ref="sfq"
24 v-for="(item, index) in sfqdata" 23 v-for="(item, index) in sfqdata"
25 :key="index" 24 :key="index"
26 :name="index" 25 :name="index">
27 >
28 <template slot="title"> 26 <template slot="title">
29 <span class="text" @click="addlist(item)"> 27 <span class="text" @click="addlist(item)">
30 <span> 28 <span>
...@@ -34,11 +32,10 @@ ...@@ -34,11 +32,10 @@
34 </template> 32 </template>
35 <el-button 33 <el-button
36 v-for="(item, index) in item.children" 34 v-for="(item, index) in item.children"
37 :re='item' 35 :re='item'
38 :key="index" 36 :key="index"
39 class="sfqcontent" 37 class="sfqcontent"
40 @click="addlist(item, index)" 38 @click="addlist(item, index)">
41 >
42 {{ item.label }} 39 {{ item.label }}
43 </el-button> 40 </el-button>
44 </el-collapse-item> 41 </el-collapse-item>
...@@ -48,308 +45,308 @@ ...@@ -48,308 +45,308 @@
48 <component 45 <component
49 :is="componentTag" 46 :is="componentTag"
50 @getBdcdyh="getBdcdyh" 47 @getBdcdyh="getBdcdyh"
51 v-bind="currentSelectProps" 48 v-bind="currentSelectProps" />
52 />
53 </div> 49 </div>
54 </div> 50 </div>
55 </template> 51 </template>
56 <script> 52 <script>
57 import { getBdcqljqtsx } from "@/api/djbDetail.js"; 53 import { getBdcqljqtsx } from "@/api/djbDetail.js";
58 import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js"; 54 import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
59 export default { 55 export default {
60 data() { 56 data () {
61 return { 57 return {
62 activeName: 0, 58 activeName: 0,
63 //接收参数 59 //接收参数
64 // propsParam: this.$attrs, 60 // propsParam: this.$attrs,
65 //左侧目录 61 //左侧目录
66 catalog: {}, 62 catalog: {},
67 //选择加载哪一个组件 63 //选择加载哪一个组件
68 componentTag: "", 64 componentTag: "",
69 //子组件接收参数 65 //子组件接收参数
70 currentSelectProps: {}, 66 currentSelectProps: {},
71 //左侧树形结构数据 67 //左侧树形结构数据
72 treedata: [], 68 treedata: [],
73 sfqdata: [], 69 sfqdata: [],
74 keyy:"", 70 keyy: "",
75 iskey:"", 71 iskey: "",
76 defaultNode: "", 72 defaultNode: "",
77 defaultProps: { 73 defaultProps: {
78 value: "id", 74 value: "id",
79 children: "children", 75 children: "children",
80 label: "label", 76 label: "label",
81 }, 77 },
82 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断 78 showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
83 };
84 },
85 props: ["formData"],
86 mounted() {
87 this.loadData(this.formData.bdcdyh);
88 },
89 methods: {
90
91 /**
92 * @description: getBdcdyh
93 * @author: miaofang
94 * 点击不动产单元号事件
95 */
96 getBdcdyh(val) {
97 this.addloadData(val);
98 },
99 /**
100 * @description: addloadData
101 * @author: miaofang
102 */
103 addloadData(val) {
104 getBdcqljqtsx({
105 bdcdyid: val.bdcdyid,
106 bdcdyh: val.bdcdyh,
107 }).then((res) => {
108 if (res.code === 200) {
109 if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
110 let index= this.sfqdata.findIndex((item) => {
111 return item.bdcdyid ==val.bdcdyid;
112 });
113 this.activeName=index
114 this.setstyle(index,0,this.iskey);
115 } else {
116 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
117 this.activeName = this.sfqdata.length - 1;
118 this.$nextTick(() => {
119 this.setstyle(this.sfqdata.length - 1,0,this.iskey);
120 })
121 }
122 }
123 });
124 this.currentSelectProps = {
125 bdcdyid: val.bdcdyid,
126 bdcdyh: val.bdcdyh,
127 qllx: this.formData.qllx,
128 bsmQlxx: this.formData.bsmQlxx,
129 }; 79 };
130 }, 80 },
131 /** 81 props: ["formData"],
132 * @description: loadData 82 mounted () {
133 * @author: renchao 83 this.loadData(this.formData.bdcdyh);
134 */ 84 },
135 loadData(val) { 85 methods: {
136 getBdcqljqtsx({ 86
137 bdcdyid: this.formData.bdcdyid, 87 /**
138 bdcdyh: val, 88 * @description: getBdcdyh
139 }).then((res) => { 89 * @author: miaofang
140 if (res.code === 200) { 90 * 点击不动产单元号事件
141 this.treedata = loadTreeData(val); 91 */
142 this.sfqdata.push( 92 getBdcdyh (val) {
143 loadsfqData(res.result, val, this.formData.bdcdyid) 93 this.addloadData(val);
144 ); 94 },
145 this.$nextTick(function () { 95 /**
146 this.defaultNode = getNode( 96 * @description: addloadData
147 this.formData.qllx, 97 * @author: miaofang
148 { linShi: 0, xianShi: 0, liShi: 0 }, 98 */
149 this.formData.bdcdylx || "" 99 addloadData (val) {
100 getBdcqljqtsx({
101 bdcdyid: val.bdcdyid,
102 bdcdyh: val.bdcdyh,
103 }).then((res) => {
104 if (res.code === 200) {
105 if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
106 let index = this.sfqdata.findIndex((item) => {
107 return item.bdcdyid == val.bdcdyid;
108 });
109 this.activeName = index
110 this.setstyle(index, 0, this.iskey);
111 } else {
112 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
113 this.activeName = this.sfqdata.length - 1;
114 this.$nextTick(() => {
115 this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
116 })
117 }
118 }
119 });
120 this.currentSelectProps = {
121 bdcdyid: val.bdcdyid,
122 bdcdyh: val.bdcdyh,
123 qllx: this.formData.qllx,
124 bsmQlxx: this.formData.bsmQlxx,
125 };
126 },
127 /**
128 * @description: loadData
129 * @author: renchao
130 */
131 loadData (val) {
132 getBdcqljqtsx({
133 bdcdyid: this.formData.bdcdyid,
134 bdcdyh: val,
135 }).then((res) => {
136 if (res.code === 200) {
137 this.treedata = loadTreeData(val);
138 this.sfqdata.push(
139 loadsfqData(res.result, val, this.formData.bdcdyid)
150 ); 140 );
151 this.sfqdata[0].children.forEach((item,index) => { 141 this.$nextTick(function () {
152 if( item.id==this.defaultNode.id){ 142 this.defaultNode = getNode(
153 this.iskey=index 143 this.formData.qllx,
154 } 144 { linShi: 0, xianShi: 0, liShi: 0 },
155 }) 145 this.formData.bdcdylx || ""
156 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 146 );
157 // this.loadComponent(this.defaultNode.form); 147 this.sfqdata[0].children.forEach((item, index) => {
148 if (item.id == this.defaultNode.id) {
149 this.iskey = index
150 }
151 })
152 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
153 // this.loadComponent(this.defaultNode.form);
158 154
159 this.setstyle(0,0,this.iskey); 155 this.setstyle(0, 0, this.iskey);
160 156
161 157
162 }); 158 });
163 } 159 }
164 }); 160 });
165 this.currentSelectProps = { 161 this.currentSelectProps = {
166 bdcdyid: this.formData.bdcdyid, 162 bdcdyid: this.formData.bdcdyid,
167 bdcdyh: val, 163 bdcdyh: val,
168 qllx: this.formData.qllx, 164 qllx: this.formData.qllx,
169 bsmQlxx: this.formData.bsmQlxx, 165 bsmQlxx: this.formData.bsmQlxx,
170 }; 166 };
171 }, 167 },
172 /** 168 /**
173 * @description: handleNodeClick 169 * @description: handleNodeClick
174 * @param {*} data 170 * @param {*} data
175 * @author: renchao 171 * @author: renchao
176 */ 172 */
177 handleNodeClick(data) { 173 handleNodeClick (data) {
178 this.loadComponent(data.form); 174 this.loadComponent(data.form);
179 }, 175 },
180 /** 176 /**
181 * @description: setstyle 177 * @description: setstyle
182 * @param {*} data 178 * @param {*} data
183 * @author: renchao 179 * @author: renchao
184 * 设置样式和点击定位到当前功能 180 * 设置样式和点击定位到当前功能
185 */ 181 */
186 setstyle(newindex,index,key) { 182 setstyle (newindex, index, key) {
187 if(key!=undefined||this.keyy==index){ 183 if (key != undefined || this.keyy == index) {
188 if(key!=undefined){ 184 if (key != undefined) {
189 this.keyy=key 185 this.keyy = key
190 } 186 }
191 this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form); 187 this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
192 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el 188 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
193 dpme.style.backgroundColor = "#f5f5f5"; 189 dpme.style.backgroundColor = "#f5f5f5";
194 dpme.style.color = "#0079fe"; 190 dpme.style.color = "#0079fe";
195 dpme.style.borderRight = "4px solid #0079fe"; 191 dpme.style.borderRight = "4px solid #0079fe";
196 }else{ 192 } else {
197 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el 193 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
198 dpme.style.backgroundColor = "#ffffff"; 194 dpme.style.backgroundColor = "#ffffff";
199 dpme.style.color = "black"; 195 dpme.style.color = "black";
200 dpme.style.border = "none"; 196 dpme.style.border = "none";
201 } 197 }
202 198
203 199
204 200
205 201
206 }, 202 },
207 /** 203 /**
208 * @description: addlist 204 * @description: addlist
209 * @param {*} data 205 * @param {*} data
210 * @author: renchao 206 * @author: renchao
211 * 新增列表功能 207 * 新增列表功能
212 */ 208 */
213 addlist(data, index) { 209 addlist (data, index) {
214 if(index!=undefined){ 210 if (index != undefined) {
215 let newindex= this.sfqdata.findIndex((item) => { 211 let newindex = this.sfqdata.findIndex((item) => {
216 return item.bdcdyid ==data.bdcdyid; 212 return item.bdcdyid == data.bdcdyid;
217 }); 213 });
218 this.setstyle(newindex,index); 214 this.setstyle(newindex, index);
219 this.currentSelectProps.bdcdyid = data.bdcdyid; 215 this.currentSelectProps.bdcdyid = data.bdcdyid;
220 this.loadComponent(data.form); 216 this.loadComponent(data.form);
221 }else{ 217 } else {
222 let newindex= this.sfqdata.findIndex((item) => { 218 let newindex = this.sfqdata.findIndex((item) => {
223 return item.bdcdyid ==data.bdcdyid; 219 return item.bdcdyid == data.bdcdyid;
224 }); 220 });
225 this.setstyle(newindex,index,this.iskey); 221 this.setstyle(newindex, index, this.iskey);
226 this.currentSelectProps.bdcdyid = data.bdcdyid; 222 this.currentSelectProps.bdcdyid = data.bdcdyid;
227 } 223 }
228 224
225 },
226 /**
227 * @description: loadComponent
228 * @param {*} form
229 * @author: renchao
230 */
231 loadComponent (form) {
232 console.log(form, 'form');
233 this.componentTag = (r) =>
234 require.ensure([], () => r(require("@/views/registerBook/" + form)));
235 },
229 }, 236 },
230 /** 237 };
231 * @description: loadComponent
232 * @param {*} form
233 * @author: renchao
234 */
235 loadComponent(form) {
236 this.componentTag = (r) =>
237 require.ensure([], () => r(require("@/views/registerBook/" + form)));
238 },
239 },
240 };
241 </script> 238 </script>
242 <style scoped lang="scss"> 239 <style scoped lang="scss">
243 /deep/.rollTable { 240 /deep/.rollTable {
244 height: calc(100vh - 300px) !important; 241 height: calc(100vh - 300px) !important;
245 } 242 }
246 243
247 .content { 244 .content {
248 width: 100%; 245 width: 100%;
249 height: 100%; 246 height: 100%;
250 display: flex; 247 display: flex;
251 248
252 .left { 249 .left {
253 width: 256px; 250 width: 256px;
254 height: 704px; 251 height: 704px;
255 background-color: #f5f5f5; 252 background-color: #f5f5f5;
256 color: #333; 253 color: #333;
257 border: 1px solid rgb(228, 228, 228); 254 border: 1px solid rgb(228, 228, 228);
258 overflow-y: auto; 255 overflow-y: auto;
259 } 256 }
260 257
261 .right { 258 .right {
262 width: calc(100% - 256px); 259 width: calc(100% - 256px);
263 height: 704px; 260 height: 704px;
264 // overflow-y: scroll; 261 // overflow-y: scroll;
265 // overflow: auto; 262 // overflow: auto;
266 background-color: #f5f5f5; 263 background-color: #f5f5f5;
267 border: 1px solid rgb(228, 228, 228); 264 border: 1px solid rgb(228, 228, 228);
265 }
268 } 266 }
269 }
270 267
271 /deep/ .expanded.el-tree-node__expand-icon, 268 /deep/ .expanded.el-tree-node__expand-icon,
272 /deep/ .el-tree-node__expand-icon { 269 /deep/ .el-tree-node__expand-icon {
273 visibility: hidden; 270 visibility: hidden;
274 } 271 }
275
276 /deep/ .el-tree-node__content {
277 border: 1px solid rgb(228, 228, 228);
278 height: 45px;
279 }
280 272
281 /deep/ .el-tree-node:focus > .el-tree-node__content { 273 /deep/ .el-tree-node__content {
282 // background-color: #f5f5f5; 274 border: 1px solid rgb(228, 228, 228);
283 // color: #0079fe; 275 height: 45px;
284 // border-right: 4px solid #0079fe; 276 }
285 }
286 277
287 /deep/.el-tree-node { 278 /deep/ .el-tree-node:focus > .el-tree-node__content {
288 white-space: pre-wrap; 279 // background-color: #f5f5f5;
289 } 280 // color: #0079fe;
281 // border-right: 4px solid #0079fe;
282 }
290 283
291 /deep/ .is-current > .el-tree-node__content { 284 /deep/.el-tree-node {
292 // background-color: #f5f5f5; 285 white-space: pre-wrap;
293 // color: #0079fe; 286 }
294 // border-right: 4px solid #0079fe;
295 }
296 287
297 /deep/.el-collapse-item__header { 288 /deep/ .is-current > .el-tree-node__content {
298 width: 100%; 289 // background-color: #f5f5f5;
299 cursor: pointer; 290 // color: #0079fe;
300 position: relative; 291 // border-right: 4px solid #0079fe;
301 .el-collapse-item__arrow {
302 position: absolute;
303 top: 15px;
304 right: 0px;
305 } 292 }
306 align-items: center; 293
307 .text { 294 /deep/.el-collapse-item__header {
308 width: 100%; 295 width: 100%;
296 cursor: pointer;
297 position: relative;
298 .el-collapse-item__arrow {
299 position: absolute;
300 top: 15px;
301 right: 0px;
302 }
303 align-items: center;
304 .text {
305 width: 100%;
306 height: 45px;
307 display: inline-block;
308 span {
309 margin-left: 60px;
310 padding-top: 10px;
311 display: inline-block;
312 line-height: 15px;
313 }
314 }
309 height: 45px; 315 height: 45px;
310 display: inline-block; 316 display: inline-block;
317 line-height: 45px;
318 border: 1px solid rgb(228, 228, 228);
319 }
320 /deep/.el-collapse-item__content {
321 padding-bottom: 5px;
322 }
323 /deep/.sfqcontent {
324 white-space: wrap;
325 border: none;
326 padding: 0;
327 margin: 0;
328 cursor: pointer;
329 width: 100%;
330 height: 100px;
331 word-break: break-word;
332 display: inline;
311 span { 333 span {
312 margin-left: 60px; 334 font-size: 13px;
313 padding-top: 10px; 335 display: block;
314 display: inline-block;
315 line-height: 15px; 336 line-height: 15px;
337 margin-left: 70px;
316 } 338 }
339 height: 45px;
340 border: 1px solid rgb(228, 228, 228);
341 border-right: 4px solid #f5f5f5;
342 }
343 .sfqcontent:hover {
344 background-color: #f5f5f5;
345 color: black;
317 } 346 }
318 height: 45px; 347 .sfqcontent:focus {
319 display: inline-block; 348 background-color: #f5f5f5;
320 line-height: 45px; 349 color: #0079fe;
321 border: 1px solid rgb(228, 228, 228); 350 border-right: 4px solid #0079fe;
322 }
323 /deep/.el-collapse-item__content {
324 padding-bottom: 5px;
325 }
326 /deep/.sfqcontent {
327 white-space: wrap;
328 border: none;
329 padding: 0;
330 margin: 0;
331 cursor: pointer;
332 width: 100%;
333 height: 100px;
334 word-break: break-word;
335 display: inline;
336 span {
337 font-size: 13px;
338 display: block;
339 line-height: 15px;
340 margin-left: 70px;
341 } 351 }
342 height: 45px;
343 border: 1px solid rgb(228, 228, 228);
344 border-right: 4px solid #f5f5f5;
345 }
346 .sfqcontent:hover {
347 background-color: #f5f5f5;
348 color: black;
349 }
350 .sfqcontent:focus {
351 background-color: #f5f5f5;
352 color: #0079fe;
353 border-right: 4px solid #0079fe;
354 }
355 </style> 352 </style>
......
...@@ -46,7 +46,13 @@ ...@@ -46,7 +46,13 @@
46 {{ getQsztName(row[item.prop]) }} 46 {{ getQsztName(row[item.prop]) }}
47 </span> 47 </span>
48 48
49 <span v-if="item.prop !== 'qszt' && !judge(item.label)"> {{ row[item.prop] }}</span> 49 <el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top">
50 <span class="ellipsis-line">
51 {{ row[item.prop] }}
52 </span>
53 </el-tooltip>
54
55 <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span>
50 <div class="many" v-if="judge(item.label)"> 56 <div class="many" v-if="judge(item.label)">
51 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index"> 57 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
52 {{ label[item.prop] }} 58 {{ label[item.prop] }}
...@@ -147,10 +153,10 @@ ...@@ -147,10 +153,10 @@
147 * @param {*} lable 153 * @param {*} lable
148 * @author: renchao 154 * @author: renchao
149 */ 155 */
150 judge(label){ 156 judge (label) {
151 if ('项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数'.indexOf(label) > -1) { 157 if ('项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数'.indexOf(label) > -1) {
152 return true 158 return true
153 }else{ 159 } else {
154 return false 160 return false
155 } 161 }
156 }, 162 },
...@@ -187,20 +193,20 @@ ...@@ -187,20 +193,20 @@
187 193
188 <style lang="scss" scoped> 194 <style lang="scss" scoped>
189 @import "./qlxxCommon.scss"; 195 @import "./qlxxCommon.scss";
190 .cols{ 196 .cols {
191 td{ 197 td {
192 .many{ 198 .many {
193 width: 100%; 199 width: 100%;
194 height: 100%; 200 height: 100%;
195 display: flex; 201 display: flex;
196 flex-direction: row; 202 flex-direction: row;
197 div{ 203 div {
198 flex: 1; 204 flex: 1;
199 border-right: 2px solid #e3e2e2; 205 border-right: 2px solid #e3e2e2;
200 line-height: 40px; 206 line-height: 40px;
201 overflow: unset; 207 overflow: unset;
202 } 208 }
203 div:last-child{ 209 div:last-child {
204 border: 0; 210 border: 0;
205 } 211 }
206 } 212 }
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 {{ getQsztName(row[item.prop]) }} 62 {{ getQsztName(row[item.prop]) }}
63 </span> 63 </span>
64 64
65 <span v-if="item.prop != 'djyy'"> 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">
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
70 {{ row[item.prop] }} 70 {{ row[item.prop] }}
71 </span> 71 </span>
72 </el-tooltip> 72 </el-tooltip>
73
73 </td> 74 </td>
74 <td v-for="count in emptycolNum" :key="~count"></td> 75 <td v-for="count in emptycolNum" :key="~count"></td>
75 </tr> 76 </tr>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 15:01:40 4 * @LastEditTime: 2023-08-23 15:54:45
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
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 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 15:03:14 4 * @LastEditTime: 2023-08-23 15:54:51
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
96 {{ getQsztName(row[item.prop]) }} 96 {{ getQsztName(row[item.prop]) }}
97 </span> 97 </span>
98 98
99 <span v-if="item.prop != 'djyy'"> 99 <span v-if="!['djyy','fj'].includes(item.prop)">
100 {{ row[item.prop] }} 100 {{ row[item.prop] }}
101 </span> 101 </span>
102 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top"> 102 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
104 {{ row[item.prop] }} 104 {{ row[item.prop] }}
105 </span> 105 </span>
106 </el-tooltip> 106 </el-tooltip>
107
108 </td> 107 </td>
109 <td v-for="count in emptycolNum" :key="~count"></td> 108 <td v-for="count in emptycolNum" :key="~count"></td>
110 </tr> 109 </tr>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:53:21 4 * @LastEditTime: 2023-08-23 15:54:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
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 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:53:33 4 * @LastEditTime: 2023-08-23 15:55:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 {{ getQsztName(row[item.prop]) }} 50 {{ getQsztName(row[item.prop]) }}
51 </span> 51 </span>
52 52
53 <span v-if="item.prop != 'djyy'"> 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">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:53:41 4 * @LastEditTime: 2023-08-23 15:55:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 {{ getQsztName(row[item.prop]) }} 50 {{ getQsztName(row[item.prop]) }}
51 </span> 51 </span>
52 52
53 <span v-if="item.prop != 'djyy'"> 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">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 08:53:48 4 * @LastEditTime: 2023-08-23 15:56:52
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' }"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 {{ getQsztName(row[item.prop]) }} 50 {{ getQsztName(row[item.prop]) }}
51 </span> 51 </span>
52 52
53 <span v-if="item.prop != 'djyy'"> 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">
......