Bläddra i källkod

提交swagger

“yueshang” 1 år sedan
förälder
incheckning
7efd33023f

+ 10 - 4
src/views/department/MyFile.vue

@@ -47,7 +47,13 @@
                                 <template #content> 安全级别: {{ item.encryptLevel == 'L1'?'敏感':(item.encryptLevel == 'L2'?'涉密':(item.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                 <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;"></el-tooltip>
                                 <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;" v-else>
-                                <p class="ellipsis-text shouzhi">{{ item.dirName }}</p>
+                                <el-tooltip
+                                  class="box-item tool-tip"
+                                  effect="dark"
+                                  placement="top-start"
+                               > <template #content> <span>{{ item.dirName }}</span></template>
+                               <p class="ellipsis-text shouzhi">{{ item.dirName }}</p>
+                               </el-tooltip>
                                 <img class="levelImg" v-if="item.isEncrypt === 'Y'" :src="getLevelImg(item.encryptLevel)" alt="">
                             </div>
                             </div>
@@ -171,7 +177,7 @@
                                             <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="" class="juli">
                                             <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;"
                                                 alt="" class="juli">
-                                                <el-tooltip
+                                                <!-- <el-tooltip
                                                     class="box-item"
                                                     effect="dark"
                                                     placement="top"
@@ -180,8 +186,8 @@
                                                 > 
                                                 <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                                 <span class="shouzhi"> {{ scope.row.dirName }}</span>
-                                                </el-tooltip>
-                                                <span class="shouzhi" v-else> {{ scope.row.dirName }}</span>
+                                                </el-tooltip> -->
+                                                <span class="shouzhi"> {{ scope.row.dirName }}</span>
                                         </span>
                                     </template>
                                 </el-table-column>

+ 24 - 13
src/views/myfile/MyFile.vue

@@ -7,7 +7,7 @@
                     
                     <div class="spaceName">{{spaceName}}</div>
                     <div>
-                        <el-icon @click="createNewMenu(1)" color="#505870" size="24">
+                        <el-icon @click="createNewMenu(1,true)" color="#505870" size="24">
                             <Plus />
                         </el-icon>
                         <!-- @click="createNewFile" -->
@@ -52,7 +52,7 @@
                                   class="box-item tool-tip"
                                   effect="dark"
                                   placement="top-start"
-                               > <template #content> <span class="shouzhi">{{ item.dirName }}</span></template>
+                               > <template #content> <span>{{ item.dirName }}</span></template>
                                <p class="ellipsis-text shouzhi">{{ item.dirName }}</p>
                                </el-tooltip>
                               <img class="levelImg shouzhi" v-if="item.isEncrypt === 'Y'" :src="getLevelImg(item.encryptLevel)" alt="">
@@ -207,7 +207,7 @@
                                                 <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="">
                                                 <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;margin-right: 5px;"
                                                     alt="">
-                                                    <el-tooltip
+                                                    <!-- <el-tooltip
                                                         class="box-item"
                                                         effect="dark"
                                                         :content="scope.row.dirName"
@@ -217,8 +217,8 @@
                                                     >
                                                     <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                                     <span class="shouzhi">{{ scope.row.dirName }}</span>
-                                                    </el-tooltip>
-                                                    <span class="shouzhi" v-else>{{ scope.row.dirName }}</span>
+                                                    </el-tooltip> -->
+                                                    <span class="shouzhi">{{ scope.row.dirName }}</span>
                                             </span>
                                         </template>
                                     </el-table-column>
@@ -351,7 +351,7 @@
             <!-- 文件上传 -->
             <div>
                 <el-dialog v-model="uploadModal" title="文件上传" width="30%">
-                    <el-upload class="upload-demo" :file-list="fileArr"  drag :http-request="onSuccess" multiple>
+                    <el-upload class="upload-demo" :file-list="fileArr"  drag :http-request="onSuccess" multiple :on-remove="handleRemove">
                         <el-icon class="el-icon--upload"><upload-filled /></el-icon>
                         <div class="el-upload__text">拖入或<em>点击上传</em></div>
                         <template #tip>
@@ -522,6 +522,7 @@ export default {
         const delMoreFile = ref([])  //删除多个文件夹
         const historyTotal = ref(0)
         const historyPrew = ref(false)
+        const leftNewFile =ref(false)  //解决左侧点击后不能显示的问题
         let xz = ref(0)
         let yz = ref(0)
         let newAdd = ref(false)
@@ -995,7 +996,10 @@ export default {
             thanks.value = true
             anyP.value = false
         }
-        function createNewMenu(num) {
+        function createNewMenu(num,leftNewFiles) {
+            if(leftNewFiles){
+                leftNewFile.value = true  //解决左侧点击文件后不显示的问题
+            }
             if(num==2) {
                 newAdd.value = true
             }else{
@@ -1062,13 +1066,20 @@ export default {
                             uploadModal.value = false
                             fileArr.value = []
                         }
+                    }).catch(err => {
+                        fileArr.value = []
                     })
                 }
+            }else{
+               return ElMessage({ message: "请选择文件", type: "error"})
             }
         }
         function onSuccess(files, val) {
             fileArr.value.push(files.file)
         }
+        const handleRemove = (file,rawFile) => {
+            fileArr.value = [...rawFile]
+        }
         // 筛选后缀图片
         function getImage(file) {
             if (file === '.txt') {
@@ -1304,6 +1315,7 @@ export default {
             thanks.value = data
         }
         function getChildrenC(data) {
+            console.log('data====', data)
             folderCase.value = data
         }
         function getCollects(data) {
@@ -1499,12 +1511,9 @@ export default {
         }
         //点击收藏后刷新文件
         const refreshFile = ()=>{
-            // console.log('ref',toRaw(thisFolder.value));
-            if(toRaw(thisFolder.value).dirId){//如果点开了文件夹
-            // console.log(111);
+            if(toRaw(thisFolder.value).dirId&&!leftNewFile.value){//如果点开了文件夹
                folderClick()
-            }else{
-            // console.log(222);
+            } else {
                 getAllTop()
             }
         }
@@ -1781,6 +1790,7 @@ export default {
             uploadModal,
             sureUpload,
             onSuccess,
+            handleRemove,
             fileArr,
             directoryId,
             folderClick,
@@ -1905,7 +1915,8 @@ export default {
             setScroll,
             tableBeEnd,
             tableTotal,
-            clickFileData
+            clickFileData,
+            leftNewFile
         }
     },
     watch: {

+ 1 - 0
src/views/myfile/modalComponebts/CreateFloder.vue

@@ -125,6 +125,7 @@ export default {
                         emit("getChildrenC", addBoser.value)
                         props.refreshFile()
                     })
+                    console.log('1111', 1111)
                 } else {
                     let query = {}
                     if(FolderRole){

+ 1 - 1
src/views/myjoin/components/AddFile.vue

@@ -24,7 +24,7 @@
         <el-select
           v-model="createFile.fileType"
           clearable
-          placeholder="Select"
+          placeholder="请选择文件类型"
           @change="optChange"
         >
           <el-option

+ 10 - 4
src/views/publicment/MyFile.vue

@@ -46,7 +46,13 @@
                                 <template #content> 安全级别: {{ item.encryptLevel == 'L1'?'敏感':(item.encryptLevel == 'L2'?'涉密':(item.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                 <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;"></el-tooltip>
                                 <img src="../../assets/images/fileStyle.png" style="width: 72px;height: 72px;" v-else>
-                                <p class="ellipsis-text shouzhi">{{ item.dirName }}</p>
+                                <el-tooltip
+                                  class="box-item tool-tip"
+                                  effect="dark"
+                                  placement="top-start"
+                               > <template #content> <span>{{ item.dirName }}</span></template>
+                               <p class="ellipsis-text shouzhi">{{ item.dirName }}</p>
+                               </el-tooltip>
                                 <img class="levelImg" v-if="item.isEncrypt === 'Y'" :src="getLevelImg(item.encryptLevel)" alt="">
                             </div>
                             </div>
@@ -170,7 +176,7 @@
                                             <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="" class="juli">
                                             <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;"
                                                 alt="" class="juli">
-                                                 <el-tooltip
+                                                 <!-- <el-tooltip
                                                     class="box-item"
                                                     effect="dark"
                                                     placement="top"
@@ -179,8 +185,8 @@
                                                 >
                                                 <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                                   <span class="shouzhi"> {{ scope.row.dirName }}</span>
-                                                </el-tooltip>
-                                                <span class="shouzhi" v-else>{{ scope.row.dirName }}</span>
+                                                </el-tooltip> -->
+                                                <span class="shouzhi">{{ scope.row.dirName }}</span>
                                         </span>
                                     </template>
                                 </el-table-column>

+ 76 - 0
vite.config.js

@@ -0,0 +1,76 @@
+import {
+	defineConfig,
+	loadEnv
+} from 'vite'
+import path from 'path'
+import createVitePlugins from './vite/plugins'
+
+// https://vitejs.dev/config/
+export default defineConfig(({
+								 mode,
+								 command
+							 }) => {
+	const env = loadEnv(mode, process.cwd())
+	const {
+		VITE_APP_ENV
+	} = env
+	return {
+		// 部署生产环境和开发环境下的URL。
+		// 默认情况下,vite 会假设你的应用是被部署在一个域名的根路径上
+		// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
+		base: VITE_APP_ENV === 'production' ? '/' : '/',
+		plugins: createVitePlugins(env, command === 'build'),
+		resolve: {
+			// https://cn.vitejs.dev/config/#resolve-alias
+			alias: {
+				// 设置路径
+				'~': path.resolve(__dirname, './'),
+				// 设置别名
+				'@': path.resolve(__dirname, './src')
+			},
+			// https://cn.vitejs.dev/config/#resolve-extensions
+			extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
+		},
+		// vite 相关配置
+		server: {
+			port: 80,
+			host: true,
+			open: true,
+			proxy: {
+				// https://cn.vitejs.dev/config/#server-proxy
+				'/dev-api': {
+					// target: 'http://192.168.1.28:8080/',
+					// target: 'http://192.168.1.11:8080/',
+					// target: 'http://localhost:8080/',
+					target:'http://192.168.1.28:8080/',
+					// target:'http://8.142.173.95:19527',
+					changeOrigin: true,
+					rewrite: (p) => p.replace(/^\/dev-api/, '')
+				},
+				//websocket代理
+				'/websocket': {
+					// target:'ws://localhost:8080/websocket',
+					target:'ws://192.168.1.28:8080/websocket',
+					// target:'ws://192.168.1.11:8080/websocket',
+					changeOrigin: true,
+					rewrite: (p) => p.replace(/^\/websocket/, '')
+				}
+			}
+		},
+		//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
+		css: {
+			postcss: {
+				plugins: [{
+					postcssPlugin: 'internal:charset-removal',
+					AtRule: {
+						charset: (atRule) => {
+							if (atRule.name === 'charset') {
+								atRule.remove();
+							}
+						}
+					}
+				}]
+			}
+		}
+	}
+})