From 445d286e4b6fe040e49d4bd28b08b7a46958af9f Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Mon, 25 Nov 2024 17:31:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- .env.prostaging | 4 +- src/layout/components/Navbar.vue | 6 +- src/store/modules/bigdata.js | 10 +- src/views/assets/land.vue | 13 +- src/views/component/map.vue | 208 +++++++------------------------ src/views/dataShow/map.vue | 75 ++++++++++- src/views/dataShow/right3.vue | 10 +- src/views/lease/sign.vue | 4 + src/views/login/index.vue | 1 + 10 files changed, 156 insertions(+), 179 deletions(-) diff --git a/.env.production b/.env.production index 84f92f3..66a79e4 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API=http://192.168.1.31:9001/ -VUE_APP_UPLOAD_API=http://192.168.1.31:9001/api/admin/upload-file +VUE_APP_BASE_API='' +VUE_APP_UPLOAD_API=/api/admin/upload-file VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview diff --git a/.env.prostaging b/.env.prostaging index 7a58b6b..99c98d1 100644 --- a/.env.prostaging +++ b/.env.prostaging @@ -8,6 +8,6 @@ ENV = 'prostaging' #VUE_APP_UPLOAD_API=http://wuxiwuye.ali251.langye.net/api/admin/upload-file #VUE_APP_PREVIEW=//view.langye.net:8012/onlinePreview # base api -VUE_APP_BASE_API=http://192.168.221.31:9001/ -VUE_APP_UPLOAD_API=http://192.168.221.31:9001/api/admin/upload-file +VUE_APP_BASE_API='' +VUE_APP_UPLOAD_API=/api/admin/upload-file VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 9f226eb..5907a41 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -14,9 +14,9 @@
- - - + + +
{{ $store.state.user.name }} diff --git a/src/store/modules/bigdata.js b/src/store/modules/bigdata.js index 400d8e3..c029a32 100644 --- a/src/store/modules/bigdata.js +++ b/src/store/modules/bigdata.js @@ -8,10 +8,14 @@ const state = { safetyPlan: [], adventSafetyPlan: [], type: 1, + is_auth: 1, } let config = {} const mutations = { + SET_AUTH: (state, auth) => { + state.is_auth = auth + }, SET_ASSETS: (state, assets) => { state.assets = assets }, @@ -49,7 +53,8 @@ const actions = { op: "neq", value: 1 } - ] + ], + is_auth: state.is_auth },false), index({ table_name: "lands", @@ -61,7 +66,8 @@ const actions = { op: "neq", value: 1 } - ] + ], + is_auth: state.is_auth }) ]).then(res => { const [houses,lands] = res; diff --git a/src/views/assets/land.vue b/src/views/assets/land.vue index 45394db..8142fb2 100644 --- a/src/views/assets/land.vue +++ b/src/views/assets/land.vue @@ -248,7 +248,7 @@ ref="xyTable" :border="true" :action="index" - :req-opt="select" + :req-opt="formatSelect" :destroy-req-opt="select" :table-item="table" :btn-to-more="true" @@ -357,6 +357,7 @@ import imports from "@/views/component/imports.vue"; import atlas from "@/views/assets/atlas.vue"; import files from "@/views/assets/files.vue"; import handle from "@/views/assets/component/addHandle.vue"; +import { deepCopy } from '@/utils' // import assetsHistoryList from '@/views/assets/assetsHistoryList.vue' export default { name: 'tableList', @@ -858,6 +859,16 @@ export default { }, computed: { + formatSelect() { + let copySelect = deepCopy(this.select) + copySelect.filter = copySelect.filter.filter(i => i.key) + copySelect.filter.push({ + key: 'shifouchengzuzichan', + op: 'eq', + value: '' + }) + return copySelect + }, columnArrTest() { return function (field) { return this.form.find((i) => i.field === field) diff --git a/src/views/component/map.vue b/src/views/component/map.vue index f1f3bdb..c624356 100644 --- a/src/views/component/map.vue +++ b/src/views/component/map.vue @@ -17,10 +17,6 @@

租赁面积

{{ leaseAreaTotal.toFixed(2) }} 平方

- - - - @@ -32,59 +28,28 @@ size="mini" placeholder="请选择区域" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 资产权属 + + + + 查询 @@ -103,33 +68,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -

总共 {{total}} 条

@@ -151,16 +89,6 @@ - - - - - - - - - -
@@ -168,68 +96,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -243,12 +109,6 @@ {{ shiyongzhuangtai }} - - - - - -

+
+
+
全集团
+ +
+
+
本部
+ +
+
+
@@ -65,7 +76,10 @@ export default { } }, methods: { - + authChange (e) { + this.$store.commit('bigdata/SET_AUTH', e.target.value) + this.$store.dispatch('bigdata/getAssets') + }, initMap () { echarts.registerMap("wuxi", WUXI); this.chart = echarts.init(document.querySelector("#map")) @@ -234,4 +248,63 @@ export default { top: 0; left: 0; } +.switch-btn { + position: absolute; + top: 10px; + left: 10px; + display: flex; + align-items: center; + border-radius: 40px; + border: 2px solid #73f3df; + + &__item { + cursor: pointer; + z-index: 2; + color: #73f3df; + position: relative; + font-size: 20px; + letter-spacing: 1px; + text-align: center; + font-weight: bold; + width: 160px; + height: 60px; + line-height: 60px; + transition: all 0.2s; + + &:has(input[type=radio]:checked) { + color: #fff; + } + & > input { + cursor: pointer; + opacity: 0; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + } + } + &__bkg { + cursor: pointer; + z-index: 1; + position: absolute; + left: 0; + top: 0; + height: 100%; + width: 50%; + border-radius: 40px; + background: #4fa497; + transition: all .2s; + } + &:has(.switch-btn__item:nth-child(1) input[type=radio]:checked) { + .switch-btn__bkg { + left: 0; + } + } + &:has(.switch-btn__item:nth-child(2) input[type=radio]:checked) { + .switch-btn__bkg { + left: 50%; + } + } +} diff --git a/src/views/dataShow/right3.vue b/src/views/dataShow/right3.vue index 6e0a9f8..6ab8b76 100644 --- a/src/views/dataShow/right3.vue +++ b/src/views/dataShow/right3.vue @@ -55,13 +55,13 @@
承租方
-
{{ showLease.chengzufang }}
+
{{ showLease ? showLease.chengzufang : '' }}
租赁期限
- {{ showLease.zulinkaishiqixian }} ~ {{ - showLease.zulinjieshuqixian + {{ showLease ? showLease.zulinkaishiqixian : '' }} ~ {{ + showLease ? showLease.zulinjieshuqixian : '' }}
@@ -130,8 +130,8 @@ export default { ].reduce( (pre, cur) => pre + - (!isNaN(Number(cur.shijimianji || 0)) - ? Number(cur.shijimianji || 0) + (!isNaN(Number(cur?.shijimianji || 0)) + ? Number(cur?.shijimianji || 0) : 0), 0 ); diff --git a/src/views/lease/sign.vue b/src/views/lease/sign.vue index 0d76ead..4e381d9 100644 --- a/src/views/lease/sign.vue +++ b/src/views/lease/sign.vue @@ -1098,6 +1098,7 @@ export default { shijimianji: row.shijimianji, _chuzumianji: 0, _relation_id: "", + ORIGINAL_DATA: row, }); } else { let index = this.nowAssets.findIndex( @@ -1306,6 +1307,7 @@ export default { _chuzumianji: 0, _relation_id: "", land_id: row.land_id, + ORIGINAL_DATA: row, }); } else { let index = this.nowAssets.findIndex( @@ -1691,6 +1693,7 @@ export default { zichanweizhi: land.zichanweizhi, shijimianji: land.shijimianji, _chuzumianji: item.chuzumianji || 0, + ORIGINAL_DATA: land, _relation_id: item.id, }); } @@ -1705,6 +1708,7 @@ export default { shijimianji: house.shijimianji, _chuzumianji: item.chuzumianji || 0, _relation_id: item.id, + ORIGINAL_DATA: house, land_id: house.land_id, }); } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ad82dcb..e39361b 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -231,6 +231,7 @@ export default { try { await sendSms({ username: this.loginForm.username, + password: this.loginForm.password }); this.isVer = true; this.verTime = 60;