소스 검색

完善静态功能

liyangzheng 2 년 전
부모
커밋
d0f053b443
5개의 변경된 파일129개의 추가작업 그리고 82개의 파일을 삭제
  1. BIN
      src/assets/images/archiveTray.png
  2. BIN
      src/assets/images/user.png
  3. 19 19
      src/router/index.js
  4. 58 59
      src/store/modules/user.js
  5. 52 4
      src/views/myfile/MyFile.vue

BIN
src/assets/images/archiveTray.png


BIN
src/assets/images/user.png


+ 19 - 19
src/router/index.js

@@ -70,16 +70,28 @@ export const constantRoutes = [
         meta: { title: '首页', icon: 'dashboard', affix: true }
       },
       {
-        path:'swagger',
-        component:() => import('@/views/tool/swagger/index.vue'),
-        name:'swagger',
-        meta:{ title:'接口',icon: 'dashboard' },      
+        path: 'swagger',
+        component: () => import('@/views/tool/swagger/index.vue'),
+        name: 'swagger',
+        meta: { title: '接口', icon: 'dashboard' },
+      },
+      {
+        path: "/myfile",
+        component: () => import("@/views/myfile/MyFile"),
+        name: "myfile",
+        meta: { title: "我的文件", icon: "myfile" }
+      },
+      {
+        path: "/department",
+        component: () => import("@/views/department/Department"),
+        name: "department",
+        meta: { title: "部门文件", icon: "department" }
       }
     ]
   },
   {
     path: '/admin',
-    component:Layout,
+    component: Layout,
     redirect: '/admin/index',
     children: [
       {
@@ -91,7 +103,7 @@ export const constantRoutes = [
       // 其他 admin 下的子路由
     ]
   },
-  
+
   {
     path: '/file',
     component: Layout,
@@ -104,18 +116,6 @@ export const constantRoutes = [
         meta: { title: '接口', icon: 'dashboard' },
 
       },
-      {
-        path: "/myfile",
-        component: () => import("@/views/myfile/MyFile"),
-        name: "myfile",
-        meta: { title: "我的文件", icon: "myfile" }
-      },
-      {
-        path: "/department",
-        component: () => import("@/views/department/Department"),
-        name: "department",
-        meta: { title: "部门文件", icon: "department" }
-      }
     ]
   },
 
@@ -239,7 +239,7 @@ const router = createRouter({
     } else {
       return { top: 0 }
     }
-    console.log(savedPosition,'savedPosition');
+    console.log(savedPosition, 'savedPosition');
   },
 });
 

+ 58 - 59
src/store/modules/user.js

@@ -12,69 +12,68 @@ import defAva from '@/assets/images/profile.jpg'
 
 const useUserStore = defineStore(
 	'user', {
-		state: () => ({
-			token: getToken(),
-			uid: '',
-			name: '',
-			avatar: '',
-			roles: [],
-			permissions: []
-		}),
-		actions: {
-			// 登录
-			login(userInfo) {
-				const username = userInfo.username.trim()
-				const password = userInfo.password
-				const code = userInfo.code
-				const uuid = userInfo.uuid
-				return new Promise((resolve, reject) => {
-					login(username, password, code, uuid).then(res => {
-						setToken(res.token)
-						this.token = res.token
-						resolve()
-					}).catch(error => {
-						reject(error)
-					})
+	state: () => ({
+		token: getToken(),
+		uid: '',
+		name: '',
+		avatar: '',
+		roles: [],
+		permissions: []
+	}),
+	actions: {
+		// 登录
+		login(userInfo) {
+			const username = userInfo.username.trim()
+			const password = userInfo.password
+			const code = userInfo.code
+			const uuid = userInfo.uuid
+			return new Promise((resolve, reject) => {
+				login(username, password, code, uuid).then(res => {
+					setToken(res.token)
+					this.token = res.token
+					resolve()
+				}).catch(error => {
+					reject(error)
 				})
-			},
-			// 获取用户信息
-			getInfo() {
-				return new Promise((resolve, reject) => {
-					getInfo().then(res => {
-						const user = res.user
-						const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import
-							.meta.env.VITE_APP_BASE_API + user.avatar;
+			})
+		},
+		// 获取用户信息
+		getInfo() {
+			return new Promise((resolve, reject) => {
+				getInfo().then(res => {
+					const user = res.user
+					const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
 
-						if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-							this.roles = res.roles
-							this.permissions = res.permissions
-						} else {
-							this.roles = ['ROLE_DEFAULT']
-						}
-						this.uid = user.userId;
-						this.name = user.userName;
-						this.avatar = avatar;
-						resolve(res)
-					}).catch(error => {
-						reject(error)
-					})
+					if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+						this.roles = res.roles
+						this.permissions = res.permissions
+					} else {
+						this.roles = ['ROLE_DEFAULT']
+					}
+					this.uid = user.userId;
+					this.name = user.userName;
+					this.avatar = avatar;
+					resolve(res)
+				}).catch(error => {
+					reject(error)
 				})
-			},
-			// 退出系统
-			logOut() {
-				return new Promise((resolve, reject) => {
-					logout(this.token).then(() => {
-						this.token = ''
-						this.roles = []
-						this.permissions = []
-						removeToken()
-						resolve()
-					}).catch(error => {
-						reject(error)
-					})
+			})
+		},
+		// 退出系统
+		logOut() {
+			return new Promise((resolve, reject) => {
+				logout(this.token).then(() => {
+					this.token = ''
+					this.roles = []
+					this.permissions = []
+					removeToken()
+					resolve()
+				}).catch(error => {
+					reject(error)
 				})
-			}
+			})
 		}
-	})
+	}
+})
 
 export default useUserStore

+ 52 - 4
src/views/myfile/MyFile.vue

@@ -150,7 +150,7 @@
                     <!-- 文件 -->
                     <div class="fileTable">
                         <el-collapse v-model="files" accordion class="collapse">
-                            <el-collapse-item title="文件" name="2" class="custom-collapse-item">
+                            <el-collapse-item title="文件" name="2" class="">
                                 <el-table :data="fileList" style="width: 100%" @row-click="handleRowClick">
                                     <el-table-column label="Image" width="100">
                                         <template slot-scope="scope">
@@ -169,9 +169,19 @@
                                             <img :src="item.img" alt="">
                                             {{ item.name }}
                                             <span v-if="item.name == '在线编辑' || item.name == '协作' ? true : false"
-                                                style="color: #7084B4;float: right;">></span>
+                                                style="color: #7084B4;float: right;position: relative;">></span>
                                         </p>
                                     </template>
+                                    <div class="setCli1" v-if="anyP">
+                                        <p @click="chooseSet1()" class="chooseSet">
+                                            <img :src="user" alt="">
+                                            选择人员
+                                        </p>
+                                        <p class="chooseSet">
+                                            <img :src="archiveTray" alt="">
+                                            归档
+                                        </p>
+                                    </div>
                                 </div>
                             </el-collapse-item>
                         </el-collapse>
@@ -244,6 +254,8 @@ import togger from '../../assets/images/togger.png'
 import icc from '../../assets/images/icc.png'
 import history from '../../assets/images/history.png'
 import fileBox from '../../assets/images/fileBox.png'
+import user from '../../assets/images/user.png'
+import archiveTray from '../../assets/images/archiveTray.png'
 export default {
     setup() {
         let searchFire = ref('')
@@ -256,6 +268,7 @@ export default {
         let askTalk = ref('')
         let cliCC = ref(false)
         let transferModal = ref(false)
+        let anyP = ref(false)
         let trandata = ref(generateData())
         let tranvalue = ref([])
         let fileList = ref([
@@ -415,6 +428,15 @@ export default {
             } else {
                 transferModal.value = false
             }
+            if (row.name == '协作') {
+                anyP.value = true
+            } else {
+                anyP.value = false
+            }
+        }
+        function chooseSet1() {
+            transferModal.value = true
+            anyP.value = false
         }
         function generateData() {
             const data = []
@@ -480,6 +502,10 @@ export default {
             filterMethod,
             trandata,
             tranvalue,
+            archiveTray,//协作图标
+            user,//用户图标
+            anyP,
+            chooseSet1,
         }
     },
     created() {
@@ -646,11 +672,33 @@ p {
     z-index: 2;
 }
 
+.setCli1 {
+    width: 156px;
+    height: auto;
+    position: absolute;
+    top: 185px;
+    left: 155px;
+    background-color: white;
+    border: 1px solid gray;
+    border-radius: 4px;
+    z-index: 2;
+}
+
+.chooseSet {
+    width: 100%;
+    height: 30px;
+    line-height: 30px;
+}
+
 .chooseSet:hover {
     width: 100%;
-    height: 40px;
-    line-height: 40px;
+    height: 30px;
+    line-height: 30px;
     background-color: #8693b2;
     color: white;
 }
+
+::v-deep [data-v-69cdaa40] .el-collapse-item__header {
+    padding-left: 10px;
+}
 </style>