+
@@ -41,8 +60,8 @@
diff --git a/web/src/views/login/index.vue b/web/src/views/login/index.vue
index ae82d35..cc2756f 100644
--- a/web/src/views/login/index.vue
+++ b/web/src/views/login/index.vue
@@ -204,11 +204,12 @@ function handleLogin() {
.login(user)
.then(() => {
Cookies.set('username', user.username);
+ // debugger
if (remember.value == true) {
Cookies.set('password', user.password);
Cookies.set('rememberMe', String(remember.value));
}
- router.push({ path: state.redirect || '/', query: state.otherQuery });
+ router.push({ path: '/dashboard' || '/', query: state.otherQuery });
state.loading = false;
})
.catch(() => {
diff --git a/web/src/views/special/document/index.vue b/web/src/views/special/document/index.vue
index 4b42319..60e5b70 100644
--- a/web/src/views/special/document/index.vue
+++ b/web/src/views/special/document/index.vue
@@ -284,11 +284,19 @@ function openFile() {
description: '', //文件描述
fileSize: '', //M
}
+ judge.value = true
}
//修改文件
-function editfile(row: any) {
+const judge = ref(false)
+function editfile(row: any, item: any) {
upfile.value = true
fileObj.value = JSON.parse(JSON.stringify(row))
+ if (item) {
+ title.value = "修改文件"
+ } else {
+ title.value = "重命名"
+ }
+ judge.value = item
}
// 如果有上传完成的文件,关闭对话框时调用 close 方法刷新文件列表
const emit = defineEmits([])
@@ -558,7 +566,7 @@ const isViewfile = ref(false)
const fileType = ref('')
function openPreview(row: any) {
- if (getFileExtension(row.fileName) == 'pdf' || getFileExtension(row.fileName) == 'xlsx' || getFileExtension(row.fileName) == 'docx' || getFileExtension(row.fileName) == 'doc' || getFileExtension(row.fileName) == 'bin' || getFileExtension(row.fileName) == 'pptx') {
+ if (getFileExtension(row.fileName) == 'pdf' || getFileExtension(row.fileName) == 'xlsx' || getFileExtension(row.fileName) == 'docx' || getFileExtension(row.fileName) == 'doc' || getFileExtension(row.fileName) == 'bin' ) {
title1.value = row.fileName
ViewfileUrl.value = row.url
isViewfile.value = true
@@ -684,20 +692,37 @@ function getFileSuffix(name: any) {
-
- {{ scope.row.fileName }}(点击预览)
-
+
+
+
+
+
+
+
+
-
+
-
+
@@ -729,7 +754,7 @@ function getFileSuffix(name: any) {
-
+
@@ -740,10 +765,10 @@ function getFileSuffix(name: any) {
-
+
-
+
diff --git a/web/src/views/system/role/index.vue b/web/src/views/system/role/index.vue
index c4ef651..2d1330b 100644
--- a/web/src/views/system/role/index.vue
+++ b/web/src/views/system/role/index.vue
@@ -448,8 +448,8 @@ onMounted(() => {
style="cursor: pointer; "> -->
-
+
diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue
index 1108054..3e48968 100644
--- a/web/src/views/system/user/index.vue
+++ b/web/src/views/system/user/index.vue
@@ -55,12 +55,12 @@ function getTree() {
parentid: "0",
};
getTreelist(params).then((res: any) => {
- // treedata.value = res
+ treedata.value = res
treeloading.value = false
orgId.value = res[0].childList[0].id
- // nextTick(() => {
- // treeRef.value?.setCurrentKey(orgId.value);
- // });
+ nextTick(() => {
+ treeRef.value?.setCurrentKey(orgId.value);
+ });
getdata()
})
.catch((error: any) => {
@@ -91,7 +91,7 @@ function handleNodeClick(data: Tree, node: any) {
const defaultProps = {
children: "childList",
- label: "name"
+ label: "orgname"
};
//新建
@@ -382,7 +382,7 @@ function dateFormat(row: any) {
const isRoles = ref(false)
onMounted(() => {
getTree();
- getTreeInit();
+ // getTreeInit();
// getdata()
for (let i = 0; i < userStore.roles.length; i++) {
if (userStore.roles[i] == '医疗机构管理员') {
@@ -452,33 +452,33 @@ function institutionClick(e: any) {
});
}
const queryName = ref('')
-function getTreeInit() {
- queryName.value = queryName.value.replace(/\s+/g, "");
- let params = {
- name: queryName.value
- };
- treeloading.value = true
- treedata.value = []
- queryVisionInstitutionNameList(params).then((res) => {
- treedata.value = res.data
- treedata.value.unshift({
- id: '',
- name: '全部机构'
- })
+// function getTreeInit() {
+// queryName.value = queryName.value.replace(/\s+/g, "");
+// let params = {
+// name: queryName.value
+// };
+// treeloading.value = true
+// treedata.value = []
+// queryVisionInstitutionNameList(params).then((res) => {
+// treedata.value = res.data
+// treedata.value.unshift({
+// id: '',
+// name: '全部机构'
+// })
- treeloading.value = false
- }).catch(() => {
- treeloading.value = false
- });
-}
+// treeloading.value = false
+// }).catch(() => {
+// treeloading.value = false
+// });
+// }
-
@@ -236,20 +635,29 @@ const Three3dPreview = defineAsyncComponent({