Explorar o código

修改涉密bug

“yueshang” hai 1 ano
pai
achega
de81fc9cc6

+ 7 - 0
src/views/department/MyFile.vue

@@ -40,9 +40,11 @@
                                   class="box-item tool-tip"
                                   effect="dark"
                                   placement="top-start"
+                                  v-if="item.encryptLevel"
                                > 
                                <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">{{ item.dirName }}</p>
                               <img class="levelImg" v-if="item.isEncrypt === 'Y'" :src="getLevelImg(item.encryptLevel)" alt="">
                           </div>
@@ -170,10 +172,12 @@
                                                     effect="dark"
                                                     placement="top"
                                                     :show-after="1000"
+                                                    v-if="scope.row.encryptLevel"
                                                 > 
                                                 <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>
                                         </span>
                                     </template>
                                 </el-table-column>
@@ -235,10 +239,13 @@
                                                     effect="dark"
                                                     placement="top"
                                                     :show-after="1000"
+                                                    v-if="scope.row.encryptLevel"
                                                 >
                                                 <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                                    <span class="shouzhi">{{ scope.row.fileName }}</span>
                                                 </el-tooltip>
+                                                <span class="shouzhi" v-else>{{ scope.row.fileName }}</span>
+
                                         </span>
                                         </template>
                                     </el-table-column>

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

@@ -41,9 +41,11 @@
                                   class="box-item tool-tip"
                                   effect="dark"
                                   placement="top-start"
+                                  v-if="item.encryptLevel"
                                > 
-                               <template #content> 安全级别: {{ item.encryptLevel == 'L1'?'敏感':(item.encryptLevel == 'L2'?'涉密':(item.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
+                               <template #content><span>安全级别: {{ item.encryptLevel == 'L1'?'敏感':(item.encryptLevel == 'L2'?'涉密':(item.encryptLevel == 'L3'?'机密':'绝密')) }}</span>  </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">{{ item.dirName }}</p>
                               <img class="levelImg" v-if="item.isEncrypt === 'Y'" :src="getLevelImg(item.encryptLevel)" alt="">
                           </div>
@@ -126,6 +128,19 @@
                                 <span style="font-size: 14px;" class="shouzhi">新建</span>
                             </div>
                         </div>
+                        <div
+                            style="display: flex;width: 102px;height: 32px;justify-content: flex-start;align-items: center;" :class="!thisFolder.dirType?'yincang':'xianshi'">
+                            <div style="margin-left: 5px;">
+                                <el-icon
+                                    style="background-color: #7084B4;width: 24px;height: 24px;border-radius: 50%;color: white;"
+                                    @click="createNewMenu(1)">
+                                    <Plus />
+                                </el-icon>
+                            </div>
+                            <div style="margin-left: 5px;" @click="createNewMenu(1)">
+                                <span style="font-size: 14px;" class="shouzhi">新建文档</span>
+                            </div>
+                        </div>
                         <template v-for="(item, index) in useMenu" :key="index">
                             <div :class="{ 'isCheck': haveCheck }"
                                 style="display: flex;width: 82px;opacity:0.5;height: 32px;justify-content: flex-start;align-items: center;line-height: 18px;cursor: pointer;"
@@ -188,10 +203,12 @@
                                                         :content="scope.row.dirName"
                                                         placement="top"
                                                         :show-after="1000"
+                                                        v-if="scope.row.encryptLevel"
                                                     >
                                                     <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>
                                             </span>
                                         </template>
                                     </el-table-column>
@@ -253,10 +270,12 @@
                                                         effect="dark"
                                                         placement="top"
                                                         :show-after="1000"
+                                                        v-if="scope.row.encryptLevel"
                                                     >
                                                     <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                                     <span class="shouzhi">{{ scope.row.fileName }}</span>
                                                     </el-tooltip>
+                                                    <span class="shouzhi" v-else>{{ scope.row.fileName }}</span>
                                             </span>
                                             </template>
                                         </el-table-column>
@@ -389,6 +408,8 @@
     <!-- 二次密码验证 -->
     <inputPassword v-if="showInputPassword" @surePass="surePass" @closeIptPass="closeIptPass" :showInputPassword="showInputPassword"></inputPassword>
     <div v-loading.fullscreen="loadingPreview" v-if="loadingPreview" class="lodingBox"></div>
+    <!-- 新增文档 -->
+    <AddFile v-if="newAdd" :newAdd="newAdd" @threeBe="threeBe"></AddFile>
 </template>
 
 <script>
@@ -400,6 +421,7 @@ import documents from '../../api/document/document'
 import fileCount from '../../api/fileCount/fileCount'
 import FileTree from './components/FileTree.vue'
 import BreadMenu from './components/BreadMenu.vue'
+import AddFile from '../myjoin/components/AddFile.vue'
 // import FileEdit from './components/FileEdit.vue'
 import TransferModal from './modalComponebts/Transfer.vue'
 import CreateFloder from './modalComponebts/CreateFloder.vue'
@@ -488,6 +510,7 @@ export default {
         const historyPrew = ref(false)
         let xz = ref(0)
         let yz = ref(0)
+        let newAdd = ref(false)
         const fileUserTreeData = reactive({ data: {} });
         let fileList = ref()
         let menuList = ref([
@@ -964,8 +987,16 @@ export default {
             anyP.value = false
         }
         function createNewMenu(num) {
-            oneOrTwo.value = num
-            folderCase.value = true
+            if(num==1) {
+                newAdd.value = true
+            }else{
+                oneOrTwo.value = num
+                folderCase.value = true
+            }
+            console.log('num', num,newAdd.value)
+        }
+        function threeBe(data){
+            newAdd.value = data
         }
         function cancleHistoryPrew(val) {
             historyPrew.value = false
@@ -1775,12 +1806,14 @@ export default {
             downLoadfile,
             addTab,
             addFolderAdd,
-            addFileTab
+            addFileTab,
+            threeBe
         }
     },
     watch: {
     },
     components: {
+        AddFile,
         BreadMenu,
         // FileEdit,
         ImgPreview,
@@ -2122,4 +2155,7 @@ p {
         visibility: hidden;
     }
 } 
+.yincang{
+    opacity:0.5;
+}
 </style>

+ 27 - 30
src/views/myjoin/components/AddFile.vue

@@ -1,34 +1,30 @@
 <template>
-    <div>
-        <div>
-            <el-dialog v-model="addFile" title="新建文件" width="30%" @close="backTo">
-                <el-form :model="createFile">
-                    <el-form-item label="文件目录">
-                        <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick" />
-                    </el-form-item>
-                    <el-form-item label="你选择的目录是">
-                        <p>{{ nowFolder }}</p>
-                    </el-form-item>
-                    <el-form-item label="文件名">
-                        <el-input v-model="createFile.name" maxlength="150" placeholder="请输入文件名" type="textarea" />
-                    </el-form-item>
-                    <el-form-item label="文件类型">
-                        <el-select v-model="createFile.fileType" clearable placeholder="Select" @change="optChange">
-                            <el-option v-for="item in typeF" :key="item.value" :label="item.label" :value="item.value" />
-                        </el-select>
-                    </el-form-item>
-                </el-form>
-                <template #footer>
-                    <span class="dialog-footer">
-                        <el-button @click="back">取消</el-button>
-                        <el-button type="primary" @click="sureAddFile">
-                            确定
-                        </el-button>
-                    </span>
-                </template>
-            </el-dialog>
-        </div>
-    </div>
+    <el-dialog title="新建文件" width="30%" @close="backTo">
+        <el-form :model="createFile">
+            <el-form-item label="文件目录">
+                <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick" />
+            </el-form-item>
+            <el-form-item label="你选择的目录是">
+                <p>{{ nowFolder }}</p>
+            </el-form-item>
+            <el-form-item label="文件名">
+                <el-input v-model="createFile.name" maxlength="150" placeholder="请输入文件名" type="textarea" />
+            </el-form-item>
+            <el-form-item label="文件类型">
+                <el-select v-model="createFile.fileType" clearable placeholder="Select" @change="optChange">
+                    <el-option v-for="item in typeF" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="back">取消</el-button>
+                <el-button type="primary" @click="sureAddFile">
+                    确定
+                </el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script>
@@ -114,6 +110,7 @@ export default {
             createFile.value.fileType = e
         }
         onMounted(() => {
+            console.log('11', 11)
             inlineList()
             getFileTree()
         })

+ 6 - 0
src/views/publicment/MyFile.vue

@@ -40,9 +40,11 @@
                                   class="box-item tool-tip"
                                   effect="dark"
                                   placement="top-start"
+                                  v-if="item.encryptLevel"
                                > 
                                <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">{{ item.dirName }}</p>
                               <img class="levelImg" v-if="item.isEncrypt === 'Y'" :src="getLevelImg(item.encryptLevel)" alt="">
                           </div>
@@ -170,10 +172,12 @@
                                                     effect="dark"
                                                     placement="top"
                                                     :show-after="1000"
+                                                    v-if="scope.row.encryptLevel"
                                                 >
                                                 <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.fileName }}</span>
                                         </span>
                                     </template>
                                 </el-table-column>
@@ -235,10 +239,12 @@
                                                     effect="dark"
                                                     placement="top"
                                                     :show-after="1000"
+                                                    v-if="item.encryptLevel"
                                                 >
                                                 <template #content> {{ scope.row.encryptLevel == 'L1'?'敏感':(scope.row.encryptLevel == 'L2'?'涉密':(scope.row.encryptLevel == 'L3'?'机密':'绝密')) }} </template>
                                                    <span class="shouzhi">{{ scope.row.fileName }}</span>
                                                 </el-tooltip>
+                                                <span class="shouzhi" v-else>{{ scope.row.fileName }}</span>
                                         </span>
                                         </template>
                                     </el-table-column>