Commit 923f20ff authored by tianhongyang's avatar tianhongyang

2023/11/24

parent 4df06171
...@@ -14,3 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true ...@@ -14,3 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 子系统地址 # 子系统地址
# VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com" # VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.104:3400" VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.104:3400"
# Bi大屏系统地址
VUE_APP_BI_SYSTEM_ADDRESS = "http://192.168.60.104:8001"
\ No newline at end of file
...@@ -9,3 +9,5 @@ VUE_APP_BASE_API = 'https://szhapi.jiansheku.com' ...@@ -9,3 +9,5 @@ VUE_APP_BASE_API = 'https://szhapi.jiansheku.com'
# 子系统地址 # 子系统地址
VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com" VUE_APP_SUB_SYSTEM_ADDRESS = "https://plug.jiansheku.com"
VUE_APP_BI_SYSTEM_ADDRESS = "http://192.168.60.104:8001"
...@@ -13,3 +13,5 @@ VUE_APP_BASE_API = '/prod-api' ...@@ -13,3 +13,5 @@ VUE_APP_BASE_API = '/prod-api'
# 子系统地址 # 子系统地址
VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com" VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
VUE_APP_BI_SYSTEM_ADDRESS = "http://192.168.60.104:8001"
\ No newline at end of file
import request from '@/utils/request' import request from '@/utils/request';
// 查询参数列表 // 查询参数列表
export function listConfig(query) { export function listConfig(query) {
...@@ -6,7 +6,7 @@ export function listConfig(query) { ...@@ -6,7 +6,7 @@ export function listConfig(query) {
url: '/system/config/list', url: '/system/config/list',
method: 'get', method: 'get',
params: query params: query
}) });
} }
// 查询参数详细 // 查询参数详细
...@@ -14,7 +14,7 @@ export function getConfig(configId) { ...@@ -14,7 +14,7 @@ export function getConfig(configId) {
return request({ return request({
url: '/system/config/' + configId, url: '/system/config/' + configId,
method: 'get' method: 'get'
}) });
} }
// 根据参数键名查询参数值 // 根据参数键名查询参数值
...@@ -22,7 +22,7 @@ export function getConfigKey(configKey) { ...@@ -22,7 +22,7 @@ export function getConfigKey(configKey) {
return request({ return request({
url: '/system/config/configKey/' + configKey, url: '/system/config/configKey/' + configKey,
method: 'get' method: 'get'
}) });
} }
// 新增参数配置 // 新增参数配置
...@@ -31,7 +31,7 @@ export function addConfig(data) { ...@@ -31,7 +31,7 @@ export function addConfig(data) {
url: '/system/config', url: '/system/config',
method: 'post', method: 'post',
data: data data: data
}) });
} }
// 修改参数配置 // 修改参数配置
...@@ -40,9 +40,23 @@ export function updateConfig(data) { ...@@ -40,9 +40,23 @@ export function updateConfig(data) {
url: '/system/config', url: '/system/config',
method: 'put', method: 'put',
data: data data: data
}) });
} }
// 新增租户参数配置
export const addTenantConfig = (data) => request({
url: "/system/config/tenant/add",
method: "post",
data
});
// 修改租户参数配置
export const updateTenantConfig = (data) => request({
url: "/system/config/tenant/add",
method: "put",
data
});
// 修改参数配置 // 修改参数配置
export function updateConfigByKey(key, value) { export function updateConfigByKey(key, value) {
return request({ return request({
...@@ -52,7 +66,7 @@ export function updateConfigByKey(key, value) { ...@@ -52,7 +66,7 @@ export function updateConfigByKey(key, value) {
configKey: key, configKey: key,
configValue: value configValue: value
} }
}) });
} }
// 删除参数配置 // 删除参数配置
...@@ -60,7 +74,7 @@ export function delConfig(configId) { ...@@ -60,7 +74,7 @@ export function delConfig(configId) {
return request({ return request({
url: '/system/config/' + configId, url: '/system/config/' + configId,
method: 'delete' method: 'delete'
}) });
} }
// 刷新参数缓存 // 刷新参数缓存
...@@ -68,6 +82,6 @@ export function refreshCache() { ...@@ -68,6 +82,6 @@ export function refreshCache() {
return request({ return request({
url: '/system/config/refreshCache', url: '/system/config/refreshCache',
method: 'delete' method: 'delete'
}) });
} }
import Cookies from 'js-cookie' import Cookies from 'js-cookie';
const TokenKey = 'Admin-Token' const TokenKey = 'Admin-Token';
const Tenantid = 'Tenantid' const Tenantid = 'Tenantid';
export function getToken() { export function getToken() {
return Cookies.get(TokenKey) return Cookies.get(TokenKey);
} }
export function getTenantid() { export function getTenantid() {
return Cookies.get(Tenantid) return Cookies.get(Tenantid);
} }
export function setToken(token) { export function setToken(token) {
return Cookies.set(TokenKey, token) return Cookies.set(TokenKey, token);
} }
export function setTenantid(id) { export function setTenantid(id) {
return Cookies.set(Tenantid, id) return Cookies.set(Tenantid, id);
} }
export function removeToken() { export function removeToken() {
return Cookies.remove(TokenKey) return Cookies.remove(TokenKey);
} }
export function removeTenantid() { export function removeTenantid() {
return Cookies.remove(Tenantid) return Cookies.remove(Tenantid);
}
export function setBiAuth(token) {
if (!token) return false;
sessionStorage.setItem("DSK_SYSTEM_AUTH_TOKEN", token);
return true;
} }
<script>
import { getToken } from "@/utils/auth";
export default {
name: "bi",
data() {
return {
};
},
//可访问data属性
created() {
},
//计算集
computed: {
},
//方法集
methods: {
async closeOuterTab() {
await this.$nextTick();
this.$tab.closePage();
}
},
render(h) {
const token = getToken();
if (!token) {
this.$message.warning("获取auth令牌失败");
this.closeOuterTab();
return;
}
window.open(`${process.env.VUE_APP_BI_SYSTEM_ADDRESS}?DSK_SYSTEM_AUTH_TOKEN=${token}`, "DSK_BI_SYSTEM");
this.closeOuterTab();
},
}
</script>
<style lang="scss" scoped>
</style>
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户称" prop="nickName"> <el-form-item label="用户称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户称" maxlength="30" /> <el-input v-model="form.nickName" placeholder="请输入用户称" maxlength="30" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="用户称"> label="用户称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="phonenumber" prop="phonenumber"
...@@ -477,7 +477,7 @@ export default { ...@@ -477,7 +477,7 @@ export default {
columns: [ columns: [
{ key: 0, label: `用户编号`, visible: true }, { key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true }, { key: 1, label: `用户名称`, visible: true },
{ key: 2, label: `用户称`, visible: true }, { key: 2, label: `用户称`, visible: true },
{ key: 3, label: `组织`, visible: true }, { key: 3, label: `组织`, visible: true },
{ key: 4, label: `手机号码`, visible: true }, { key: 4, label: `手机号码`, visible: true },
{ key: 5, label: `状态`, visible: true }, { key: 5, label: `状态`, visible: true },
...@@ -486,7 +486,7 @@ export default { ...@@ -486,7 +486,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
nickName: [ nickName: [
{ required: true, message: "用户称不能为空", trigger: "blur" } { required: true, message: "用户称不能为空", trigger: "blur" }
], ],
deptId: [ deptId: [
{ required: true, message: "组织不能为空", trigger: "blur" } { required: true, message: "组织不能为空", trigger: "blur" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment