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 {
white-space: nowrap; //文本不会换行
}
.tooltip-width {
max-width: 300px;
}
//main-container全局样式
.app-container {
padding: 20px;
......
......@@ -55,7 +55,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
......@@ -65,7 +65,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
......@@ -59,7 +59,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
......@@ -46,7 +46,7 @@
{{ getQsztName(row[item.prop]) }}
</span>
<el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-if="['djyy','fj'].includes(item.prop)" effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 08:54:50
* @LastEditTime: 2023-08-24 16:14:57
-->
<template>
<div class="djxxTable">
......@@ -65,7 +65,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:54:45
* @LastEditTime: 2023-08-24 16:15:01
-->
<template>
<div class="djxxTable">
......@@ -54,7 +54,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:54:51
* @LastEditTime: 2023-08-24 16:15:05
-->
<template>
<div class="djxxTable">
......@@ -51,10 +51,11 @@
{{ 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">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......@@ -99,7 +100,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:54:56
* @LastEditTime: 2023-08-24 16:15:38
-->
<template>
<div class="djxxTable">
......@@ -54,7 +54,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:55:02
* @LastEditTime: 2023-08-24 16:15:42
-->
<template>
<div class="djxxTable">
......@@ -53,7 +53,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:55:15
* @LastEditTime: 2023-08-24 16:15:45
-->
<template>
<div class="djxxTable">
......@@ -53,7 +53,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-16 09:48:00
* @LastEditTime: 2023-08-24 15:38:52
-->
<template>
<div class="szxx">
......@@ -194,8 +194,9 @@
box-sizing: border-box;
padding-right: 15px;
width: 100%;
height: 600px;
height: 100%;
overflow-y: scroll;
padding-bottom: 55px;
.box-card {
float: left;
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-24 10:24:48
* @LastEditTime: 2023-08-24 15:45:43
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -63,7 +63,9 @@ class data extends filter {
},
{
prop: "mj",
label: "面积（㎡）"
label: "面积（㎡）",
width: '100',
showOverflowTooltip: true
},
{
prop: "zl",
......@@ -127,6 +129,7 @@ class data extends filter {
prop: "mj",
label: "面积（㎡）",
width: '100',
showOverflowTooltip: true
},
{
prop: "zl",
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:56:52
* @LastEditTime: 2023-08-24 16:15:50
-->
<template>
<div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }"
......@@ -53,7 +53,7 @@
<span v-if="!['djyy','fj'].includes(item.prop)">
{{ row[item.prop] }}
</span>
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top">
<el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
<span class="ellipsis-line">
{{ row[item.prop] }}
</span>
......