Merge branch 'liuqiang' into v3

src/layout/indexCommon.vue

@@ -161,6 +161,7 @@ import { flieSearch } from "@/api/search/search.js";
 import { useRouter, useRoute } from "vue-router";
 import useWebsoctStore from "@/store/modules/websocket";
 import { toRaw } from "@vue/reactivity";
+import iFrame from "@/components/iFrame/index.vue";
 const websoctStore = useWebsoctStore();
 const router = useRouter(); //注册路由
 const route = useRoute();

src/views/biz/level/index.vue

@@ -90,6 +90,12 @@
 						:checked="scope.row.roles.l1200"></el-checkbox>
 				</template>
 			</el-table-column>
+			<el-table-column label="打印" align="center" width="100">
+				<template #default="scope">
+					<el-checkbox true-label="1" false-label="0" v-model="scope.row.roles.l1300"
+						:checked="scope.row.roles.l1300"></el-checkbox>
+				</template>
+			</el-table-column>
 			<!-- <el-table-column label="等级对应权限" align="center" prop="levelRoles">
 				<template #default="scope">
 					<dict-tag :options="doc_roles" :value="scope.row.roles ? scope.row.roles : []" />

src/views/highSearch/HighSearch.vue

@@ -95,6 +95,7 @@
 import { onMounted, ref, inject } from "vue";
 import { search } from "@/api/search/search.js";
 import FileEdit from "@/views/myfile/components/FileEdit.vue";
+import iFrame from "@/components/iFrame/index.vue";
 // import IdentifyFont from "@/components/IdentifyFont/IdentifyFont.vue";
 const searchText = ref(""); //搜索ipt的值
 const selectValue = ref(1); //文档空间类型
@@ -188,9 +189,9 @@ const addTab = inject("addTab");
 const toPreview = (item) => {
   addTab(item.content.docInfo);
   console.log("item", item);
-  clickRowId.value = item.content.docInfo.docId;
-  copyRow.value = item.content.docInfo;
-  showPreview.value = true;
+  // clickRowId.value = item.content.docInfo.docId;
+  // copyRow.value = item.content.docInfo;
+  // showPreview.value = true;
 };
 </script>
 

src/views/myfile/MyFile.vue

@@ -12,7 +12,7 @@
                         </el-icon>
                     </div>
                     <div>
-                        <el-icon style="font-size: 24px;" @click="createNewMenu(1)">
+                        <el-icon style="font-size: 24px;" @click="createNewMenu(1,true)">
                             <Plus />
                         </el-icon>
                         <!-- @click="createNewFile" -->
@@ -639,6 +639,8 @@ export default {
             console.log('row2',row);
             if(row.isEncrypt === "Y"){
                 getLeveldetailFn(row.encryptLevel)
+            }else{
+                thisFolderRole.value = null
             }
             copyParentId.value = row.parentId
             newDirId.value = row.dirId
@@ -1066,6 +1068,8 @@ export default {
             }
             if(row.isEncrypt === "Y"){
                 getLeveldetailFn(row.encryptLevel)
+            }else{
+                thisFolderRole.value = null
             }
             console.log('row1', toRaw(row));
             topPath.value = row.dirPath

src/views/myfile/modalComponebts/CreateFloder.vue

@@ -12,10 +12,10 @@
                             <el-radio :label="2">组织目录</el-radio>
                         </el-radio-group>
                     </el-form-item> -->
-                    <el-form-item label="是否加密" v-if="!FolderRole">
+                    <el-form-item label="是否加密" v-if="!(FolderRole && !free )">
                             <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
                     </el-form-item>
-                    <el-form-item label="加密等级" v-if="boserForm.isEncrypt === 'Y' && !FolderRole">
+                    <el-form-item label="加密等级" v-if="!(FolderRole && !free)">
                         <el-radio-group v-model="boserForm.encryptLevel">
                             <el-radio :label="item.levelCode" v-for="item in levelList" :key="item">{{item.levelName}}</el-radio>
                         </el-radio-group>
@@ -187,7 +187,8 @@ export default {
             newspid,
             levelList,
             getLevelList,
-            FolderRole
+            FolderRole,
+            free
         }
     }
 }

vite.config.js

@@ -39,8 +39,8 @@ export default defineConfig(({
 			proxy: {
 				// https://cn.vitejs.dev/config/#server-proxy
 				'/dev-api': {
-					// target: 'http://192.168.1.28:8080/',
-					target: 'http://8.142.173.95:19527/',
+					target: 'http://192.168.1.28:8080/',
+					// target: 'http://8.142.173.95:19527/',
 					// target:'http://192.168.1.28:8080/',
 					changeOrigin: true,
 					rewrite: (p) => p.replace(/^\/dev-api/, '')