*

dsk-operate-ui/src/api/common.js

@@ -24,3 +24,11 @@ export const historyClaim= function historyClaim(name) {
     method: 'Put',
   })
 }
+
+//获取大司空open 插件访问token
+export function dskAccessToken() {
+  return request({
+    url: '/system/config/dsk/accessToken',
+    method: 'get',
+  })
+}

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -99,7 +99,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          localStorage.removeItem('views')  //清空导航栏上的数据
+          sessionStorage.removeItem('views')  //清空导航栏上的数据
           location.href = '/index';
         })
       }).catch(() => {});
@@ -111,7 +111,7 @@ export default {
             setToken(res.data.token)
             setTenantid(id)
             store.commit('SET_TOKEN', res.data.token)
-            localStorage.removeItem('views')  //清空导航栏上的数据
+            sessionStorage.removeItem('views')  //清空导航栏上的数据
             if(this.$route.path == '/index'){
               location.reload();
             }else{

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -8,8 +8,7 @@
           <!--<i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i>-->
           </div>
         <el-collapse-transition>
-        <div class="tagslist" v-if="showall">
-          <draggable v-model="visitedViews" :options="dragOptions" @end="end">
+        <div class="tagslist" :class="{'noshow':!showall}">
             <router-link
               v-for="(tag, index) in visitedViews"
               ref="tag"
@@ -22,12 +21,10 @@
             >
               <div @click="changetags">
                 <i class="el-icon-check"></i>
-                <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+                <span :id="isActive(tag)?'tagTitles':''">{{ tag.title }}</span>
               </div>
             </router-link>
             <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
-
-          </draggable>
         </div>
         </el-collapse-transition>
       </div>
@@ -154,7 +151,7 @@ export default {
           // li.matched = view.matched //此条数据放出会报错
           viewlist.push(li)
         })
-        localStorage.setItem("views",JSON.stringify(viewlist))
+        sessionStorage.setItem("views",JSON.stringify(viewlist))
     },
     changetags(){
       this.showall = false
@@ -463,6 +460,8 @@ export default {
       height: 24px;
     }
     .tagslist{
+      transition: all 0.2s;
+      display: block;
       position: absolute;
       left: 0;
       top: 32px;
@@ -517,6 +516,11 @@ export default {
         }
       }
     }
+    .noshow{
+      display: none;
+      opacity: 0;
+      /*height: 0;*/
+    }
   }
 }
 </style>

dsk-operate-ui/src/layout/index.vue

@@ -63,11 +63,10 @@ export default {
     this.$nextTick(() => {
       this.listenSider()
     })
-    // console.log(9999)
-    let views = localStorage.getItem('views')
+    let views = sessionStorage.getItem('views')
     if(views!=null){
     this.$store.state.tagsView.visitedViews = JSON.parse(views)
-    localStorage.removeItem('views')
+    // sessionStorage.removeItem('views')
     }
   },
   methods: {

dsk-operate-ui/src/permission.js

@@ -32,6 +32,7 @@ router.beforeEach((to, from, next) => {
         }).catch(err => {
             store.dispatch('LogOut').then(() => {
               Message.error(err)
+              sessionStorage.removeItem('views')
               next({ path: '/' })
             })
           })

dsk-operate-ui/src/utils/request.js

@@ -107,6 +107,7 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
+            sessionStorage.removeItem('views')
             location.href = '/index';
           })
       }).catch(() => {

dsk-operate-ui/src/views/project/projectList/component/gjjl.vue

@@ -125,6 +125,13 @@
               </div>
             </div>
           </div>
+
+          <div class="tables" style="margin-top: 0" v-if="recordlist.rows && recordlist.rows.length == 0">
+            <div class="empty">
+              <img class="img" src="@/assets/images/project/empty.png">
+              <div class="p1">抱歉，您还未添加跟进动态</div>
+            </div>
+          </div>
           <div class="tables" v-if="recordlist.total>pageSize">
             <div class="bottems">
               <el-pagination
@@ -144,11 +151,12 @@
 </template>
 
 <script>
-  import "@/assets/styles/project.scss"
-  import {getFollowList,addFollowRecord,getUserList,delFollowRecord} from '@/api/custom/custom'
-  import {getGJJL,addGJJL,delGJJL,relateProject,allRecord} from '@/api/project/project'
-  import {getEnterprise,getDictType,} from '@/api/main'
+  import '@/assets/styles/project.scss'
+  import { addFollowRecord, delFollowRecord, getFollowList, getUserList } from '@/api/custom/custom'
+  import { addGJJL, allRecord, delGJJL, getGJJL, relateProject } from '@/api/project/project'
+  import { getDictType, getEnterprise } from '@/api/main'
   import skeleton from './skeleton'
+
   export default {
     components:{skeleton},
     props:{

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -203,21 +203,27 @@
       },
       getList(){
         this.isSkeleton = true
-        getZLWD(this.param).then(res=>{
-          this.fileDatas = res
+        getZLWD(this.param).then(res => {
           this.isSkeleton = false
-          if(this.fileDatas.rows!=null && this.fileDatas.rows.length>0){
-            this.fileDatas.rows.forEach(item=>{
+          if (res.code == 200) {
+            this.fileDatas = res
+            if (this.fileDatas.rows != null && this.fileDatas.rows.length > 0) {
+              this.fileDatas.rows.forEach(item => {
                 let names = item.filePath.split('/')
-              item.name = names[names.length-1]
+                item.name = names[names.length - 1]
                 let types = item.name.split('.')
-              item.type = types.length>1?types[1]:'file'
-              if(item.type == 'xls' || item.type == 'xlsx' )
+                item.type = types.length > 1 ? types[1] : 'file'
+                if (item.type == 'xls' || item.type == 'xlsx') {
                   item.type = 'excel'
-              if(item.type == 'doc' || item.type == 'docx' )
+                }
+                if (item.type == 'doc' || item.type == 'docx') {
                   item.type = 'word'
+                }
               })
             }
+          }else{
+            this.fileDatas.total = 0
+          }
         })
       },
       getFile(row){