From 6629a283cbcc12494e12b57b8c67fcc2b7ac0855 Mon Sep 17 00:00:00 2001 From: jsy_zjg <31502350@qq.com> Date: Tue, 14 Jan 2025 10:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=83=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +- pages/head/index.vue | 16 +- pages/work/land/index.vue | 2 +- pages/work/user/device.vue | 528 ++++++++++++++++++++----------------- 4 files changed, 308 insertions(+), 248 deletions(-) diff --git a/.env.development b/.env.development index bfeb333..c11ac1e 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,13 @@ VITE_ENV = 'development' # dev prod stage -VITE_APP_BASE_API = '/dev-api' -VITE_APP_BASE_IP = 'localhost' -VITE_APP_BASE_PORT = 3006 +#VITE_APP_BASE_API = '/dev-api' +#VITE_APP_BASE_IP = 'localhost' +#VITE_APP_BASE_PORT = 3006 + +VITE_APP_BASE_API = '/stage-api' +VITE_APP_BASE_IP = '39.105.121.219' +VITE_APP_BASE_PORT = 80 # Mqtt VITE_BASE_MQTT = '39.105.121.219:8083/mqtt' diff --git a/pages/head/index.vue b/pages/head/index.vue index 471980c..91f67cf 100644 --- a/pages/head/index.vue +++ b/pages/head/index.vue @@ -8,11 +8,11 @@ - + - 塔尕尔其乡5村1组-A地-(4G) + {{landName}} @@ -73,6 +72,7 @@ title: "", isFirst: true, user: store.state.user.user, + landName:null, query: { landId: null, landName: null @@ -81,6 +81,7 @@ }, onShow(){ if(this.ijs.land){ + this.landName = this.ijs.land.landName; this.query.landId = this.ijs.land.id; this.queryList(); } @@ -89,6 +90,7 @@ queryList() { if (this.query.landId) { getHeadDeviceList(this.query.landId).then(res => { + console.log(res) this.$refs.paging.complete(res.data) }); } diff --git a/pages/work/land/index.vue b/pages/work/land/index.vue index e0b9e4a..1ac1893 100644 --- a/pages/work/land/index.vue +++ b/pages/work/land/index.vue @@ -52,7 +52,7 @@ - + diff --git a/pages/work/user/device.vue b/pages/work/user/device.vue index 6516ae6..adb594b 100644 --- a/pages/work/user/device.vue +++ b/pages/work/user/device.vue @@ -1,246 +1,300 @@ + + + + .index-container { + background-color: #f6f3f3; + height: 100%; + + .search { + background-color: white; + padding: 10px; + } + + .title { + height: 50px; + display: flex; + padding: 15px 15px; + background: white; + align-items: center; + + text { + font-size: 14px; + margin-right: 10px; + } + } + + .button { + padding: 10px 20px; + display: flex; + background: white; + } + + .item-container { + margin-top: 10px; + background-color: white; + padding-bottom: 10px; + } + + .flex-text { + display: flex; + align-items: center; + font-size: 16px; + + .flex-text-one { + color: #939393; + font-weight: bold; + } + } + + .checkBox { + margin: 10px 0px 0px 0px; + display: flex; + justify-content: space-around; + } + } + + .tips { + padding: 10px; + line-height: 20px; + font-size: 14px; + color: gray; + background-color: #fff; + border-top: 1px solid #eee; + } + + ::v-deep.zp-paging-container { + background: #f3f3f3 !important; + } + \ No newline at end of file