suojin
/
HIYL-localization-web
23
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第一版联调

Browse Source
main
ysn 4 days ago
parent 8dc209f8fc
commit 0dd4edec04
10 changed files with 223 additions and 204 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .env.development
  2. 14
      src/api/knowledge.js
  3. 20
      src/api/login.js
  4. 4
      src/layout/components/Navbar.vue
  5. 28
      src/store/modules/permission.js
  6. 27
      src/store/modules/user.js
  7. 66
      src/utils/request.js
  8. 179
      src/views/knowledge/index.vue
  9. 62
      src/views/login.vue
  10. 23
      vue.config.js

4
.env.development
Unescape View File

@ -4,8 +4,8 @@ VUE_APP_TITLE = 信联
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
# 信联/开发环境 # 修改为你真实的接口前缀
VUE_APP_BASE_API = '/dev-api' VUE_APP_BASE_API = '/api_admin/v1'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

14
src/api/knowledge.js
Unescape View File

@ -1,13 +1,18 @@
import request from '@/utils/request' import request from '@/utils/request'
// 获取知识库左侧分类列表
export function getKnowledgeCateList(data) {
return request({ url: '/v1/knowledge/cate/list', method: 'post', data })
}
// 获取知识库右侧列表
export function getKnowledgeList(data) {
return request({ url: '/v1/knowledge/list', method: 'post', data })
}
export function createKnowledge(data) { export function createKnowledge(data) {
return request({ url: '/api/v1/knowledge/create', method: 'post', data }) return request({ url: '/api/v1/knowledge/create', method: 'post', data })
} }
export function getKnowledgeList(data) {
return request({ url: '/api/v1/knowledge/list', method: 'post', data })
}
export function playKnowledge(data) { export function playKnowledge(data) {
return request({ url: '/api/v1/knowledge/play', method: 'post', data }) return request({ url: '/api/v1/knowledge/play', method: 'post', data })
@ -33,6 +38,3 @@ export function deleteKnowledgeCate(data) {
return request({ url: '/api/v1/knowledge/cate/delete', method: 'post', data }) return request({ url: '/api/v1/knowledge/cate/delete', method: 'post', data })
} }
export function getKnowledgeCateList(data) {
return request({ url: '/api/v1/knowledge/cate/list', method: 'post', data })
}

20
src/api/login.js
Unescape View File

@ -1,19 +1,9 @@
import request from '@/utils/request' import request from '@/utils/request'
// 登录方法 // 登录方法
export function login(username, password, code, uuid) { export function login(data) {
const data = {
username,
password,
code,
uuid
}
return request({ return request({
url: '/login', url: '/auth/login/access-token',
headers: {
isToken: false,
repeatSubmit: false
},
method: 'post', method: 'post',
data: data data: data
}) })
@ -34,8 +24,8 @@ export function register(data) {
// 获取用户详细信息 // 获取用户详细信息
export function getInfo() { export function getInfo() {
return request({ return request({
url: '/getInfo', url: '/users/detail',
method: 'get' method: 'POST'
}) })
} }
@ -51,7 +41,7 @@ export function unlockScreen(password) {
// 退出方法 // 退出方法
export function logout() { export function logout() {
return request({ return request({
url: '/logout', url: '/auth/logout',
method: 'post' method: 'post'
}) })
} }

4
src/layout/components/Navbar.vue
Unescape View File

@ -60,13 +60,13 @@
icon="el-icon-circle-check" icon="el-icon-circle-check"
:underline="false" :underline="false"
> >
{{ selectDictLabel(dict.type.sys_normal_disable, status) || "-" }} {{ status }}
</el-link> </el-link>
</span> </span>
<span class="user-nickname"> <span class="user-nickname">
所属单位 所属单位
<el-link type="primary" :underline="false"> <el-link type="primary" :underline="false">
{{ dept.deptName }} {{ dept }}
</el-link> </el-link>
</span> </span>
</div> </div>

28
src/store/modules/permission.js
Unescape View File

@ -33,20 +33,20 @@ const permission = {
GenerateRoutes({ commit }) { GenerateRoutes({ commit }) {
return new Promise(resolve => { return new Promise(resolve => {
// 向后端请求路由数据 // 向后端请求路由数据
getRouters().then(res => { // getRouters().then(res => {
const sdata = JSON.parse(JSON.stringify(res.data)) // const sdata = JSON.parse(JSON.stringify(res.data))
const rdata = JSON.parse(JSON.stringify(res.data)) // const rdata = JSON.parse(JSON.stringify(res.data))
const sidebarRoutes = filterAsyncRouter(sdata) // const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true) const rewriteRoutes = filterAsyncRouter([], false, true)
const asyncRoutes = filterDynamicRoutes(dynamicRoutes) const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
router.addRoutes(asyncRoutes) router.addRoutes(asyncRoutes)
commit('SET_ROUTES', rewriteRoutes) commit('SET_ROUTES', rewriteRoutes)
commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes)) commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(asyncRoutes))
commit('SET_DEFAULT_ROUTES', sidebarRoutes) commit('SET_DEFAULT_ROUTES', asyncRoutes)
commit('SET_TOPBAR_ROUTES', sidebarRoutes) commit('SET_TOPBAR_ROUTES', asyncRoutes)
resolve(rewriteRoutes) resolve(rewriteRoutes)
}) // })
}) })
} }
} }

27
src/store/modules/user.js
Unescape View File

@ -53,14 +53,11 @@ const user = {
actions: { actions: {
// 登录 // 登录
Login({ commit }, userInfo) { Login({ commit }, userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => { login(userInfo).then(res => {
setToken(res.token) console.log(res)
commit('SET_TOKEN', res.token) setToken(res.data.token)
commit('SET_TOKEN', res.data.token)
store.dispatch('lock/unlockScreen') store.dispatch('lock/unlockScreen')
resolve() resolve()
}).catch(error => { }).catch(error => {
@ -73,7 +70,7 @@ const user = {
GetInfo({ commit, state }) { GetInfo({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo().then(res => {
const user = res.user const user = res.data
let avatar = user.avatar || "" let avatar = user.avatar || ""
if (!isHttp(avatar)) { if (!isHttp(avatar)) {
avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
@ -88,20 +85,20 @@ const user = {
commit('SET_NAME', user.userName) commit('SET_NAME', user.userName)
commit('SET_NICK_NAME', user.nickName) commit('SET_NICK_NAME', user.nickName)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
commit('SET_DEPT', user.dept) commit('SET_DEPT', user.grp_name)
commit('SET_STATUS', user.status) commit('SET_STATUS', user.status)
cache.session.set('pwrChrtype', res.pwdChrtype) cache.session.set('pwrChrtype', res.pwdChrtype)
/* 初始密码提示 */ /* 初始密码提示 */
if(res.isDefaultModifyPwd) { if (res.isDefaultModifyPwd) {
MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { MessageBox.confirm('您的密码还是初始密码，请修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } }) router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
}).catch(() => {}) }).catch(() => { })
} }
/* 过期密码提示 */ /* 过期密码提示 */
if(!res.isDefaultModifyPwd && res.isPasswordExpired) { if (!res.isDefaultModifyPwd && res.isPasswordExpired) {
MessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { MessageBox.confirm('您的密码已过期，请尽快修改密码！', '安全提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } }) router.push({ name: 'Profile', params: { activeTab: 'resetPwd' } })
}).catch(() => {}) }).catch(() => { })
} }
resolve(res) resolve(res)
}).catch(error => { }).catch(error => {

66
src/utils/request.js
Unescape View File

@ -29,7 +29,7 @@ service.interceptors.request.use(config => {
// 间隔时间(ms)，小于此时间视为重复提交 // 间隔时间(ms)，小于此时间视为重复提交
const interval = (config.headers || {}).interval || 1000 const interval = (config.headers || {}).interval || 1000
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 config.headers['x-token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
} }
// get请求映射params参数 // get请求映射params参数
if (config.method === 'get' && config.params) { if (config.method === 'get' && config.params) {
@ -68,46 +68,46 @@ service.interceptors.request.use(config => {
} }
return config return config
}, error => { }, error => {
console.log(error) console.log(error)
Promise.reject(error) Promise.reject(error)
}) })
// 响应拦截器 // 响应拦截器
service.interceptors.response.use(res => { service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态 // 未设置状态码则默认成功状态
const code = res.data.code || 200 const code = res.data.code || 200
// 获取错误信息 // 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default'] const msg = errorCode[code] || res.data.message || errorCode['default']
// 二进制数据则直接返回 // 二进制数据则直接返回
if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
return res.data return res.data
} }
if (code === 401) { if (code === 401) {
if (!isRelogin.show) { if (!isRelogin.show) {
isRelogin.show = true isRelogin.show = true
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false isRelogin.show = false
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
location.href = '/index' location.href = '/index'
}) })
}).catch(() => { }).catch(() => {
isRelogin.show = false isRelogin.show = false
}) })
} }
return Promise.reject('无效的会话，或者会话已过期，请重新登录。') return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) { } else if (code === 500 || code === 901) {
Message({ message: msg, type: 'error' }) Message({ message: msg, type: 'error' })
return Promise.reject(new Error(msg)) return Promise.reject(new Error(msg))
} else if (code === 601) { } else if (code === 601) {
Message({ message: msg, type: 'warning' }) Message({ message: msg, type: 'warning' })
return Promise.reject('error') return Promise.reject('error')
} else if (code !== 200) { } else if (code !== 200) {
Notification.error({ title: msg }) Notification.error({ title: msg })
return Promise.reject('error') return Promise.reject('error')
} else { } else {
return res.data return res.data
} }
}, },
error => { error => {
console.log('err' + error) console.log('err' + error)
let { message } = error let { message } = error

179
src/views/knowledge/index.vue
Unescape View File

@ -4,19 +4,20 @@
<!-- 左侧分类菜单 --> <!-- 左侧分类菜单 -->
<el-col :span="6"> <el-col :span="6">
<el-form> <el-form>
<el-form-item prop="userName"> <el-form-item prop="name">
<el-input <el-input
v-model="deptFilterText" v-model="queryLeftParams.name"
placeholder="输入部门名称过滤" placeholder="输入部门名称过滤"
clearable clearable
size="small" size="small"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
@keyup.enter.native="getKnowledgeCateList"
> >
<template slot="append"> <template slot="append">
<el-button <el-button
slot="append" slot="append"
icon="el-icon-refresh-right" icon="el-icon-refresh-right"
@click="refreshMenu" @click="refreshKnowledgeCateList"
/> />
</template> </template>
</el-input> </el-input>
@ -25,14 +26,14 @@
<el-menu :default-active="defaultActive" @select="handleSelect"> <el-menu :default-active="defaultActive" @select="handleSelect">
<!-- 内置标签 --> <!-- 内置标签 -->
<el-menu-item <el-menu-item
v-for="(dept, index) in builtInDepts" v-for="(item, index) in systemCateList"
:key="`built-in-${index}`" :key="`built-in-${index}`"
:index="`built-in-${index}`" :index="`built-in-${index}`"
class="custom-item" class="custom-item"
> >
<div class="left"> <div class="left">
<i :class="getBuiltInIcon(index)" /> <i :class="getBuiltInIcon(index)" />
<span>{{ dept.label }}</span> <span>{{ item.name }}</span>
</div> </div>
<!-- 内置标签无操作按钮 --> <!-- 内置标签无操作按钮 -->
</el-menu-item> </el-menu-item>
@ -45,7 +46,7 @@
> >
<div class="left"> <div class="left">
<i class="el-icon-collection-tag" /> <i class="el-icon-collection-tag" />
<span>{{ dept.label }}</span> <span>{{ dept.name }}</span>
</div> </div>
<div class="right"> <div class="right">
<el-button <el-button
@ -73,15 +74,15 @@
<el-col :span="18"> <el-col :span="18">
<!-- 搜索区域 --> <!-- 搜索区域 -->
<el-form <el-form
:model="queryParams" :model="queryRightParams"
ref="queryForm" ref="queryForm"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="文件名称" prop="userName"> <el-form-item label="文件名称" prop="file_name">
<el-input <el-input
v-model="queryParams.userName" v-model="queryRightParams.file_name"
placeholder="请输入文件名称" placeholder="请输入文件名称"
clearable clearable
style="width: 240px" style="width: 240px"
@ -115,16 +116,16 @@
<el-table v-loading="loading" :data="userList"> <el-table v-loading="loading" :data="userList">
<el-table-column <el-table-column
label="缩略图" label="缩略图"
prop="thumbnail" prop="thumbnail_path"
align="center" align="center"
v-if="columns.thumbnail.visible" v-if="columns.thumbnail_path.visible"
width="250" width="250"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image
class="resource-thumb" class="resource-thumb"
:src=" :src="
scope.row.thumbnail || defaultThumbnail(scope.row.fileType) scope.row.thumbnail_path || defaultthumbnail_path(scope.row.fileType)
" "
fit="contain" fit="contain"
@click="handlePreview(scope.row)" @click="handlePreview(scope.row)"
@ -136,8 +137,8 @@
<el-table-column <el-table-column
label="文件名" label="文件名"
align="center" align="center"
prop="userName" prop="file_name"
v-if="columns.userName.visible" v-if="columns.file_name.visible"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
@ -197,8 +198,8 @@
<pagination <pagination
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryRightParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryRightParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-col> </el-col>
@ -245,9 +246,9 @@
ref="fileNameFormRef" ref="fileNameFormRef"
label-width="80px" label-width="80px"
> >
<el-form-item label="文件名称" prop="userName"> <el-form-item label="文件名称" prop="file_name">
<el-input <el-input
v-model="fileNameForm.userName" v-model="fileNameForm.file_name"
placeholder="请输入文件名称" placeholder="请输入文件名称"
show-word-limit show-word-limit
maxlength="8" maxlength="8"
@ -324,6 +325,9 @@
</template> </template>
<script> <script>
import { getKnowledgeCateList, getKnowledgeList } from "@/api/knowledge";
import { listUser, delUser, deptTreeSelect } from "@/api/system/user"; import { listUser, delUser, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import CreateGroupDialog from "@/views/message/components/CreateGroupDialog"; import CreateGroupDialog from "@/views/message/components/CreateGroupDialog";
@ -331,33 +335,34 @@ import CreateGroupDialog from "@/views/message/components/CreateGroupDialog";
export default { export default {
name: "Knowledge", name: "Knowledge",
components: { components: {
CreateGroupDialog CreateGroupDialog,
}, },
data() { data() {
return { return {
loading: true, defaultActive: "",
total: 0, queryLeftParams: {
userList: [], name: "",
showSearch: true, },
queryParams: { systemCateList: [],
userCateList: [],
queryRightParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
userName: undefined, total: 0,
deptId: undefined,
}, },
columns: { columns: {
thumbnail: { label: "缩略图", visible: true }, thumbnail_path: { label: "缩略图", visible: true },
userName: { label: "文件名", visible: true }, file_name: { label: "文件名", visible: true },
createTime: { label: "上传时间", visible: true }, createTime: { label: "上传时间", visible: true },
fileSize: { label: "文件大小", visible: true }, fileSize: { label: "文件大小", visible: true },
}, },
list: [],
loading: true,
userList: [],
showSearch: true,
deptFilterText: "", deptFilterText: "",
deptOptions: [], deptOptions: [],
builtInDepts: [
{ label: "海信产品介绍", id: "built-in-0" },
{ label: "公共教学视频", id: "built-in-1" },
{ label: "个人收藏录像", id: "built-in-2" },
],
currentTag: "", currentTag: "",
// 标签弹窗 // 标签弹窗
tagDialogVisible: false, tagDialogVisible: false,
@ -370,9 +375,9 @@ export default {
}, },
// 文件名弹窗 // 文件名弹窗
fileNameDialogVisible: false, fileNameDialogVisible: false,
fileNameForm: { userId: undefined, userName: "" }, fileNameForm: { userId: undefined, file_name: "" },
fileNameRules: { fileNameRules: {
userName: [ file_name: [
{ required: true, message: "文件名不能为空", trigger: "blur" }, { required: true, message: "文件名不能为空", trigger: "blur" },
], ],
}, },
@ -406,20 +411,86 @@ export default {
}, },
}, },
created() { created() {
this.getList(); this.getKnowledgeCateList();
this.getDeptTree(); // this.getList();
this.getContactList(); // this.getDeptTree();
// this.getContactList();
}, },
methods: { methods: {
refreshMenu() { refreshKnowledgeCateList() {
this.deptFilterText = ""; this.queryLeftParams.name = "";
this.getDeptTree(); this.getKnowledgeCateList();
},
getKnowledgeCateList() {
// getKnowledgeCateList().then((res) => {
let res = {
code: 200,
message: "成功",
data: {
system_cate_list: [
{ id: 2, name: "产品介绍" },
{ id: 0, name: "公共教学视频" },
{ id: 1, name: "个人收藏录像" },
],
user_cate_list: [],
},
};
this.systemCateList = res.data.system_cate_list;
this.defaultActive = this.systemCateList[0].id;
this.userCateList = res.data.user_cate_list;
// })
},
handleSelect(key) {
console.log(key);
// const [type, idx] = key.split("-");
// this.currentTag =
// type === "built-in"
// ? this.systemCateList[idx].id
// : this.filteredCustomDeptList[idx]?.id;
this.queryRightParams.deptId = this.currentTag;
this.handleQuery();
},
getKnowledgeList() {
// getKnowledgeList(this.queryRightParams).then((res) => {
let res = {
code: 200,
message: "成功",
data: {
list: [
{
id: 824,
title: "1633500241136.mp4",
thumbnail_path_path:
"personal-test/video/688/1779759317/1633500241136.png",
file_path: "personal-test/video/688/1779759317/1633500241136.mp4",
file_name: "1633500241136.mp4",
file_type: "MP4",
file_size: 18794616,
true_file_size: 18796714,
creator_id: 688,
play_times: 0,
is_mine: 1,
cate_id: 152,
description: "",
del_flag: 0,
create_time: "2026-05-26 09:35:14",
update_time: "2026-05-26 09:35:14",
},
],
total: 1,
is_mine: 0,
cate_id: 152,
},
};
this.list = res.data.list;
this.queryRightParams.total = res.data.total;
// })
}, },
getContactList() { getContactList() {
listUser({ pageNum: 1, pageSize: 100 }).then((res) => { listUser({ pageNum: 1, pageSize: 100 }).then((res) => {
this.recentContacts = res.rows.map((user) => ({ this.recentContacts = res.rows.map((user) => ({
id: user.userId, id: user.userId,
name: user.nickName || user.userName, name: user.nickName || user.file_name,
avatar: user.avatar || "", avatar: user.avatar || "",
})); }));
}); });
@ -435,7 +506,7 @@ export default {
getFileIcon(t) { getFileIcon(t) {
return t === "video" ? "el-icon-video-play" : "el-icon-document"; return t === "video" ? "el-icon-video-play" : "el-icon-document";
}, },
defaultThumbnail(t) { defaultthumbnail_path(t) {
return t === "video" return t === "video"
? "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg" ? "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
: "https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3794312f7670b85636.jpeg"; : "https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3794312f7670b85636.jpeg";
@ -451,15 +522,7 @@ export default {
} }
return s.toFixed(2) + u[i]; return s.toFixed(2) + u[i];
}, },
handleSelect(key) {
const [type, idx] = key.split("-");
this.currentTag =
type === "built-in"
? this.builtInDepts[idx].id
: this.filteredCustomDeptList[idx]?.id;
this.queryParams.deptId = this.currentTag;
this.handleQuery();
},
handleAddTag() { handleAddTag() {
this.tagForm = { id: null, label: "" }; this.tagForm = { id: null, label: "" };
this.tagDialogVisible = true; this.tagDialogVisible = true;
@ -477,7 +540,7 @@ export default {
.then(() => { .then(() => {
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
this.getDeptTree(); this.getDeptTree();
this.migrateResource(tag.id, this.builtInDepts[2].id); this.migrateResource(tag.id, this.systemCateList[2].id);
}) })
.catch(() => {}); .catch(() => {});
}, },
@ -485,7 +548,7 @@ export default {
migrateResource(oldDeptId, newDeptId) { migrateResource(oldDeptId, newDeptId) {
this.getList(); this.getList();
}, },
submitTagForm() { submitTagForm() {
this.$refs["tagFormRef"].validate((valid) => { this.$refs["tagFormRef"].validate((valid) => {
if (valid) { if (valid) {
if (this.tagForm.id) { if (this.tagForm.id) {
@ -504,18 +567,18 @@ export default {
this.tagDialogVisible = false; this.tagDialogVisible = false;
}, },
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryRightParams.pageNum = 1;
this.getList(); this.getList();
}, },
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.deptId = null; this.queryRightParams.deptId = null;
this.currentTag = ""; this.currentTag = "";
this.handleQuery(); this.handleQuery();
}, },
getList() { getList() {
this.loading = true; this.loading = true;
listUser(this.queryParams).then((res) => { listUser(this.queryRightParams).then((res) => {
this.userList = res.rows; this.userList = res.rows;
this.total = res.total; this.total = res.total;
this.loading = false; this.loading = false;
@ -579,7 +642,7 @@ export default {
}, },
// 上传前校验 // 上传前校验
beforeUpload(file) { beforeUpload(file) {
this.uploadParams.deptId = this.currentTag || this.builtInDepts[2].id; this.uploadParams.deptId = this.currentTag || this.systemCateList[2].id;
this.uploadParams.fileType = this.currentFileType; this.uploadParams.fileType = this.currentFileType;
this.uploadProgressDialogVisible = true; this.uploadProgressDialogVisible = true;
this.uploadPercent = 0; this.uploadPercent = 0;

62
src/views/login.vue
Unescape View File

@ -62,24 +62,6 @@
/> />
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="loginForm.code"
auto-complete="off"
placeholder="验证码"
style="width: 63%"
@keyup.enter.native="handleLogin"
>
<svg-icon
slot="prefix"
icon-class="validCode"
class="el-input__icon input-icon"
/>
</el-input>
<div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img" />
</div>
</el-form-item>
<el-form-item> <el-form-item>
<el-checkbox v-model="loginForm.rememberMe"> 自动登录 </el-checkbox> <el-checkbox v-model="loginForm.rememberMe"> 自动登录 </el-checkbox>
</el-form-item> </el-form-item>
@ -127,10 +109,9 @@
</div> </div>
</template> </template>
<script> <script>
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import { encrypt, decrypt } from "@/utils/jsencrypt"; import { encrypt, decrypt } from "@/utils/jsencrypt";
import CryptoJS from "crypto-js";
export default { export default {
name: "Login", name: "Login",
data() { data() {
@ -138,12 +119,10 @@ export default {
// 角色信息 // 角色信息
roleName: "会诊专家", // 示例：你好, 会诊专家 roleName: "会诊专家", // 示例：你好, 会诊专家
roleIconText: "家", // 示例：顶部圆形图标文字 roleIconText: "家", // 示例：顶部圆形图标文字
codeUrl: "",
loginForm: { loginForm: {
username: "hzzjys", username: "hzzjys",
password: "", password: "",
rememberMe: false, rememberMe: false,
code: "",
uuid: "", uuid: "",
}, },
loginRules: { loginRules: {
@ -155,7 +134,6 @@ export default {
], ],
}, },
loading: false, loading: false,
captchaEnabled: true,
redirect: undefined, redirect: undefined,
showSettingsDialog: false, showSettingsDialog: false,
settingsForm: { settingsForm: {
@ -174,21 +152,13 @@ export default {
}, },
}, },
created() { created() {
this.getCode();
this.getCookie(); this.getCookie();
// 实际业务中，这里可以调用接口获取当前角色信息 // this.handleLogin();
// this.getRoleInfo();
}, },
methods: { methods: {
getCode() { // 与 Qt CEncrypt::DataEncryptMD5 逻辑一致
getCodeImg().then((res) => { md5Encrypt(str) {
this.captchaEnabled = return CryptoJS.MD5(str).toString();
res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.img;
this.loginForm.uuid = res.uuid;
}
});
}, },
getCookie() { getCookie() {
const username = Cookies.get("username"); const username = Cookies.get("username");
@ -200,6 +170,7 @@ export default {
password === undefined ? this.loginForm.password : decrypt(password), password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe), rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
}; };
this.handleLogin();
}, },
handleLogin() { handleLogin() {
this.$refs.loginForm.validate((valid) => { this.$refs.loginForm.validate((valid) => {
@ -219,15 +190,17 @@ export default {
Cookies.remove("rememberMe"); Cookies.remove("rememberMe");
} }
this.$store this.$store
.dispatch("Login", this.loginForm) .dispatch("Login", {
username: this.loginForm.username,
password: this.md5Encrypt(this.loginForm.password),
psign: this.md5Encrypt("xycloud_" + this.loginForm.password),
version: "V01.01.16",
})
.then(() => { .then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(() => {}); this.$router.push({ path: this.redirect || "/" }).catch(() => {});
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
if (this.captchaEnabled) {
this.getCode();
}
}); });
} }
}); });
@ -387,17 +360,6 @@ export default {
margin-left: 2px; margin-left: 2px;
color: #009696; color: #009696;
} }
.login-code {
width: 33%;
height: 36px;
float: right;
img {
height: 36px;
cursor: pointer;
vertical-align: middle;
}
}
} }
} }
} }

23
vue.config.js
Unescape View File

@ -9,7 +9,10 @@ const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '信联' // 网页标题 const name = process.env.VUE_APP_TITLE || '信联' // 网页标题
const baseUrl = 'http://vue.ruoyi.vip/prod-api' // 后端接口 // const baseUrl = 'http://www.haiteriot.com:13002' // 后端接口
const baseUrl = 'http://47.92.6.51:8005' // 后端接口
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口
@ -34,14 +37,16 @@ module.exports = {
port: port, port: port,
open: true, open: true,
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // 匹配环境变量里的接口前缀
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: baseUrl, // 替换成你的真实后端地址，比如 http://localhost:8080
changeOrigin: true, target: baseUrl,
pathRewrite: { changeOrigin: true,
['^' + process.env.VUE_APP_BASE_API]: '' // 关键：注释或删除 pathRewrite，不再去掉前缀
} // pathRewrite: {
}, // ['^' + process.env.VUE_APP_BASE_API]: ''
// }
},
// springdoc proxy // springdoc proxy
'^/v3/api-docs/(.*)': { '^/v3/api-docs/(.*)': {
target: baseUrl, target: baseUrl,

Write Preview
Loading…
Cancel
Save