fix bug

src/router/index.js

@@ -4,6 +4,7 @@ import navStore from '../store/nav.js'
 import keepAliveStore from '../store/keepAlive.js'
 import generatedRoutes from '~pages'
 import { setupLayouts } from 'layouts-generated'
+import { removeWatermark } from '@/utils/watermark.js'
 
 // 导出路由
 const routes = setupLayouts(generatedRoutes)
@@ -23,6 +24,7 @@ router.beforeEach((to, from, next) => {
     keepAlive.add(to.name) // 将路由名称添加到 keepAlive 集合中
   }
   if (to.path === '/') {
+    removeWatermark()
     const menu = { active: 0, subActive: 0 }
     localStorage.setItem('index', JSON.stringify(menu))
     localStorage.setItem('data-type', 'project')

src/views/project/componens/info2.vue

@@ -15,11 +15,20 @@
         @refresh-change="refreshChange"
       >
         <template #menu="{ row }">
-          <preview :id="row.bladeFileId">
-            <template #title>
-              <el-button type="primary" text icon="View">查看</el-button>
-            </template>
-          </preview>
+          <div class="flex flex-center">
+            <preview :id="row.bladeFileId">
+              <template #title>
+                <el-button type="primary" text icon="View">查看</el-button>
+              </template>
+            </preview>
+            <el-button
+              type="primary"
+              text
+              icon="Delete"
+              @click="this.$refs.crud.rowDel(row)"
+              >删除</el-button
+            >
+          </div>
         </template>
         <template #menu-left>
           <div class="flex flex-center">
@@ -84,13 +93,13 @@ export default {
       option: {
         align: 'center',
         menuAlign: 'center',
-        menuWidth: 180,
+        menuWidth: 240,
         size: 'mini',
         addBtn: false,
         editBtn: true,
         editBtnText: '编辑文号',
         viewBtn: false,
-        delBtn: true,
+        delBtn: false,
         columnBtn: false,
         labelWidth: 140,
         border: true,

src/views/project/componens/info3.vue

@@ -60,21 +60,13 @@ export default {
     }
   },
   watch: {
-    projectId: {
-      handler(val) {
-        if (val.length > 0) {
-          this.onLoad()
-        }
-      },
-      immediate: true
-    },
     stageId: {
       handler(val) {
         if (val.length > 0) {
           this.onLoad()
         }
       },
-      immediate: true
+      immediate: false
     }
   },
   data() {

src/views/project/index.vue

@@ -46,7 +46,10 @@
       <info8 v-if="user.info.type === 4" :project-id="projectId" />
     </div>
     <!--    buttom-->
-    <div class="bottom flex flex-center flex-justify-end">
+    <div
+      class="bottom flex flex-center flex-justify-end"
+      v-if="user.info.type === 3"
+    >
       <div class="padding">
         <el-button type="primary" plain @click="projectCancel">退 库</el-button>
         <el-button
@@ -54,22 +57,22 @@
           v-if="[0, 1, 4].includes(detail.report_type)"
           @click="projectReport"
           plain
-          >上报审核
-        </el-button>
+          >上报审核</el-button
+        >
         <el-button
           type="primary"
           plain
           v-if="detail.report_type === 2"
           @click="$refs.approval.show()"
-          >审 核
-        </el-button>
+          >审 核</el-button
+        >
         <el-button
           type="primary"
           plain
           v-if="detail.report_type === 3"
           @click="projectReportFormal"
-          >上报到固定资产
-        </el-button>
+          >上报到固定资产</el-button
+        >
         <el-button type="primary" @click="nextStage">下一阶段</el-button>
       </div>
     </div>

src/views/resource/component/preview.vue

@@ -18,7 +18,7 @@
           {{ data ? data.title : '' }}
         </h4>
       </template>
-      <div v-watermark="{ text: '22' }">
+      <div>
         <div v-if="data">
           <div v-if="data.imgs.length === 0" class="flex flex-center">
             <div v-html="data.content" class="preview"></div>