From 5841a771d4455d25adb185b8a0637c9ba498aab2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 21 十月 2025 15:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/.env | 4
admin/src/components/business/OperaJkCabinetWindow.vue | 42 +++++----
admin/src/api/business/jkCabinet.js | 5 +
admin/src/components/business/cabinetDetails.vue | 2
server/system_gateway/src/main/resources/bootstrap-test.yml | 3
admin/.env.production | 4
admin/package-lock.json | 160 ++++++++++++++++++++-------------------
admin/.env.development | 9 +
8 files changed, 124 insertions(+), 105 deletions(-)
diff --git a/admin/.env b/admin/.env
index 95e6320..fc2f445 100644
--- a/admin/.env
+++ b/admin/.env
@@ -4,10 +4,10 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/admin'
+VUE_APP_CONTEXT_PATH = '/whyc_admin'
# 鎺ュ彛鍓嶇紑
-VUE_APP_API_PREFIX = '/gateway_interface'
+VUE_APP_API_PREFIX = '/system_gateway'
# 椤圭洰鍚嶇О
VUE_APP_TITLE = '鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺'
diff --git a/admin/.env.development b/admin/.env.development
index 7ba1ab4..05e081e 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,10 +2,15 @@
NODE_ENV = 'development'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://localhost:10010'
+
+# VUE_APP_API_URL = 'http://192.168.1.45:10010'
+
+VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
+
+# VUE_APP_API_URL = 'http://localhost:10010'
+
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
-
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
diff --git a/admin/.env.production b/admin/.env.production
index 5a7a449..45c1f66 100644
--- a/admin/.env.production
+++ b/admin/.env.production
@@ -1,4 +1,6 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_API_URL = 'http://10.50.250.178:8088/gateway_interface'
+VUE_APP_API_URL = 'http://192.168.0.212/system_gateway'
+
+VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'
diff --git a/admin/package-lock.json b/admin/package-lock.json
index 161cec3..7bc4b6c 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -1891,63 +1891,6 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.4",
- "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
"ssri": {
"version": "8.0.1",
"resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1955,28 +1898,6 @@
"dev": true,
"requires": {
"minipass": "^3.1.1"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
- },
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
- "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
}
}
}
@@ -14212,6 +14133,87 @@
}
}
},
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"vue-property-decorator": {
"version": "8.5.1",
"resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz",
diff --git a/admin/src/api/business/jkCabinet.js b/admin/src/api/business/jkCabinet.js
index 2370a04..b55b758 100644
--- a/admin/src/api/business/jkCabinet.js
+++ b/admin/src/api/business/jkCabinet.js
@@ -50,6 +50,11 @@
return request.get(`/visitsAdmin/cloudService/business/jkCabinet/getCabinetConfig`)
}
+// 鏍规嵁ID鏌ヨ
+export function getInfoById (id) {
+ return request.get(`/visitsAdmin/cloudService/business/jkCabinet/${id}`)
+}
+
// 鎵归噺鍒犻櫎
export function deleteByIdInBatch (ids) {
return request.get('/visitsAdmin/cloudService/business/jkCabinet/delete/batch', {
diff --git a/admin/src/components/business/OperaJkCabinetWindow.vue b/admin/src/components/business/OperaJkCabinetWindow.vue
index fe508bb..4548467 100644
--- a/admin/src/components/business/OperaJkCabinetWindow.vue
+++ b/admin/src/components/business/OperaJkCabinetWindow.vue
@@ -32,7 +32,7 @@
v-for="item in memberList"
:key="item.id"
:label="item.name+'-'+item.companyName"
- :value="item.id">
+ :value="Number(item.id)">
</el-option>
</el-select>
</el-form-item>
@@ -60,16 +60,16 @@
v-for="item in memberList"
:key="item.id"
:label="item.name+'-'+item.companyName"
- :value="item.id">
+ :value="Number(item.id)">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鎵�鍦ㄤ綅缃�" prop="lacation">
<el-input v-model="form.lacation" placeholder="璇疯緭鍏ユ墍鍦ㄤ綅缃�" v-trim/>
</el-form-item>
- <el-form-item label="缁忕含搴�" prop="longitude">
+ <el-form-item label="缁忕含搴�" prop="jwd">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input v-model="form.longitude" placeholder="璇疯緭鍏ョ粡绾害" v-trim/>
+ <el-input v-model="form.jwd" placeholder="璇疯緭鍏ョ粡绾害" v-trim/>
<a style="margin-left: 20px; flex-shrink: 0;" href="https://lbs.amap.com/tools/picker" target="_blank">缁忕含搴﹀湪绾挎嬀鍙栧湴鍧�</a>
</div>
</el-form-item>
@@ -85,11 +85,11 @@
<h3 style="margin: 20px 0;">鏌滅粍淇℃伅</h3>
<el-form-item label="鎺掑垪" prop="rowNum">
<div style="width: 100%; display: flex; align-items: center;">
- <el-input v-model="form.rowNum" :disabled="form.id" type="number" placeholder="璇疯緭鍏ユ帓鏁�" v-trim>
+ <el-input v-model="form.rowNum" :disabled="form.id ? true : false" type="number" placeholder="璇疯緭鍏ユ帓鏁�" v-trim>
<template slot="append">鎺�</template>
</el-input>
<span style="margin: 0 20px;">x</span>
- <el-input v-model="form.columnNum" :disabled="form.id" type="number" placeholder="璇疯緭鍏ュ垪鏁�" v-trim>
+ <el-input v-model="form.columnNum" :disabled="form.id ? true : false" type="number" placeholder="璇疯緭鍏ュ垪鏁�" v-trim>
<template slot="append">鍒�</template>
</el-input>
</div>
@@ -110,7 +110,7 @@
</div>
</el-form-item>
<el-form-item label="鎺掑垪椤哄簭" prop="sortType" v-if="form.noType === 1">
- <el-radio-group v-model="form.sortType" :disabled="form.id">
+ <el-radio-group v-model="form.sortType" :disabled="form.id ? true : false">
<el-radio :label="0">浠庡乏寰�鍙�</el-radio>
<el-radio :label="1">浠庝笂鍚戜笅</el-radio>
</el-radio-group>
@@ -123,6 +123,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/member'
+import { getInfoById } from '@/api/business/jkCabinet'
export default {
name: 'OperaJkCabinetWindow',
extends: BaseOpera,
@@ -145,8 +146,7 @@
authMemberIdList: '',
rowNum: '',
columnNum: '',
- lacation: '',
- longitude: '',
+ jwd: '',
latitude: '',
noType: 0,
noPrefix: '',
@@ -203,21 +203,25 @@
open (title, target) {
this.title = title
this.loadMember()
- this.visible = true
- // 鏂板缓
- if (target == null) {
+ if (target) {
+ getInfoById(target.id)
+ .then(res => {
+ res.managerIdList = res.managerIdList.map(item => Number(item))
+ res.authMemberIdList = res.authMemberIdList.map(item => Number(item))
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = res[key]
+ }
+ this.visible = true
+ })
+ })
+ } else {
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
- return
+ this.visible = true
}
- // 缂栬緫
- this.$nextTick(() => {
- for (const key in this.form) {
- this.form[key] = target[key]
- }
- })
},
loadMember () {
allList({
diff --git a/admin/src/components/business/cabinetDetails.vue b/admin/src/components/business/cabinetDetails.vue
index f08a6ba..d2c5248 100644
--- a/admin/src/components/business/cabinetDetails.vue
+++ b/admin/src/components/business/cabinetDetails.vue
@@ -48,7 +48,7 @@
:key="item.id"
:label="item.code"
:value="item.id"
- :disabled="item.isBinding === 1">
+ :disabled="item.status !== 0">
</el-option>
</el-select>
</template>
diff --git a/server/system_gateway/src/main/resources/bootstrap-test.yml b/server/system_gateway/src/main/resources/bootstrap-test.yml
index bb5fa47..34f9986 100644
--- a/server/system_gateway/src/main/resources/bootstrap-test.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-test.yml
@@ -6,8 +6,8 @@
password: nacos
discovery:
server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # namespace: dmvisit
namespace: wuhu_visit_test
-# namespace: dev_renkang
username: nacos
password: nacos
gateway:
@@ -53,6 +53,7 @@
knife4j:
+
# 鑱氬悎swagger鏂囨。
gateway:
# 绗竴涓厤缃紝寮�鍚痝ateway鑱氬悎缁勪欢
--
Gitblit v1.9.3