xiaoy
/
wxjt-asset-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改文档

Browse Source
master
xy 1 year ago
parent c10c9a2dd0
commit 35af87b63e
18 changed files with 261 additions and 74 deletions
Show Stats Download Patch File Download Diff File

BIN
src/assets/lease.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

32
src/store/modules/bigdata.js
Unescape View File

@ -65,16 +65,16 @@ const actions = {
page: 1, page: 1,
page_size: 999, page_size: 999,
filter: [ filter: [
{ // {
key: 'zulinjieshuqixian', // key: 'zulinjieshuqixian',
op: 'range', // op: 'range',
value: `${$moment().format("YYYY-MM-DD")},2999-12-31` // value: `${$moment().format("YYYY-MM-DD")},2999-12-31`
}, // },
{ // {
key: 'zulinkaishiqixian', // key: 'zulinkaishiqixian',
op: 'range', // op: 'range',
value: `${$moment(0).format("YYYY-MM-DD")},${$moment().format("YYYY-MM-DD")}` // value: `${$moment(0).format("YYYY-MM-DD")},${$moment().format("YYYY-MM-DD")}`
} // }
] ]
}).then(res => { }).then(res => {
commit("SET_LEASES", res.data) commit("SET_LEASES", res.data)
@ -106,15 +106,15 @@ const actions = {
page: 1, page: 1,
page_size: 999, page_size: 999,
filter: [ filter: [
// { {
// key: 'zulinjieshuqixian', key: 'zulinjieshuqixian',
// op: 'range', op: 'range',
// value: `${$moment().format("YYYY-MM-DD")},${preDate}` value: `${$moment().format("YYYY-MM-DD")},${preDate}`
// }, },
{ {
key: 'zulinkaishiqixian', key: 'zulinkaishiqixian',
op: 'range', op: 'range',
value: `1999-01-01,${$moment().format("YYYY-MM-DD")}` value: `${$moment().format("YYYY-MM-DD")},2999-01-01`
} }
] ]
}).then(res => { }).then(res => {

4
src/views/assets/component/addHandles.vue
Unescape View File

@ -15,7 +15,7 @@ export default {
],{}, false) ],{}, false)
return ( return (
<div> <div style="padding: 0 20px;">
<el-card style="margin-top: 20px;"> <el-card style="margin-top: 20px;">
<div slot="header" style="display: flex;align-items: center;"> <div slot="header" style="display: flex;align-items: center;">
<i class="el-icon-back" <i class="el-icon-back"
@ -146,6 +146,7 @@ export default {
<el-drawer title="土地列表" <el-drawer title="土地列表"
visible={this.landDialog} visible={this.landDialog}
append-to-body={true}
size="64%" size="64%"
on={{ on={{
['update:visible']: (val) => this.landDialog = val, ['update:visible']: (val) => this.landDialog = val,
@ -371,6 +372,7 @@ export default {
</el-drawer> </el-drawer>
<el-drawer title="房产列表" <el-drawer title="房产列表"
append-to-body={true}
visible={this.houseDialog} visible={this.houseDialog}
size="64%" size="64%"
on={{ on={{

2
src/views/assets/handleDetail.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div style="padding: 0 20px;">
<el-page-header <el-page-header
:content="$route.meta.title" :content="$route.meta.title"
style=" style="

2
src/views/assets/handleSign.vue
Unescape View File

@ -40,7 +40,7 @@ export default {
); );
return ( return (
<div> <div style="padding: 0 20px;">
<el-card style="margin-top: 20px;"> <el-card style="margin-top: 20px;">
<div slot="header" style="display: flex;align-items: center;"> <div slot="header" style="display: flex;align-items: center;">
<i <i

2
src/views/assets/handleSignDetail.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div style="padding: 0 20px;">
<el-page-header <el-page-header
:content="$route.meta.title" :content="$route.meta.title"
style=" style="

3
src/views/component/dialog.vue
Unescape View File

@ -26,7 +26,8 @@ export default {
title: "新增", title: "新增",
visible: this.dialogVisible, visible: this.dialogVisible,
width: "80vw", width: "80vw",
"close-on-click-modal": false "close-on-click-modal": false,
"append-to-body": true
}, },
on: { on: {
"update:visible": (val) => { "update:visible": (val) => {

2
src/views/component/imports.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-dialog :visible.sync="dialogVisible" title="数据导入" width="70%"> <el-dialog :append-to-body="true" :visible.sync="dialogVisible" title="数据导入" width="70%">
<div class="title">模板下载</div> <div class="title">模板下载</div>
<el-button <el-button
style="margin-top: 10px" style="margin-top: 10px"

188
src/views/dataShow/right3.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div id="bottomRight"> <div id="bottomRight" @mouseenter="isPause = true" @mouseleave="isPause = false">
<div class="bg-color-black"> <div class="bg-color-black">
<div class="d-flex pt-2"> <div class="d-flex pt-2">
<div class="title"> <div class="title">
@ -10,24 +10,76 @@
</div> </div>
<div class="d-flex"> <div class="d-flex">
<div class="decoration2"> <div class="decoration2">
<dv-decoration-2 :reverse="true" style="position:absolute;width:5px;height:6rem;" /> <dv-decoration-2
:reverse="true"
style="position: absolute; width: 5px; height: 6rem"
/>
</div> </div>
</div> </div>
</div> </div>
<div class="top">
<svg class="arrow"
viewBox="0 0 1024 1024"
xmlns="http://www.w3.org/2000/svg"
@click="() => {
--index;
showLease = leaseList[index % leaseList.length];
}">
<path d="M635.733333 490.666667l174.933334 174.933333-64 59.733333-234.666667-234.666666L746.666667 256 810.666667 315.733333l-174.933334 174.933334z m-260.266666 0l174.933333 174.933333-59.733333 59.733333L256 490.666667 490.666667 256l59.733333 59.733333-174.933333 174.933334z" fill="currentColor"></path>
</svg>
<div> <div>
<div> <img :src="require('@/assets/lease.png')" alt="">
<span v-for="item in leaseName">{{ item.name }}</span> <template>
<div> <transition-group name="fade">
<div>承租方</div> <div class="area-name" key="1" v-show="index%2">
<div>{{ showLease.chengzufang }}</div> <div v-for="(item) in leaseName.slice(0,3)">{{ item.name }}</div>
<div v-if="leaseName.length > 3">...等共{{ leaseName.length }}处</div>
</div> </div>
<div> <div class="area-name" key="2" v-show="!index%2">
<div>租赁期限</div> <div v-for="(item) in leaseName.slice(0,3)">{{ item.name }}</div>
<div>{{ showLease.zulinkaishiqixian }}~{{ showLease.zulinjieshuqixian }}</div> <div v-if="leaseName.length > 3">...等共{{ leaseName.length }}处</div>
</div> </div>
<div> </transition-group>
<div>面积</div> </template>
<div>{{ showLease.chengzufang }}</div> </div>
<svg class="arrow"
viewBox="0 0 1024 1024"
xmlns="http://www.w3.org/2000/svg"
@click="() => {
++index;
showLease = leaseList[index % leaseList.length];
}">
<path d="M430.933333 490.666667L256 665.6 315.733333 725.333333l234.666667-234.666666L315.733333 256 256 315.733333l174.933333 174.933334z m256 0L512 665.6l59.733333 59.733333 234.666667-234.666666L576 256 512 315.733333l174.933333 174.933334z" fill="currentColor"></path>
</svg>
</div>
<div class="bottom">
<div class="info-item">
<div class="info-item__label">承租方</div>
<div class="info-item__value">{{ showLease.chengzufang }}</div>
</div>
<div class="info-item">
<div class="info-item__label">租赁期限</div>
<div class="info-item__value">
{{ showLease.zulinkaishiqixian }} ~ {{
showLease.zulinjieshuqixian
}}
</div>
</div>
<div class="info-item">
<div class="info-item__label">面积</div>
<div class="info-item__value">
<dv-digital-flop
style="height: 11.8px;width: 100px;"
:config="{
number: [areas],
toFixed: 2,
content: '{nt}m²',
textAlign: 'left',
style: {
fontSize: 14,
}
}" />
<!-- {{ areas }} m²-->
</div> </div>
</div> </div>
</div> </div>
@ -36,53 +88,81 @@
</template> </template>
<script> <script>
import SvgIcon from "@/components/SvgIcon" import SvgIcon from "@/components/SvgIcon";
import Chart from "@/components/Charts"
export default { export default {
components: { components: {
SvgIcon SvgIcon,
}, },
data() { data() {
return { return {
isPause: false,
showLease: {}, showLease: {},
timer: null, timer: null,
index: 0, index: 0,
} };
}, },
mounted() { mounted() {
this.showLease = this.leaseList[this.index % this.leaseList.length];
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.showLease = this.leaseList[this.index%this.leaseList.length] if (!this.isPause) {
this.index++; this.index++;
},5000) this.showLease = this.leaseList[this.index % this.leaseList.length];
}
}, 5000);
}, },
beforeDestroy() { beforeDestroy() {
clearInterval(this.timer) clearInterval(this.timer);
},
methods: {
}, },
methods: {},
computed: { computed: {
leaseName() { leaseName() {
let temp = this.index; let temp = this.index;
return [...this.showLease?.land || [],...this.showLease?.houses || []] return [
...(this.showLease?.land || []),
...(this.showLease?.houses || []),
];
},
areas() {
let temp = this.index;
return [
...(this.showLease?.land || []),
...(this.showLease?.houses || []),
].reduce(
(pre, cur) =>
pre +
(!isNaN(Number(cur.shijimianji || 0))
? Number(cur.shijimianji || 0)
: 0),
0
);
}, },
leaseList() { leaseList() {
return this.$store.state.bigdata.adventLeases || [] return this.$store.state.bigdata.leases || [];
} },
} },
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
#bottomRight { #bottomRight {
padding: 20px 10px; user-select: none;
padding: 20px 10px 34px;
height: 100%;
}
.bg-color-black {
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
} }
.title { .title {
display: flex; display: flex;
color: #fff; color: #fff;
padding: 0 20px; padding: 0 20px;
align-items: center; align-items: center;
flex: 0;
.text { .text {
padding: 0 8px; padding: 0 8px;
} }
@ -92,4 +172,56 @@ export default {
height: 24px; height: 24px;
color: #1da4a1; color: #1da4a1;
} }
.top {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 33px;
color: #fff;
position: relative;
.area-name {
text-align: center;
font-size: 16px;
font-weight: bold;
position: absolute;
bottom: 0;
left: 50%;
transform: translate(-50%,26%);
}
.arrow {
cursor: pointer;
width: 36px;
color: #8ef0e0;
animation: colors linear 6s infinite;
}
}
.bottom {
color: #fff;
margin-top: auto;
.info-item {
display: flex;
&__label {
width: 150px;
color: #8ef0e0;
padding-left: 46px;
padding-right: 36px;
}
&__value {
}
}
.info-item + .info-item {
padding-top: 18px;
}
}
@keyframes colors {
0%,100% {
color: #8ef0e0;
}
50% {
color: #19506c;
}
}
</style> </style>

34
src/views/dataShow/tooltip.vue
Unescape View File

@ -25,8 +25,36 @@ export default {
title: "资产名称" title: "资产名称"
}, },
{ {
key: "dengjimianji", key: "shijimianji",
title: "登记面积" title: "实际面积（m²）",
width: 140,
render: (h,{ row }) => {
return h('span',{
style: {
'text-align': 'right'
}
},row.shijimianji)
}
},
{
key: 'show',
title: '查看',
width: 110,
render: (h,{ row }) => {
return h('Button', {
style: {
background: '#19506c'
},
props: {
type: 'primary'
},
on: {
click: _ => {
this.$router.push('/landDetail/'+row.id)
}
}
},'查看')
}
} }
] ]
} }
@ -84,7 +112,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.table { .table {
width: 350px; width: 400px;
border-radius: 20px; border-radius: 20px;
} }

1
src/views/lease/component/addPay.vue
Unescape View File

@ -134,6 +134,7 @@ export default {
return ( return (
<el-drawer visible={this.dialogVisible} <el-drawer visible={this.dialogVisible}
append-to-body={true}
title="租金收取" title="租金收取"
size="64%" size="64%"
on={{ on={{

2
src/views/lease/component/payList.vue
Unescape View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-drawer :visible.sync="dialogVisible" title="租金收取列表" size="64%"> <el-drawer :append-to-body="true" :visible.sync="dialogVisible" title="租金收取列表" size="64%">
<div style="padding: 0 10px;"> <div style="padding: 0 10px;">
<xy-table :action="index" <xy-table :action="index"
ref="xyTable" ref="xyTable"

22
src/views/lease/detailLease.vue
Unescape View File

@ -142,12 +142,32 @@ export default {
logLeases: [], logLeases: [],
logLeaseTable: [ logLeaseTable: [
{
prop: "diff",
label: "变更内容",
customFn: row => {
let content = "";
for (let index in this.fields) {
let key = this.fields[index].field;
if (this.detail[key] && (row[key] !== this.detail[key])) {
if (row[key] && row[key] !== this.detail[key]) {
content += `${this.fields[index].name}由${this.detail[key]}变更为${row[key]}\n`;
}
}
}
return (
<span>{ content }</span>
)
}
},
{ {
prop: 'biangengshijian', prop: 'biangengshijian',
label: '变更时间' label: '变更时间',
width: 200
}, },
{ {
prop: "show", prop: "show",
width: 90,
label: "查看", label: "查看",
customFn: row => ( customFn: row => (
<div> <div>

2
src/views/lease/detailPlan.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div style="padding: 0 20px;">
<el-page-header <el-page-header
:content="$route.meta.title" :content="$route.meta.title"
style=" style="

4
src/views/statics/assets.vue
Unescape View File

@ -9,16 +9,18 @@
> >
<div slot="content"></div> <div slot="content"></div>
<slot> <slot>
<DatePicker v-model="year" type="year" formatter="yyyy"></DatePicker> <DatePicker style="padding-left: 20px;" v-model="year" type="year" formatter="yyyy"></DatePicker>
</slot> </slot>
</LxHeader> </LxHeader>
</div> </div>
</div> </div>
<div style="padding: 0 20px;">
<lineChart1 :year="year" id="line-chart1" width="100%" height="300px"></lineChart1> <lineChart1 :year="year" id="line-chart1" width="100%" height="300px"></lineChart1>
<pieChart :year="year" id="pie-chart" style="margin-top: 20px;" width="100%" height="300px"></pieChart> <pieChart :year="year" id="pie-chart" style="margin-top: 20px;" width="100%" height="300px"></pieChart>
</div> </div>
</div>
</template> </template>
<script> <script>

1
src/views/statics/lease.vue
Unescape View File

@ -97,7 +97,6 @@ export default {
daterange: "", daterange: "",
select: { select: {
table_name: 'leases', table_name: 'leases',
sort_name: 'land_id',
page: 1, page: 1,
page_size: 999, page_size: 999,
filter: [ filter: [

4
src/views/statics/safetyYear.vue
Unescape View File

@ -9,15 +9,17 @@
> >
<div slot="content"></div> <div slot="content"></div>
<slot> <slot>
<DatePicker v-model="niandu" type="year" formatter="yyyy"></DatePicker> <DatePicker style="padding-left: 20px;" v-model="niandu" type="year" formatter="yyyy"></DatePicker>
</slot> </slot>
</LxHeader> </LxHeader>
</div> </div>
</div> </div>
<div style="padding: 0 20px;">
<line-chart :niandu="niandu" width="100%" height="300px"></line-chart> <line-chart :niandu="niandu" width="100%" height="300px"></line-chart>
<bar-chart id="chart1" width="100%" height="300px" style="margin-top: 10px;"></bar-chart> <bar-chart id="chart1" width="100%" height="300px" style="margin-top: 10px;"></bar-chart>
</div> </div>
</div>
</template> </template>
<script> <script>

2
src/views/system/menu.vue
Unescape View File

@ -437,7 +437,7 @@ export default {
this.dialogFormVisible = true; this.dialogFormVisible = true;
}, },
newDetail (row) { newDetail (row) {
this.prompt('新增详情菜单？','请输入组件路径').then(({ value }) => { this.$prompt('新增详情菜单？','请输入组件路径').then(({ value }) => {
let copyRow = deepCopy(row) let copyRow = deepCopy(row)
delete copyRow.auth_node_tags_array; delete copyRow.auth_node_tags_array;
delete copyRow.children; delete copyRow.children;

Write Preview
Loading…
Cancel
Save