update

src/views/main_web/project-list/components/proj-item.vue

@@ -45,9 +45,11 @@
         :class="{'show-operate-bar': isMouseHover && focusProjId == projItem.Id}"
       >
         <el-button
+          v-if="showWatchAll"
           class="bar-item"
           @click.stop="watchAllBtnClick"
         >观全局</el-button>
+        <div class="bar-item-empty" v-else />
         <el-button
           class="bar-item"
           @click.stop="lookProjDetailClick"
@@ -75,6 +77,10 @@ export default {
         return {};
       },
     },
+    showWatchAll: {
+      type: Boolean,
+      default: false,
+    },
     isUserPerm: Boolean,
   },
 
@@ -135,7 +141,11 @@ export default {
     },
     // 点击了观全局按钮
     watchAllBtnClick() {
-      this.$emit("watchAllBtnClick");
+      // this.$emit("watchAllBtnClick");
+      sessionStorage.removeItem("projName");
+      sessionStorage.removeItem("projId");
+      sessionStorage.setItem("projName", this.projItem.ProjName);
+      sessionStorage.setItem("projId", this.projItem.Id);
     },
     // 控制设置图标显示与隐藏
     showSetIcon(Id) {
@@ -306,6 +316,10 @@ export default {
       background-color: #7850ff;
       border-color: #7850ff;
     }
+    &-empty {
+      flex: 1;
+      margin: 0 11px;
+    }
   }
 }
 .height-full {

src/views/main_web/project-list/components/proj-list.vue

@@ -24,6 +24,7 @@
           >
             <proj-item
               :projItem="projItem"
+              :showWatchAll="showWatchAll"
               @lookProjDetailClick="lookProjDetailClick(projItem)"
               @watchAllBtnClick="watchAllBtnClick(projItem, index)"
               @on-remove="onRemoveProject"
@@ -51,6 +52,10 @@ export default {
     ProjItem,
   },
   props: {
+    showWatchAll: {
+      type: Boolean,
+      default: false,
+    },
     projList: {
       type: Array,
       default() {

src/views/main_web/project-list/index.vue

@@ -12,4 +12,5 @@ export default {
     ProjectListComplex,
     ProjectList,
   }
-}
+}
+</script>

src/views/main_web/project-list/list-view.complex.vue

@@ -113,7 +113,7 @@
       <proj-list
         id="proj-list"
         :projList="showProjList"
-        @watchAllBtnClick="watchAllBtnClick"
+        showWatchAll
         @lookProjDetailClick="lookProjDetailClick"
         @on-remove="onRemoveProject"
         @check-parent-project="checkParentProject"
@@ -167,8 +167,8 @@ import SearchBar from "@/components/search-bar/search-bar";
 // import ProjSetting from "@/views/components_web/projSetting/projSetting";
 import { haveAccess, AccessCode } from "@/utils/access";
 import * as prjService from "@/services/project";
-import Timer from "@/views/main_web/time";
-import ProjList from "@/views/main_web/proj-list";
+import Timer from "./components/time";
+import ProjList from "./components/proj-list";
 // import IconTriangleCircle from "@/components/icon-triangle-circle";
 import LinkProjectInfoModal from '@/components/link-project-info-modal';
 
@@ -319,37 +319,6 @@ export default {
           console.log(err);
         });
     },
-    // 接收到proj-item发来的点击
-    watchAllBtnClick(projItem, i) {
-      // const temp = ['341999987607363584','341984912360235008','342002217261621248'];
-      // console.log(projItem);
-      // if(i % 2 == 0 || temp.includes(projItem.Id)) {
-      //   this.toWatchPageClick(projItem);
-      // } else {
-      //   this.toLinkPageClick(projItem);
-      // }
-      this.toWatchPageClick(projItem);
-    },
-    // 跳转到观全局
-    toWatchPageClick(projItem) {
-      this.$router.push({
-        path: "watch",
-      });
-      sessionStorage.removeItem("projName");
-      sessionStorage.removeItem("projId");
-      sessionStorage.setItem("projName", projItem.ProjName);
-      sessionStorage.setItem("projId", projItem.Id);
-    },
-    // 跳转到联动模型展示
-    toLinkPageClick(projItem) {
-      this.$router.push({
-        path: "watchlink",
-      });
-      sessionStorage.removeItem("projName");
-      sessionStorage.removeItem("projId");
-      sessionStorage.setItem("projName", projItem.ProjName);
-      sessionStorage.setItem("projId", projItem.Id);
-    },
     /**
      * 进入回收站
      */

src/views/main_web/project-list/list-view.vue

@@ -73,73 +73,18 @@
         @click.stop="createNewProjectClick"
         v-if="isUserPerm"
       >新建项目</button>
-      <!-- <template v-if="linkApplyList && linkApplyList.length">
-        <div class="group-title">待互链的项目</div>
-        <div class="linkItem-list">
-          <el-row :gutter="64">
-            <el-col
-              :xs="24"
-              :sm="12"
-              :md="12"
-              :lg="8"
-              :xl="6"
-              v-for="linkObj in linkApplyList"
-              :key="linkObj.id"
-            >
-              <div class="linkItem" @click="linkDialogContextData = linkObj, linkDialogVisible = true">
-                <div>
-                  <icon-triangle-circle
-                    class="icon-models"
-                    :size="30"
-                    color="#3C7DFF"
-                  />
-                  <span>项目互链邀请</span>
-                </div>
-                <div>
-                  项目名称
-                </div>
-                <div>
-                  由“企业简称”的“负责人”邀请
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </template> -->
 
-      <!-- <el-button @click.stop="linkDialogVisible = true">弹窗测试</el-button> -->
       <div class="group-title">最近的项目</div>
       <!-- 项目列表 -->
       <proj-list
         id="proj-list"
         :projList="showProjList"
-        @watchAllBtnClick="watchAllBtnClick"
         @lookProjDetailClick="lookProjDetailClick"
         @on-remove="onRemoveProject"
         @check-parent-project="checkParentProject"
         :isUserPerm="isUserPerm"
       >
       </proj-list>
-      <!-- <el-dialog
-        class="linkDialog"
-        width="460px"
-        :visible.sync="linkDialogVisible"
-        :close-on-click-modal="false"
-      >
-        <icon-triangle-circle
-          class="icon-models"
-          :size="24"
-          color="#3C7DFF"
-        />
-        <i class="el-icon-close"  @click="linkDialogVisible = false" />
-        <span class="main-text">"企业简称"建立的“项目名称”，邀请您互链节点“节点名称”</span>
-        <el-button
-          class="block-button"
-          type="primary"
-        >通过新建项目互链</el-button>
-        <el-button class="block-button">选择已有项目建立互链</el-button>
-        <el-button class="block-button">拒绝互链邀请</el-button>
-      </el-dialog> -->
     </div>
     <link-project-info-modal
       :title="`${pickedProject.ProjName}的上层互链项目`"
@@ -167,8 +112,8 @@ import SearchBar from "@/components/search-bar/search-bar";
 // import ProjSetting from "@/views/components_web/projSetting/projSetting";
 import { haveAccess, AccessCode } from "@/utils/access";
 import * as prjService from "@/services/project";
-import Timer from "@/views/main_web/time";
-import ProjList from "@/views/main_web/proj-list";
+import Timer from "./components/time";
+import ProjList from "./components/proj-list";
 // import IconTriangleCircle from "@/components/icon-triangle-circle";
 import LinkProjectInfoModal from '@/components/link-project-info-modal';
 
@@ -319,37 +264,6 @@ export default {
           console.log(err);
         });
     },
-    // 接收到proj-item发来的点击
-    watchAllBtnClick(projItem, i) {
-      // const temp = ['341999987607363584','341984912360235008','342002217261621248'];
-      // console.log(projItem);
-      // if(i % 2 == 0 || temp.includes(projItem.Id)) {
-      //   this.toWatchPageClick(projItem);
-      // } else {
-      //   this.toLinkPageClick(projItem);
-      // }
-      this.toWatchPageClick(projItem);
-    },
-    // 跳转到观全局
-    toWatchPageClick(projItem) {
-      this.$router.push({
-        path: "watch",
-      });
-      sessionStorage.removeItem("projName");
-      sessionStorage.removeItem("projId");
-      sessionStorage.setItem("projName", projItem.ProjName);
-      sessionStorage.setItem("projId", projItem.Id);
-    },
-    // 跳转到联动模型展示
-    toLinkPageClick(projItem) {
-      this.$router.push({
-        path: "watchlink",
-      });
-      sessionStorage.removeItem("projName");
-      sessionStorage.removeItem("projId");
-      sessionStorage.setItem("projName", projItem.ProjName);
-      sessionStorage.setItem("projId", projItem.Id);
-    },
     /**
      * 进入回收站
      */