From 35af87b63ece07e86248d8ce54788756a69bed4a Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 13 Aug 2024 17:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/lease.png                      | Bin 0 -> 5682 bytes
 src/store/modules/bigdata.js              |  32 ++--
 src/views/assets/component/addHandles.vue |   4 +-
 src/views/assets/handleDetail.vue         |   2 +-
 src/views/assets/handleSign.vue           |   2 +-
 src/views/assets/handleSignDetail.vue     |   2 +-
 src/views/component/dialog.vue            |   3 +-
 src/views/component/imports.vue           |   2 +-
 src/views/dataShow/right3.vue             | 208 ++++++++++++++++++----
 src/views/dataShow/tooltip.vue            |  34 +++-
 src/views/lease/component/addPay.vue      |   1 +
 src/views/lease/component/payList.vue     |   2 +-
 src/views/lease/detailLease.vue           |  22 ++-
 src/views/lease/detailPlan.vue            |   2 +-
 src/views/statics/assets.vue              |   8 +-
 src/views/statics/lease.vue               |   1 -
 src/views/statics/safetyYear.vue          |   8 +-
 src/views/system/menu.vue                 |   2 +-
 18 files changed, 261 insertions(+), 74 deletions(-)
 create mode 100644 src/assets/lease.png

diff --git a/src/assets/lease.png b/src/assets/lease.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e01f4e49467578c5df9043843975924f639aaa5
GIT binary patch
literal 5682
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
Y0jPDTD(KnpBme*a07*qoM6N<$f@z5P9{>OV

literal 0
HcmV?d00001

diff --git a/src/store/modules/bigdata.js b/src/store/modules/bigdata.js
index e21f3d5..8d5777e 100644
--- a/src/store/modules/bigdata.js
+++ b/src/store/modules/bigdata.js
@@ -65,16 +65,16 @@ const actions = {
         page: 1,
         page_size: 999,
         filter: [
-          {
-            key: 'zulinjieshuqixian',
-            op: 'range',
-            value: `${$moment().format("YYYY-MM-DD")},2999-12-31`
-          },
-          {
-            key: 'zulinkaishiqixian',
-            op: 'range',
-            value: `${$moment(0).format("YYYY-MM-DD")},${$moment().format("YYYY-MM-DD")}`
-          }
+          // {
+          //   key: 'zulinjieshuqixian',
+          //   op: 'range',
+          //   value: `${$moment().format("YYYY-MM-DD")},2999-12-31`
+          // },
+          // {
+          //   key: 'zulinkaishiqixian',
+          //   op: 'range',
+          //   value: `${$moment(0).format("YYYY-MM-DD")},${$moment().format("YYYY-MM-DD")}`
+          // }
         ]
       }).then(res => {
         commit("SET_LEASES", res.data)
@@ -106,15 +106,15 @@ const actions = {
         page: 1,
         page_size: 999,
         filter: [
-          // {
-          //   key: 'zulinjieshuqixian',
-          //   op: 'range',
-          //   value: `${$moment().format("YYYY-MM-DD")},${preDate}`
-          // },
+          {
+            key: 'zulinjieshuqixian',
+            op: 'range',
+            value: `${$moment().format("YYYY-MM-DD")},${preDate}`
+          },
           {
             key: 'zulinkaishiqixian',
             op: 'range',
-            value: `1999-01-01,${$moment().format("YYYY-MM-DD")}`
+            value: `${$moment().format("YYYY-MM-DD")},2999-01-01`
           }
         ]
       }).then(res => {
diff --git a/src/views/assets/component/addHandles.vue b/src/views/assets/component/addHandles.vue
index ee9b98b..07530f2 100644
--- a/src/views/assets/component/addHandles.vue
+++ b/src/views/assets/component/addHandles.vue
@@ -15,7 +15,7 @@ export default {
     ],{}, false)
 
     return (
-      <div>
+      <div style="padding: 0 20px;">
         <el-card style="margin-top: 20px;">
           <div slot="header" style="display: flex;align-items: center;">
             <i class="el-icon-back"
@@ -146,6 +146,7 @@ export default {
 
         <el-drawer title="土地列表"
                    visible={this.landDialog}
+                   append-to-body={true}
                    size="64%"
                    on={{
                      ['update:visible']: (val) => this.landDialog = val,
@@ -371,6 +372,7 @@ export default {
         </el-drawer>
 
         <el-drawer title="房产列表"
+                   append-to-body={true}
                    visible={this.houseDialog}
                    size="64%"
                    on={{
diff --git a/src/views/assets/handleDetail.vue b/src/views/assets/handleDetail.vue
index 56aec85..266a647 100644
--- a/src/views/assets/handleDetail.vue
+++ b/src/views/assets/handleDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 0 20px;">
     <el-page-header
       :content="$route.meta.title"
       style="
diff --git a/src/views/assets/handleSign.vue b/src/views/assets/handleSign.vue
index ef89c50..b53c054 100644
--- a/src/views/assets/handleSign.vue
+++ b/src/views/assets/handleSign.vue
@@ -40,7 +40,7 @@ export default {
     );
 
     return (
-      <div>
+      <div style="padding: 0 20px;">
         <el-card style="margin-top: 20px;">
           <div slot="header" style="display: flex;align-items: center;">
             <i
diff --git a/src/views/assets/handleSignDetail.vue b/src/views/assets/handleSignDetail.vue
index 87b2310..f34f56e 100644
--- a/src/views/assets/handleSignDetail.vue
+++ b/src/views/assets/handleSignDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 0 20px;">
     <el-page-header
       :content="$route.meta.title"
       style="
diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue
index 23d0609..705333f 100644
--- a/src/views/component/dialog.vue
+++ b/src/views/component/dialog.vue
@@ -26,7 +26,8 @@ export default {
             title: "新增",
             visible: this.dialogVisible,
             width: "80vw",
-            "close-on-click-modal": false
+            "close-on-click-modal": false,
+            "append-to-body": true
           },
           on: {
             "update:visible": (val) => {
diff --git a/src/views/component/imports.vue b/src/views/component/imports.vue
index 9b47201..657d6bf 100644
--- a/src/views/component/imports.vue
+++ b/src/views/component/imports.vue
@@ -1,6 +1,6 @@
 <template>
   <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>
       <el-button
         style="margin-top: 10px"
diff --git a/src/views/dataShow/right3.vue b/src/views/dataShow/right3.vue
index e9a680b..6e0a9f8 100644
--- a/src/views/dataShow/right3.vue
+++ b/src/views/dataShow/right3.vue
@@ -1,33 +1,85 @@
 <template>
-  <div id="bottomRight">
+  <div id="bottomRight" @mouseenter="isPause = true" @mouseleave="isPause = false">
     <div class="bg-color-black">
       <div class="d-flex pt-2">
         <div class="title">
-           <span>
-             <SvgIcon class="text-icon" icon-class="skill"></SvgIcon>
-           </span>
+          <span>
+            <SvgIcon class="text-icon" icon-class="skill"></SvgIcon>
+          </span>
           <span class="fs-xl text mx-2">租赁台账</span>
         </div>
         <div class="d-flex">
           <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 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>
-          <span v-for="item in leaseName">{{ item.name }}</span>
-          <div>
-            <div>承租方</div>
-            <div>{{ showLease.chengzufang }}</div>
-          </div>
-          <div>
-            <div>租赁期限</div>
-            <div>{{ showLease.zulinkaishiqixian }}~{{ showLease.zulinjieshuqixian }}</div>
+          <img :src="require('@/assets/lease.png')" alt="">
+          <template>
+            <transition-group name="fade">
+              <div class="area-name" key="1" v-show="index%2">
+                <div v-for="(item) in leaseName.slice(0,3)">{{ item.name }}</div>
+                <div v-if="leaseName.length > 3">...等共{{ leaseName.length }}处</div>
+              </div>
+              <div class="area-name" key="2" v-show="!index%2">
+                <div v-for="(item) in leaseName.slice(0,3)">{{ item.name }}</div>
+                <div v-if="leaseName.length > 3">...等共{{ leaseName.length }}处</div>
+              </div>
+            </transition-group>
+          </template>
+        </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>面积</div>
-            <div>{{ showLease.chengzufang }}</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>
@@ -36,53 +88,81 @@
 </template>
 
 <script>
-import SvgIcon from "@/components/SvgIcon"
-import Chart from "@/components/Charts"
+import SvgIcon from "@/components/SvgIcon";
 export default {
   components: {
-    SvgIcon
+    SvgIcon,
   },
-  data () {
+  data() {
     return {
+      isPause: false,
       showLease: {},
       timer: null,
       index: 0,
-    }
+    };
   },
-  mounted () {
+  mounted() {
+    this.showLease = this.leaseList[this.index % this.leaseList.length];
     this.timer = setInterval(() => {
-      this.showLease = this.leaseList[this.index%this.leaseList.length]
-      this.index++;
-    },5000)
-  },
-  beforeDestroy () {
-    clearInterval(this.timer)
+      if (!this.isPause) {
+        this.index++;
+        this.showLease = this.leaseList[this.index % this.leaseList.length];
+      }
+    }, 5000);
   },
-  methods: {
-
+  beforeDestroy() {
+    clearInterval(this.timer);
   },
+  methods: {},
   computed: {
-    leaseName () {
+    leaseName() {
+      let temp = this.index;
+      return [
+        ...(this.showLease?.land || []),
+        ...(this.showLease?.houses || []),
+      ];
+    },
+    areas() {
       let temp = this.index;
-      return [...this.showLease?.land || [],...this.showLease?.houses || []]
+      return [
+        ...(this.showLease?.land || []),
+        ...(this.showLease?.houses || []),
+      ].reduce(
+        (pre, cur) =>
+          pre +
+          (!isNaN(Number(cur.shijimianji || 0))
+            ? Number(cur.shijimianji || 0)
+            : 0),
+        0
+      );
     },
 
-    leaseList () {
-      return this.$store.state.bigdata.adventLeases || []
-    }
-  }
+    leaseList() {
+      return this.$store.state.bigdata.leases || [];
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
 #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 {
   display: flex;
   color: #fff;
   padding: 0 20px;
   align-items: center;
+  flex: 0;
+
   .text {
     padding: 0 8px;
   }
@@ -92,4 +172,56 @@ export default {
   height: 24px;
   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>
diff --git a/src/views/dataShow/tooltip.vue b/src/views/dataShow/tooltip.vue
index 900cf40..793c278 100644
--- a/src/views/dataShow/tooltip.vue
+++ b/src/views/dataShow/tooltip.vue
@@ -25,8 +25,36 @@ export default {
           title: "资产名称"
         },
         {
-          key: "dengjimianji",
-          title: "登记面积"
+          key: "shijimianji",
+          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">
 .table {
-  width: 350px;
+  width: 400px;
   border-radius: 20px;
 }
 
diff --git a/src/views/lease/component/addPay.vue b/src/views/lease/component/addPay.vue
index 07bcbf0..70170b6 100644
--- a/src/views/lease/component/addPay.vue
+++ b/src/views/lease/component/addPay.vue
@@ -134,6 +134,7 @@ export default {
 
     return (
       <el-drawer visible={this.dialogVisible}
+                 append-to-body={true}
                  title="租金收取"
                  size="64%"
                  on={{
diff --git a/src/views/lease/component/payList.vue b/src/views/lease/component/payList.vue
index e792d30..b62f475 100644
--- a/src/views/lease/component/payList.vue
+++ b/src/views/lease/component/payList.vue
@@ -1,6 +1,6 @@
 <template>
   <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;">
         <xy-table :action="index"
                   ref="xyTable"
diff --git a/src/views/lease/detailLease.vue b/src/views/lease/detailLease.vue
index 9091f47..fabd2b2 100644
--- a/src/views/lease/detailLease.vue
+++ b/src/views/lease/detailLease.vue
@@ -142,12 +142,32 @@ export default {
 
       logLeases: [],
       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',
-          label: '变更时间'
+          label: '变更时间',
+          width: 200
         },
         {
           prop: "show",
+          width: 90,
           label: "查看",
           customFn: row => (
             <div>
diff --git a/src/views/lease/detailPlan.vue b/src/views/lease/detailPlan.vue
index b528175..d7a8eea 100644
--- a/src/views/lease/detailPlan.vue
+++ b/src/views/lease/detailPlan.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 0 20px;">
     <el-page-header
       :content="$route.meta.title"
       style="
diff --git a/src/views/statics/assets.vue b/src/views/statics/assets.vue
index a429eef..7464680 100644
--- a/src/views/statics/assets.vue
+++ b/src/views/statics/assets.vue
@@ -9,15 +9,17 @@
         >
           <div slot="content"></div>
           <slot>
-            <DatePicker v-model="year" type="year" formatter="yyyy"></DatePicker>
+            <DatePicker style="padding-left: 20px;" v-model="year" type="year" formatter="yyyy"></DatePicker>
 
           </slot>
 
         </LxHeader>
       </div>
     </div>
-    <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>
+    <div style="padding: 0 20px;">
+      <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>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/statics/lease.vue b/src/views/statics/lease.vue
index b2fa715..a69e799 100644
--- a/src/views/statics/lease.vue
+++ b/src/views/statics/lease.vue
@@ -97,7 +97,6 @@ export default {
       daterange: "",
       select: {
         table_name: 'leases',
-        sort_name: 'land_id',
         page: 1,
         page_size: 999,
         filter: [
diff --git a/src/views/statics/safetyYear.vue b/src/views/statics/safetyYear.vue
index b5b1331..df6a1bc 100644
--- a/src/views/statics/safetyYear.vue
+++ b/src/views/statics/safetyYear.vue
@@ -9,14 +9,16 @@
         >
           <div slot="content"></div>
           <slot>
-            <DatePicker v-model="niandu" type="year" formatter="yyyy"></DatePicker>
+            <DatePicker style="padding-left: 20px;" v-model="niandu" type="year" formatter="yyyy"></DatePicker>
           </slot>
 
         </LxHeader>
       </div>
     </div>
-    <line-chart :niandu="niandu" width="100%" height="300px"></line-chart>
-    <bar-chart id="chart1" width="100%" height="300px" style="margin-top: 10px;"></bar-chart>
+    <div style="padding: 0 20px;">
+      <line-chart :niandu="niandu" width="100%" height="300px"></line-chart>
+      <bar-chart id="chart1" width="100%" height="300px" style="margin-top: 10px;"></bar-chart>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 7cca4e8..d6b7d34 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -437,7 +437,7 @@ export default {
       this.dialogFormVisible = true;
     },
     newDetail (row) {
-      this.prompt('新增详情菜单？','请输入组件路径').then(({ value }) => {
+      this.$prompt('新增详情菜单？','请输入组件路径').then(({ value }) => {
         let copyRow = deepCopy(row)
         delete copyRow.auth_node_tags_array;
         delete copyRow.children;