From 32a70ae605a9733301d68aa650ebc2c3446bd18d Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 27 Sep 2024 18:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/detail.vue | 61 ++++++++++++++++++++++++++++---------
 src/views/dataShow/map.vue  |  2 +-
 src/views/system/user.vue   |  5 ---
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/views/assets/detail.vue b/src/views/assets/detail.vue
index cce3efe..815c55f 100644
--- a/src/views/assets/detail.vue
+++ b/src/views/assets/detail.vue
@@ -205,10 +205,12 @@
           <div class="el-descriptions__header el-descriptions__title">
             <p>资产地图</p>
 
-            <div @click="copyLocation" style="cursor: pointer">
+            <div @click="copyLocation" style="cursor: pointer;margin-left: auto;margin-right: 20px;">
               <i class="el-icon-map-location" style="font-weight: 600;margin-right: 4px;"></i>
               <span>{{ detail.zichanweizhi }}</span>
             </div>
+
+            <i class="el-icon-full-screen" style="cursor: pointer;font-weight: 600;" @click="assetsMapFullscreen"></i>
           </div>
 
           <div
@@ -732,19 +734,6 @@ export default {
             )
           }
         },
-        {
-          label: '合同交租期限',
-          width: 190,
-          customFn:row => {
-            return (
-              <div>
-                <span>{ this.$moment(new Date(row.hetongjiaozukaishishijian)).format('YYYY.MM.DD') }</span>
-                <span> - </span>
-                <span>{ this.$moment(new Date(row.hetongjiaozujieshushijian)).format('YYYY.MM.DD') }</span>
-              </div>
-            )
-          }
-        },
         {
           label: '年租金单价',
           prop: 'nianzujindanjia',
@@ -853,6 +842,25 @@ export default {
     };
   },
   methods: {
+    assetsMapFullscreen () {
+      const dom = document.querySelector('#detail-map')
+      this.$store.dispatch('app/toggleDevice',"mobile")
+      this.$store.commit('app/CLOSE_SIDEBAR')
+
+      dom.classList.add('dom-fullscreen')
+
+      const closeDom = document.createElement('div')
+      closeDom.classList.add('dom-fullscreen-close')
+      closeDom.innerHTML = '<i class="el-icon-circle-close"></i>'
+      document.body.append(closeDom)
+      closeDom.addEventListener('click',() => {
+        dom.classList.remove('dom-fullscreen')
+        closeDom.remove()
+        this.$store.dispatch('app/toggleDevice',"desktop")
+        this.$store.commit('app/TOGGLE_SIDEBAR')
+      })
+    },
+
     anchorSelect (href) {
       const cubic = value => Math.pow(value, 3);
       const easeInOutCubic = value => value < 0.5
@@ -1369,4 +1377,29 @@ a:hover {
     filter: drop-shadow(2px 2px 5px #00000055);
   }
 }
+
+.dom-fullscreen {
+  position: fixed !important;
+  z-index: 99999999 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  top: 0 !important;
+  left: 0 !important;
+  transition: all .2s;
+}
+.dom-fullscreen-close {
+  position: fixed !important;
+  z-index: 999999999 !important;
+  top: 50px !important;
+  right: 50px !important;
+  background: #fff;
+  width: 50px;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 100%;
+  transition: all .2s;
+  font-size: 50px;
+}
 </style>
diff --git a/src/views/dataShow/map.vue b/src/views/dataShow/map.vue
index 5e726d3..7b0c4bc 100644
--- a/src/views/dataShow/map.vue
+++ b/src/views/dataShow/map.vue
@@ -109,7 +109,7 @@ export default {
           // },
           label: {
             // 标签的相关设置
-            show: false, // (地图上的城市名称)是否显示标签 [ default: false ]
+            show: true, // (地图上的城市名称)是否显示标签 [ default: false ]
             // distance: 50,               // 标签距离图形的距离，在三维的散点图中这个距离是屏幕空间的像素值，其它图中这个距离是相对的三维距离
             // formatter:,               // 标签内容格式器
             textStyle: {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 5b58d1e..f91e3a5 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -134,11 +134,6 @@
               trigger: 'blur'
             }
           ],
-          password: [{
-            required: true,
-            message: '请输入密码',
-            trigger: 'blur',
-          }],
           mobile: [{
             required: true,
             message: '请输入手机号',