wenbobowen hace 4 años
padre
commit
36d8a9ae1f

+ 23 - 3
src/components/newLayout/Head.vue

@@ -44,12 +44,27 @@
             <div class="item">
               <div v-if="navTagType === 1" class="label line" @click="setNavTagType(2)">
                 顶部导航
+                <el-tooltip effect="dark" content="当前为左侧导航,点击切换为顶部导航。" placement="top-start">
+                  <i class="el-icon-info" />
+                </el-tooltip>
               </div>
               <div v-if="navTagType === 2" class="label line" @click="setNavTagType(1)">
                 侧边导航
+                <el-tooltip effect="dark" content="当前为顶部导航,点击切换为侧边导航。" placement="top-start">
+                  <i class="el-icon-info" />
+                </el-tooltip>
               </div>
-              <div class="label line">
+              <div v-if="openPageHandle === 'self'" class="label line" @click="setOpenPageHandle('blank')">
                 详情页当前标签页打开
+                <el-tooltip effect="dark" content="当前详情页在新标签页打开,点击切换详情页在当前标签页打开。" placement="top-start">
+                  <i class="el-icon-info" />
+                </el-tooltip>
+              </div>
+              <div v-if="openPageHandle === 'blank'" class="label line" @click="setOpenPageHandle('self')">
+                详情页新标签页打开
+                <el-tooltip effect="dark" content="当前详情页在当前标签页打开,点击切换详情页在新标签页打开。" placement="top-start">
+                  <i class="el-icon-info" />
+                </el-tooltip>
               </div>
             </div>
             <div class="title line" :class="memberCheck && 'clickText'" @click="administratorsJump()">
@@ -100,7 +115,8 @@ export default {
       headList: routes.filter(item => item.name !== '业务线'),
       userInfo: null,
       memberCheck: false,
-      target: true
+      target: true,
+      openPageHandle: localStorage.getItem('openPageHandle') || 'blank'
     }
   },
   computed: {
@@ -152,6 +168,10 @@ export default {
       this.$store.dispatch('global/setNavTagType', type)
       localStorage.setItem('navTagType', type)
     },
+    setOpenPageHandle(type) {
+      this.openPageHandle = type
+      localStorage.setItem('openPageHandle', type)
+    },
     // 获取登录人员信息
     async getLoginUser() {
       const res = await memberGetLoginInMemberInfoByLdap()
@@ -277,7 +297,7 @@ export default {
   }
 }
 .user-admin-one {
-  height: 190px;
+  // height: 190px;
   .title {
     cursor: no-drop;
     .icon {

+ 2 - 7
src/views/projectManage/projectList/projectIndex.vue

@@ -4,11 +4,7 @@
       <div class="stylus-title">
         <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">项目</span>
         <div class="new-tab-open">
-          <el-switch
-            v-model="newTabOpen"
-            active-text="新标签页跳转"
-            @change="logHandle('switchJumpOpen')"
-          />
+          <!-- 这个可以放按钮 -->
         </div>
         <div>
           <el-button type="primary" size="mini" @click="home_created_project">新建项目</el-button>
@@ -341,7 +337,6 @@ import '@/views/projectManage/publicCss/index.css'
 export default {
   data() {
     return {
-      newTabOpen: true, // 是否新的tab页打开
       curIndex: 1,
       pageSize: 15,
       activeColor: 'red',
@@ -449,7 +444,7 @@ export default {
     },
     link_project(id) {
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
-      if (this.newTabOpen) {
+      if (localStorage.getItem('openPageHandle') === 'blank') {
         const newTab = this.$router.resolve({ name: '项目详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')
       } else {

+ 3 - 7
src/views/projectManage/requirement/list/index.vue

@@ -4,11 +4,7 @@
       <div class="stylus-title">
         <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">需求</span>
         <div class="new-tab-open">
-          <el-switch
-            v-model="newTabOpen"
-            active-text="新标签页跳转"
-            @change="logHandle('switchJumpOpen')"
-          />
+          <!-- 这个可以放按钮 -->
         </div>
         <el-button type="primary" size="mini" @click="createDialogVisible = true">新建需求</el-button>
       </div>
@@ -282,7 +278,7 @@ export default {
           }
         }]
       },
-      newTabOpen: true, // 是否新的tab页打开
+      // newTabOpen: true, // 是否新的tab页打开
       DemandStatus: true, // 筛选需求时长
       extraUrgent: extraUrgent,
       isFromDpmList: [{ id: true, name: '是' }, { id: false, name: '否' }],
@@ -541,7 +537,7 @@ export default {
     },
     getToRequirementDetails(id) { // table点击跳转
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
-      if (this.newTabOpen) {
+      if (localStorage.getItem('openPageHandle') === 'blank') {
         const newTab = this.$router.resolve({ name: '需求详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')
       } else {

+ 29 - 35
src/views/projectManage/taskList/taskIndex.vue

@@ -4,11 +4,7 @@
       <div class="stylus-title">
         <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;padding-left: 15px">任务</span>
         <div class="new-tab-open">
-          <el-switch
-            v-model="newTabOpen"
-            active-text="新标签页跳转"
-            @change="logHandle('switchJumpOpen')"
-          />
+          <!-- 这个可以放按钮 -->
         </div>
         <div>
           <el-button
@@ -27,32 +23,14 @@
               <el-input v-model="form_task.name" size="small" clearable style="width:72% !important;" placeholder="请输入标题或ID或望岳ID" @change="get_taskList()" />
             </div>
             <div class="Layout">
-              <div class="queryName marginLeft">负责人</div>
-              <el-select
-                v-model="form_task.PersonInCharge"
-                clearable
-                filterable
-                remote
-                placeholder="请输入姓名或邮箱前缀"
-                :remote-method="remoteMethod"
-                :loading="loading"
-                size="small"
-                @change="get_taskList()"
-              >
-                <el-option v-for="item in options" :key="item.idap" :label="item.name" :value="test2(item, 0)">
-                  <div class="flex_start">
-                    <div class="deptName">{{ item.deptName }}</div>
-                    <div style="min-width:80px">{{ item.name }}</div>
-                    <div class="deptName">{{ item.idap }}</div>
-                  </div>
-                </el-option>
+              <div class="queryName marginLeft">状态</div>
+              <el-select v-model="form_task.statusList" size="small" multiple clearable filterable placeholder="请选择" @change="get_taskList()">
+                <el-option v-for="item in daStatus" :key="item.code" :label="item.msg" :value="item.code" />
               </el-select>
             </div>
             <div class="Layout">
-              <div class="queryName marginLeft">优先级</div>
-              <el-select v-model="form_task.priority" size="small" clearable filterable placeholder="请选择" @change="get_taskList()">
-                <el-option v-for="item in arr_priority" :key="item.value" :label="item.name" :value="item.value" />
-              </el-select>
+              <div class="queryName marginLeft">模块</div>
+              <el-cascader v-model="form_task.moduleIds" size="small" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width:77% !important;" @change="get_taskList()" />
             </div>
           </el-form>
         </div>
@@ -85,13 +63,30 @@
           <div class="Layout" style="margin: 15px 0;">
             <el-form :model="form_task" class="flex_start">
               <div class="Layout">
-                <div class="queryName">模块</div>
-                <el-cascader v-model="form_task.moduleIds" size="small" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width:77% !important;" />
+                <div class="queryName">优先级</div>
+                <el-select v-model="form_task.priority" size="small" clearable filterable placeholder="请选择">
+                  <el-option v-for="item in arr_priority" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
               </div>
               <div class="Layout marginLeft">
-                <div class="queryName">状态</div>
-                <el-select v-model="form_task.statusList" size="small" multiple clearable filterable placeholder="请选择">
-                  <el-option v-for="item in daStatus" :key="item.code" :label="item.msg" :value="item.code" />
+                <div class="queryName">负责人</div>
+                <el-select
+                  v-model="form_task.PersonInCharge"
+                  clearable
+                  filterable
+                  remote
+                  placeholder="请输入姓名或邮箱前缀"
+                  :remote-method="remoteMethod"
+                  :loading="loading"
+                  size="small"
+                >
+                  <el-option v-for="item in options" :key="item.idap" :label="item.name" :value="test2(item, 0)">
+                    <div class="flex_start">
+                      <div class="deptName">{{ item.deptName }}</div>
+                      <div style="min-width:80px">{{ item.name }}</div>
+                      <div class="deptName">{{ item.idap }}</div>
+                    </div>
+                  </el-option>
                 </el-select>
               </div>
               <div class="Layout marginLeft">
@@ -313,7 +308,6 @@ export default {
           }
         }]
       },
-      newTabOpen: true, // 是否新的tab页打开
       header_show: true,
       props: {
         value: 'id',
@@ -472,7 +466,7 @@ export default {
     },
     link_task(id) {
       const bizId_id = EncryptId(`${this.bizId}_${id}`)
-      if (this.newTabOpen) {
+      if (localStorage.getItem('openPageHandle') === 'blank') {
         const newTab = this.$router.resolve({ name: '任务详情', query: { bizId_id: bizId_id }})
         window.open(newTab.href, '_blank')
       } else {