From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
platform_web/.env.development | 12 +++++++++---
platform_web/src/views/business/clientManger.vue | 21 ++++++++++++---------
web_standard/.env.lingyang | 2 +-
platform_web/.env.lingyang | 2 +-
minipro_standard/util/request/index.js | 1 -
platform_web/src/components/common/CommonHeader.vue | 5 +++--
platform_web/src/views/login.vue | 7 ++++---
minipro_standard/common/config.js | 2 +-
8 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
index c1b5459..f20be30 100644
--- a/minipro_standard/common/config.js
+++ b/minipro_standard/common/config.js
@@ -2,7 +2,7 @@
// baseUrl: 'http://106.14.20.42/test_hfznzz/',
// baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
// baseUrl: 'http://192.168.0.18:10021',
- baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+ baseUrl: 'https://www.mes.red/doumeeplant',
phoneRegular: /^1[3456789]\d{9}$/,
mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
positiveInteger: /^[0-9]*[1-9][0-9]*$/,
diff --git a/minipro_standard/util/request/index.js b/minipro_standard/util/request/index.js
index 7bf64c8..4410eb2 100644
--- a/minipro_standard/util/request/index.js
+++ b/minipro_standard/util/request/index.js
@@ -1,6 +1,5 @@
// 寮曞叆閰嶇疆
import { baseUrl } from '@/common/config'
-console.log(baseUrl);
// 鍒濆鍖栬姹傞厤缃�
uni.$u.http.setConfig((defaultConfig) => {
/* defaultConfig 涓洪粯璁ゅ叏灞�閰嶇疆 */
diff --git a/platform_web/.env.development b/platform_web/.env.development
index 46d9e64..f452be4 100644
--- a/platform_web/.env.development
+++ b/platform_web/.env.development
@@ -16,11 +16,17 @@
#姹熻悕鏈湴
-VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
+# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
#鐒︽澗
#VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
#鍒樼纾婃湰鍦�
-VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
-# VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
\ No newline at end of file
+# VUE_APP_BASE_URL = 'http://192.168.0.18:10021/'
+VUE_APP_BASE_URL = 'https://dmtest.ahapp.net/doumeeplant_api/'
+
+# # 鎺ュ彛鍓嶇紑
+# VUE_APP_API_PREFIX = '/doumeeplant/'
+
+# #姝ｅ紡鐜
+VUE_APP_BASE_URL = 'https://lingyang.mes.show:1801/doumeeplant/'
\ No newline at end of file
diff --git a/platform_web/.env.lingyang b/platform_web/.env.lingyang
index 14e332c..fce2351 100644
--- a/platform_web/.env.lingyang
+++ b/platform_web/.env.lingyang
@@ -14,4 +14,4 @@
VUE_APP_API_PREFIX = '/doumeeplant/'
#姝ｅ紡鐜
-VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
+VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'
diff --git a/platform_web/src/components/common/CommonHeader.vue b/platform_web/src/components/common/CommonHeader.vue
index 647b628..37f8e15 100644
--- a/platform_web/src/components/common/CommonHeader.vue
+++ b/platform_web/src/components/common/CommonHeader.vue
@@ -149,10 +149,11 @@
logout()
.then(() => {
this.setUserInfo(null)
- this.$router.push({ name: 'login' })
+ // this.$router.push({ path: '/login' })
+ window.location.reload()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ this.$tips.apiFailed(e)
})
}
}
diff --git a/platform_web/src/views/business/clientManger.vue b/platform_web/src/views/business/clientManger.vue
index 4c2d44c..8543327 100644
--- a/platform_web/src/views/business/clientManger.vue
+++ b/platform_web/src/views/business/clientManger.vue
@@ -1,6 +1,6 @@
<template>
<!-- :permissions="['business:appliancechange:query']" -->
- <TableLayout>
+ <TableLayout :permissions="['ext:companyext:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" label-suffix="锛�" inline>
<el-form-item label="瀹㈡埛鍚嶇О" prop="name">
@@ -26,11 +26,11 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <!-- v-permissions="['ext:workorderrecordext:exportExcel']" -->
- <li><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '鏂板瀹㈡埛')">鏂板</el-button></li>
+ <!-- -->
+ <li v-permissions="['ext:companyext:create']"><el-button type="primary" @click="$refs.operaClientMangerWindow.open(bull, '鏂板瀹㈡埛')">鏂板</el-button></li>
<!-- <li><el-button type="primary" @click="exportExcel">璋冩暣鏈夋晥鏈�</el-button></li> -->
<li><el-button type="primary" @click="resetUserPwd">閲嶇疆涓昏处鍙峰瘑鐮�</el-button></li>
- <li><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
+ <li v-permissions="['ext:companyext:delete']"><el-button style="color: red" :loading="isWorking.delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>
</ul>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe border
@selection-change="handleSelectionChange">
@@ -65,13 +65,16 @@
:inactive-value="0" @change="statusChange(row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" min-width="220px" fixed="right">
+ <el-table-column
+ v-if="containPermissions(['ext:companyext:update', 'ext:companyext:delete'])"
+
+ label="鎿嶄綔" align="center" min-width="220px" fixed="right">
<template slot-scope="{ row }">
<!-- <el-button type="text" @click="$refs.operaClientMangerWindow.open('缂栬緫瀹㈡埛', row)">缂栬緫</el-button> -->
- <el-button type="text" @click="showDetail(row, true)">缂栬緫</el-button>
- <el-button type="text" @click="$refs.operaClientValidDateWindow.open('璋冩暣', row)">璋冩暣</el-button>
- <el-button type="text" @click="$refs.operaDDSettingWindow.open('閽夐拤閰嶇疆', row)">閽夐拤閰嶇疆</el-button>
- <el-button type="text" style="color:red" :loading="isWorking.delete"
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="showDetail(row, true)">缂栬緫</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaClientValidDateWindow.open('璋冩暣', row)">璋冩暣</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:update']" @click="$refs.operaDDSettingWindow.open('閽夐拤閰嶇疆', row)">閽夐拤閰嶇疆</el-button>
+ <el-button type="text" v-permissions="['ext:companyext:delete']" style="color:red" :loading="isWorking.delete"
@click="deleteById(row, false)">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/platform_web/src/views/login.vue b/platform_web/src/views/login.vue
index 596213f..3729f58 100644
--- a/platform_web/src/views/login.vue
+++ b/platform_web/src/views/login.vue
@@ -46,7 +46,6 @@
loading: false,
username: '',
password: '',
- companyId: 8,
// 楠岃瘉鐮�
captcha: {
loading: false,
@@ -78,11 +77,13 @@
username: this.username.trim(),
password: this.password,
code: this.captcha.value.trim(),
- companyId: this.companyId,
uuid: this.captcha.uuid
})
.then(() => {
- window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ // console.log(process.env.VUE_APP_CONTEXT_PATH);
+ // b7121c39-e109-472f-bb89-722b91289437
+ // window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ window.location.reload()
})
.catch(e => {
this.refreshCaptcha()
diff --git a/web_standard/.env.lingyang b/web_standard/.env.lingyang
index 51b6755..3243928 100644
--- a/web_standard/.env.lingyang
+++ b/web_standard/.env.lingyang
@@ -13,4 +13,4 @@
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/doumeeplant/'
-VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
+VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'
--
Gitblit v1.9.3