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
Expand all
Inline Side-by-side
Showing 12 changed files with 40 additions and 27 deletions
......@@ -52,7 +52,14 @@
</div>
<span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
<span v-else>{{ row[item.prop] }}</span>
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
</el-tooltip>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:54:00
* @LastEditTime: 2023-08-23 15:54:12
-->
<template>
<div class="djxxTable">
......@@ -62,7 +62,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:52:10
* @LastEditTime: 2023-08-23 15:54:23
-->
<template>
<div class="djxxTable">
......@@ -56,7 +56,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
......@@ -46,7 +46,13 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop !== 'qszt' && !judge(item.label)"> {{ row[item.prop] }}</span>
<el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
</el-tooltip>
<span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span>
<div class="many" v-if="judge(item.label)">
<div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
{{ label[item.prop] }}
......@@ -147,10 +153,10 @@
* @param {*} lable
* @author: renchao
*/
judge(label){
judge (label) {
if ('项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数'.indexOf(label) > -1) {
return true
}else{
} else {
return false
}
},
......@@ -187,20 +193,20 @@
<style lang="scss" scoped>
@import "./qlxxCommon.scss";
.cols{
td{
.many{
.cols {
td {
.many {
width: 100%;
height: 100%;
display: flex;
flex-direction: row;
div{
div {
flex: 1;
border-right: 2px solid #e3e2e2;
line-height: 40px;
overflow: unset;
}
div:last-child{
div:last-child {
border: 0;
}
}
......
......@@ -62,7 +62,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......@@ -70,6 +70,7 @@
{{ row[item.prop] }}
</span>
</el-tooltip>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:01:40
* @LastEditTime: 2023-08-23 15:54:45
-->
<template>
<div class="djxxTable">
......@@ -51,7 +51,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 15:03:14
* @LastEditTime: 2023-08-23 15:54:51
-->
<template>
<div class="djxxTable">
......@@ -96,7 +96,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......@@ -104,7 +104,6 @@
{{ row[item.prop] }}
</span>
</el-tooltip>
</td>
<td v-for="count in emptycolNum" :key="~count"></td>
</tr>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:21
* @LastEditTime: 2023-08-23 15:54:56
-->
<template>
<div class="djxxTable">
......@@ -51,7 +51,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:33
* @LastEditTime: 2023-08-23 15:55:02
-->
<template>
<div class="djxxTable">
......@@ -50,7 +50,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:41
* @LastEditTime: 2023-08-23 15:55:15
-->
<template>
<div class="djxxTable">
......@@ -50,7 +50,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:53:48
* @LastEditTime: 2023-08-23 15:56:52
-->
<template>
<div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
......@@ -50,7 +50,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<span v-if="item.prop != 'djyy'">
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
......