From 9832ec93e170c61246b859b8f6b71136e09e12e5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:48:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=95=E8=AF=95=E7=BF=B0=E6=9E=97?=
=?UTF-8?q?=E9=99=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 3 +-
src/js/store/index.js | 2 +
src/views/main-shuju/main-navbar.vue | 486 +++++++++++++++------------
src/views/main-shuju/main.vue | 286 ++++++++--------
4 files changed, 417 insertions(+), 360 deletions(-)
diff --git a/.env.development b/.env.development
index d1c8a3e7c..d38c11f03 100644
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,13 @@
NODE_ENV=development
-VUE_APP_API_SERVER = http://192.168.1.140/api
+# VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
+VUE_APP_API_SERVER = https://epmet-panshi.elinkservice.cn/api
# VUE_APP_NODE_ENV=dev_sdtdt
VUE_APP_NODE_ENV=dev
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 7ebb31e94..eb25c128e 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -45,6 +45,8 @@ export default new Vuex.Store({
fixed1920: {
height: document.documentElement.clientHeight,
},
+
+ fullscreen: false, //是否全屏状态
},
modules: {
user,
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 12346a8a6..aa2c272a3 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -1,86 +1,100 @@
-
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index e1026e6fd..06839ba0e 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,30 +1,33 @@
-
-
+
From 71346cbe8f913a8f1e929a1d7de3597fc3a29715 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:52:22 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9iframe=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/main-shuju/main-content.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index b9914005e..770032932 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -18,7 +18,7 @@
height="100%"
frameborder="0"
scrolling="yes"
- :style="{ height: $store.state.fixed1920.height - 100 + 'px' }"
+ :style="{ width: '1920px', height: $store.state.fixed1920.height+ 'px' }"
/>
From 683f7cb4ff2d00c38c83f10da331fdccf4ee00fb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 10 Apr 2023 13:56:53 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8A=8Aenv=E6=96=87=E4=BB=B6=E8=BF=98?=
=?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.env.development b/.env.development
index d38c11f03..ea43786c3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,13 +1,13 @@
NODE_ENV=development
-# VUE_APP_API_SERVER = http://192.168.1.140/api
+VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
-VUE_APP_API_SERVER = https://epmet-panshi.elinkservice.cn/api
+# VUE_APP_API_SERVER = https://epmet-panshi.elinkservice.cn/api
# VUE_APP_NODE_ENV=dev_sdtdt
VUE_APP_NODE_ENV=dev
From 5601e60c105d76b8f6d7c0d8f0b7f9fd568e2bcd Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Apr 2023 16:03:54 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E8=AE=B0=E5=BD=9508?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../communityService/fuwujilu/fuwuList08.vue | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 src/views/modules/communityService/fuwujilu/fuwuList08.vue
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList08.vue b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
new file mode 100644
index 000000000..e7db1167e
--- /dev/null
+++ b/src/views/modules/communityService/fuwujilu/fuwuList08.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
From ffb711a34dc7a16151bf71fc79a946cd2c623e46 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 19 Apr 2023 17:07:14 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2?=
=?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82=E4=B8=8B=E6=8B=89=E6=A1=86?=
=?UTF-8?q?=E4=BC=A0=E5=80=BC=E5=8D=95=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/components/resiSearch.vue | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 812de530f..3f964c6d3 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -211,6 +211,7 @@
clearable
size="small"
class="resi-cell-select"
+ @change="handelChangeCascader($event,n.columnName)"
>
@@ -512,6 +513,13 @@ export default {
this.$emit('search', arr3)
return arr3
},
+ handelChangeCascader(val,name){
+ if(val.length==1){
+ this.form[name] = val[0] || ''
+ }else{
+ this.form[name] = val[1] || ''
+ }
+ },
handleOpenSearch() {
this.openSearch = !this.openSearch
},