From 6cf36f0e43c9add691b9a375526ce7dc26209574 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 14:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/index.vue | 8 ++++----
admin/src/views/business/relativeMember.vue | 6 +++---
admin/.env.development | 7 +++----
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index b8b3e35..49eed4e 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -3,14 +3,13 @@
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-VUE_APP_API_URL = 'http://192.168.1.45: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://192.168.0.7/system_gateway'
-# VUE_APP_API_URL = 'http://localhost:10010'
+VUE_APP_API_URL = 'http://localhost:10010'
# VUE_APP_API_URL = 'https://atwl.ahzyssl.com/zhyq_interface'
-# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
#key锛�045542fc5f436b75e6c911c5c84ff8cd
#瀵嗛挜锛�8bd38497f9aee2b75e7a888a4dfd1e6c
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 83a2d66..505f171 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -76,9 +76,9 @@
v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('浜哄憳瀵煎叆', searchForm.companyType)"
icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
- <li><el-button type="primary"
- @click="$refs.OperaTrainTimeImportWindow.open('鍩硅鏈夋晥鏈熷鍏�', department, searchForm.companyType)"
- icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>
+<!-- <li><el-button type="primary"-->
+<!-- @click="$refs.OperaTrainTimeImportWindow.open('鍩硅鏈夋晥鏈熷鍏�', department, searchForm.companyType)"-->
+<!-- icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>-->
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
<li><el-button type="primary" v-permissions="['business:empower:create']"
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 65464e5..781ee02 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -244,11 +244,11 @@
warningTotal: 0,
funcList: [
{ name: '璁垮鎶ュ', path: '', url: require('@/assets/icons/home_func1.png'), path: '/business/reportRecord' },
- { name: '闅愭偅闅忔墜鎷�', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
- { name: '棰勭害浼氳瀹�', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
+ // { name: '闅愭偅闅忔墜鎷�', path: '', url: require('@/assets/icons/home_func2.png'), path: '/operation/danger/record' },
+ // { name: '棰勭害浼氳瀹�', path: '', url: require('@/assets/icons/home_func3.png'), path: '/meeting/bookings' },
{ name: '鍏姟杞﹂绾�', path: '', url: require('@/assets/icons/home_func5.png'), path: '/operation/serviceCar/apprRecord' },
- { name: '鑰冨嫟宸ヤ綔鍙�', path: '', url: require('@/assets/icons/home_func4.png') },
- { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
+ // { name: '鑰冨嫟宸ヤ綔鍙�', path: '', url: require('@/assets/icons/home_func4.png') },
+ // { name: '椋熷爞娑堣垂', path: '', url: require('@/assets/icons/8.png') }
],
isShowDetail: false,
isShowReport: false,
--
Gitblit v1.9.3