主页面的修改

package-lock.json

@@ -1775,6 +1775,87 @@
         "webpack-chain": "^6.4.0",
         "webpack-dev-server": "^3.11.0",
         "webpack-merge": "^4.2.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -12393,87 +12474,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-particles": {
       "version": "1.0.9",
       "resolved": "https://registry.npmmirror.com/vue-particles/-/vue-particles-1.0.9.tgz",

src/App.vue

@@ -130,6 +130,18 @@ export default {
   }
   </style>
 <style lang="less">
+.el-table{
+  border: 1px solid rgba(124,124,124) !important;
+}
+.el-table tr td{
+  border-bottom: 1px solid rgba(124,124,124) !important;
+}
+.el-table tr td:first-child{
+  border-right: 1px solid rgba(124,124,124) !important;
+}
+.el-table tr td:last-child{
+  border-left: 1px solid rgba(124,124,124) !important;
+}
 .cursor_pointer{
   cursor:pointer
 }
@@ -218,7 +230,7 @@ html, body, #app {
 .custom-table-header > th {
   word-break: break-word;
   background: var(--bg) !important;
-  color: #fff;
+  color: var(--color);
   height: 40px;
   font-size: 13px;
 }

src/store/modules/user.js

@@ -14,7 +14,7 @@ export default {
     currentNum: 0,
     record: [],
     webSocket: null,
-    permissions: []
+    permissions: [],
   },
 
   mutations: {

src/store/persisPlugin.js

@@ -1,8 +1,13 @@
 const KEY = 'VUEX_STORE'
+import Cookies from "js-cookie";
 export default function(store){
+   
     //保存仓库数据到本地
     window.addEventListener('beforeunload',()=>{
-        localStorage.setItem(KEY, JSON.stringify(store.state))
+        if(Cookies.get('token')){
+            localStorage.setItem(KEY, JSON.stringify(store.state))
+        }
+        
     })
     //恢复仓库数据
     try{

src/utils/reportPermission.js

@@ -4,7 +4,7 @@ export const reportPermission = (reportId, roles) => {
     if(!reportId){
         return true
     }
-  const role = Store.state.admin.userinfo
+  const role = Store.state.user.userinfo
     if(role.roleType === 1){
         return true
     }

src/views/event/components/view/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="eventTable">
     <div>
-      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header"
+      <el-table :data="tableData"  style="width: 100%" header-row-class-name="custom-table-header"
         >
         <el-table-column label="#" width="60" type="index" align="center">
           <template slot-scope="scope">
@@ -61,7 +61,7 @@ export default {
     tableData: {//数据
       type: Array,
       default: () => {
-        return [{ name: '123', eventNumber: 2, projectNumber: 3, projectNumber1: [{ name: '场景一' }, {name:'场景二'}]},]
+        return [{ name: '123', eventNumber: 2, projectNumber: 3, projectNumber1: [{ name: '场景一' }, {name:'场景二'}]},{}]
       }
     },
     queryParams: {//分页信息

src/views/home/components/carousel.vue

@@ -1,150 +1,36 @@
 <template>
   <div>
-      <el-carousel trigger="click" height="150px" type="card" arrow="always">
-        <el-carousel-item v-for="item in carousels" :key="item.name" style="display:flex;flex-direction: column;align-items: center;">
-            <p>{{ item.name }}</p>
-            <p>怎么做？请<el-link type="primary" style="font-size: 16px;vertical-align:baseline" @click="open(item)">点击</el-link>我,让我来帮助你</p>
-          </el-carousel-item>
-          <!-- <el-carousel-item v-for="item in 1" :key="item" style="text-align:center;vertical-align:middle;">
-            <component :is='`carousel_${item}`'></component>
-          </el-carousel-item> -->
-        </el-carousel>
-
-        <el-dialog
-            :visible.sync="dialogVisible"
-            width="600px"
-            custom-class="event"
-            :before-close="handleClose"
-            append-to-body>
-            <addQuestion @formData="handleFormData" :type="type" @resetClose="handleClose" :row="row"></addQuestion>
-        </el-dialog>
+    <el-carousel :interval="4000" type="card">
+      <el-carousel-item v-for="item in srcList" :key="item.src">
+        <el-image :src="require('@/assets/' + item.src)" class="medium"></el-image>
+      </el-carousel-item>
+    </el-carousel>
   </div>
 </template>
 
 <script>
-import carousel_1 from './carousels/carousel_1.vue';
-import addQuestion from '@/views/questionEvent/components/addQuestion.vue';
 export default {
-  components: {
-    carousel_1,
-    addQuestion
-  },
+  components: {},
   props: {},
   data() {
     return {
-        carousels:[
-            {
-                name:'我要做专利培育布局',
-                value:1,
-                placeholder:'xx产品或技术专利培育布局',
-            },
-            {
-                name:'我要产品上市/控制出口风险',
-                value:2,
-                placeholder:'xx产品上市/出口风险控制',
-            },
-            {
-                name:'我要处理侵权纠纷',
-                value:3,
-                placeholder:'xx专利侵权纠纷',
-            },
-            {
-                name:'我要进行专利盘点与运维',
-                value:4,
-                placeholder:'',
-            },
-            {
-                name:'我要专利维权',
-                value:5,
-                placeholder:'',
-            },
-            {
-                name:'我要做科技与重大立项专利导航',
-                value:6,
-                placeholder:'',
-            },
-            {
-                name:'我要IPO上市',
-                value:7,
-                placeholder:'xx地区IPO上市',
-            },
-            {
-                name:'我要应对竞争对手威胁',
-                value:8,
-                placeholder:'',
-            },
-        ],
-        type:1,
-        row:{},
-        dialogVisible:false,
-
+      srcList: [
+        { src: 'lun1.jpg' },
+        { src: 'lun2.jpg' },
+        { src: 'lun3.jpg' },
+      ],
     };
   },
   watch: {},
   computed: {},
   created() {},
   mounted() {},
-  methods: {
-    open(item){
-        this.row = {
-            applicationScenarios : [item.value],
-            placeholder : item.placeholder
-        }
-        this.dialogVisible = true
-    },
-    handleClose(){
-        this.dialogVisible = false
-        this.row = {}
-    },
-    async getCommonData() {
-      await this.$api.getCommonData({ keys: 'QUERY_GROUP,ENTERPRISE_APPLICATION_SCENARIO,INVESTIGATION_TYPE' }).then(response => {
-        this.commonData = response.data
-      })
-    },
-
-    //新增事件
-    handleFormData({ list, option,edit }) {
-        console.log(list)
-      let lists = JSON.parse(JSON.stringify(list))
-      if(lists.length == 0){
-        this.handleClose()
-        return false
-      }
-      this.forms = {
-        projectId: this.projectId,
-        eventAddNewDTOs:lists
-      }
-      this.$api.eventAddNew(this.forms).then(res => {
-        if (res.code == 200) {
-          this.$message.success('事件新增成功')
-          this.visualRouter(lists)//跳转
-          this.handleClose()
-        }
-      }).catch(error => {
-        this.$message.error(error.message)
-      })
-
-    },
-    visualRouter(val){
-        if(val.length ==1){
-            if( val[0].applicationScenarios.length == 0){
-                return false
-            }
-            var visuals = {
-                Scenario:null,
-                eventId:null,
-                eventName:val[0].questionName
-            }
-            this.$router.push({
-                path:'/eventVisual',
-                query:{
-                    visuals:JSON.stringify(visuals)
-                }
-            })
-        }
-    },
-  },
+  methods: {},
 };
 </script>
 <style lang="scss" scoped>
+  .medium {
+    width: 100%;
+    height: 100%;
+  }
 </style>

src/views/home/components/tabs.vue

@@ -0,0 +1,61 @@
+<template>
+  <div>
+    <div id="step3">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="事件" name="event">
+          <eventTable :isOperate="'首页'"></eventTable>
+        </el-tab-pane>
+        <el-tab-pane label="专题库" name="project">
+          <projectTable :isOperate="'首页'"></projectTable>
+        </el-tab-pane>
+        <el-tab-pane label="报告" name="report">
+          <reportTable :isOperate="'首页'"></reportTable>
+        </el-tab-pane>
+        <el-tab-pane label="我的任务" name="task">
+          <taskTable></taskTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div>
+      <el-link class="link" @click="seeMore">查看更多> > ></el-link>
+    </div>
+  </div>
+</template>
+
+<script>
+import eventTable from '@/views/event/components/view/table.vue';
+import projectTable from '@/views/project/components/view/table.vue';
+import reportTable from '@/views/report/components/view/table.vue';
+import taskTable from '@/views/task/components/view/table.vue';
+export default {
+  components: {
+    eventTable,
+    projectTable,
+    reportTable,
+    taskTable,
+  },
+  props: {},
+  data() {
+    return {
+        activeName: 'event',
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {
+    //切换tag
+    handleClick() { },
+    // 点击查看更多
+    seeMore() {},
+  },
+};
+</script>
+<style lang="scss" scoped>
+    .link {
+      float: right;
+      margin-top: 10px;
+      color: #409EFF;
+    }
+</style>

src/views/home/index.vue

@@ -1,12 +1,8 @@
 <template>
   <div class="home">
     <div class="main">
-      <div id="step1">
-        <el-carousel :interval="4000" type="card">
-          <el-carousel-item v-for="item in srcList" :key="item.src">
-            <el-image :src="require('../../assets/' + item.src)" class="medium"></el-image>
-          </el-carousel-item>
-        </el-carousel>
+      <div class="carousel" id="step1">
+        <carousel></carousel>
       </div>
       <div class="title">
         <h2>知识产权风控与组织记忆系统</h2>
@@ -21,24 +17,8 @@
           </el-input>
         </div>
       </div>
-      <div id="step3">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="事件" name="event">
-            <eventTable :isOperate="'首页'"></eventTable>
-          </el-tab-pane>
-          <el-tab-pane label="专题库" name="project">
-            <projectTable :isOperate="'首页'"></projectTable>
-          </el-tab-pane>
-          <el-tab-pane label="报告" name="report">
-            <reportTable :isOperate="'首页'"></reportTable>
-          </el-tab-pane>
-          <el-tab-pane label="我的任务" name="task">
-            <taskTable></taskTable>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
       <div>
-        <el-link class="link" @click="seeMore">查看更多> > ></el-link>
+        <myTabs></myTabs>
       </div>
     </div>
     <div class="footer">
@@ -83,25 +63,16 @@
 </template>
 
 <script>
-import eventTable from '../event/components/view/table.vue';
-import projectTable from '../project/components/view/table.vue';
-import reportTable from '../report/components/view/table.vue';
-import taskTable from '../task/components/view/table.vue';
+import carousel from './components/carousel.vue'
+import myTabs from './components/tabs.vue';
 export default {
   components: {
-    eventTable,
-    projectTable,
-    reportTable,
-    taskTable,
+    carousel,
+    myTabs
   },
   data() {
     return {
-      srcList: [
-        { src: 'lun1.jpg' },
-        { src: 'lun2.jpg' },
-        { src: 'lun3.jpg' },
-      ],
-      activeName: 'event',
+      
       options: [
         {
           label: '专题库',
@@ -136,13 +107,10 @@ export default {
     }
   },
   methods: {
-    // 点击查看更多
-    seeMore() {
-    },
+    
     // 点击搜索
     search(){},
-    //切换tag
-    handleClick() { },
+    
     //获取提示信息
     getPlaceholder() {
       if (this.queryParams.select) {
@@ -169,16 +137,20 @@ export default {
     }
     // select中选中项颜色、上下角颜色改变
     .el-select .el-input .el-select__caret{
-      color:var(--color);
+      color:var(--color) !important;
     }
     .el-input-group__prepend div.el-select .el-input__inner{
       color: var(--color) !important;
     }
+    .el-select .el-input__inner::-webkit-input-placeholder{
+      color: var(--color) !important;
+    }
+
     .el-button {
       border-radius: 0px;
       background: var(--bg);
       border: 1px solid var(--bg);
-      color: var(--color);
+      color: var(--color) !important;
     }
   }
 
@@ -193,9 +165,8 @@ export default {
     margin: 0 auto;
     position: relative;
     min-height: calc(100% - var(--minHeight) - var(--marginTop));
-    .medium {
-      width: 100%;
-      height: 260px;
+    .carousel{
+      padding-top: 10px;
     }
 
     .title {
@@ -220,11 +191,7 @@ export default {
       margin: 0 auto;
     }
 
-    .link {
-      float: right;
-      margin-top: 10px;
-      color: #409EFF;
-    }
+    
   }
 
   .footer {

src/views/layout/components/UserBar.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="admin-user-bar">
     <div class="menu">
-      <el-link :underline="false" v-for="item in menu" :key="item.path" @click="changePage(item.path)" :type="item.label==title?'danger':'default'">{{ item.label }}</el-link>
+      <el-link :underline="true" v-for="item in menu" :key="item.path" @click="changePage(item.path)" :type="item.label==title?'danger':'default'">{{ item.label }}</el-link>
       <el-dropdown @command="importPatent">
-        <el-link :underline="false" :type="title == '专利检索'?'danger':'default'" class="el-dropdown-link">
+        <el-link :underline="true" :type="title == '专利检索'?'danger':'default'" class="el-dropdown-link">
           专利检索<i class="el-icon-arrow-down el-icon--right"></i>
           </el-link>
-        <el-dropdown-menu slot="dropdown">
+        <el-dropdown-menu slot="dropdown">children_item
           <el-dropdown-item>接口检索</el-dropdown-item>
           <el-dropdown-item>本地专利检索</el-dropdown-item>
         </el-dropdown-menu>
@@ -21,8 +21,8 @@
       <template slot="dropdown">
         <el-dropdown-menu>
           <el-dropdown-item>
-            <el-dropdown @command="handleCommand" trigger="hover" placement="right-start">
-              <span class="el-dropdown-link">  语言 </span>
+            <el-dropdown @command="handleCommand" trigger="hover" placement="right-start" style="width:100%">
+              <span class="el-dropdown-link" >  语言 </span>
               <el-dropdown-menu  class="children_item">
                 <el-dropdown-item command="zh"> 中文 </el-dropdown-item>
                 <el-dropdown-item command="en"> 英文 </el-dropdown-item>
@@ -145,6 +145,11 @@ export default {
           path:'/visual',
         },
         {
+          value:'3',
+          label:'事件',
+          path:'/questionEvent',
+        },
+        {
           value:'1',
           label:'专题库',
           path:'/workspace',
@@ -160,11 +165,6 @@ export default {
           path:'/product',
         },
         {
-          value:'3',
-          label:'事件',
-          path:'/questionEvent',
-        },
-        {
           value:'6',
           label:'专利挖掘',
           path:'/patentMining',
@@ -248,6 +248,7 @@ export default {
           this.$api.adminLogout().then(response => {
             this.$cookie.remove("token")
             this.$router.push({ path: '/admin/login' })
+            localStorage.removeItem('VUEX_STORE')
           })
           break;
         case 'changePwd':
@@ -339,6 +340,14 @@ export default {
 }
 </style>
 <style lang="scss">
+.menu{
+  .el-link{
+    font-family: var(--fm);
+  }
+  // .el-link.el-link--default:hover{
+  //   color:var(--bg)
+  // }
+}
 .admin-user-bar {
   display: flex;
   align-items: center;

src/views/layout/components/guide.js

@@ -119,21 +119,28 @@ export const guide = {
     methods: {
          //打开新手指引
          openGuide(title){
+            var userinfo = this.$store.state.user.userinfo
             var firstRoute = localStorage.firstRoute
             if(firstRoute){
                 var arr = JSON.parse(firstRoute)
-                var index = arr.indexOf(title)
-                if(index != -1){
-                    return false
+                if(arr[userinfo.id]){
+                    var index = arr[userinfo.id].indexOf(title)
+                    if(index != -1){
+                        return false
+                    }
+                }else{
+                    arr[userinfo.id] = []
                 }
+                
             }else{
-                var arr = []
+                var arr = {}
+                arr[userinfo.id] = []
             }
-            this.startGuide(title,arr)
+            this.startGuide(title,arr,userinfo)
             
         },
         //开始新手指引
-        startGuide(title,arr){
+        startGuide(title,arr,userinfo){
             this.$nextTick(()=>{
                 var step = steps[title].filter(item=>{
                     return !item.sign || this.$permission(item.sign)
@@ -147,8 +154,8 @@ export const guide = {
                     //     drivers.destroy();
                     // },
                     onDestroyed:()=>{
-                        if(arr){
-                          arr.push(title)
+                        if(arr[userinfo.id]){
+                          arr[userinfo.id].push(title)
                           localStorage.firstRoute = JSON.stringify(arr)  
                         }
                         drivers.destroy();

src/views/layout/index.vue

@@ -7,7 +7,7 @@
             <div class="logo-bar" @click="handleClick">
               <img src="@/assets/logo-3.png" class="logo">
             </div>
-            <div v-if="showProjectName" style="margin-left:30px;color:black">
+            <div v-if="showProjectName" class="projectName">
               <p><span>专题库名称：</span>{{ projectName }}</p>
             </div>
           </div>
@@ -16,10 +16,7 @@
           </div>
         </div>
       </el-header>
-      <el-main style="padding:0;padding-top:0px;overflow:auto;background:white" >
-        <!-- <el-header style="height:30px;color:brown;">
-            <marquee behavior="scroll" direction="left" scrollamount="5" scrolldelay="100" hspace="10" vspace="10" align="middle" face="" color="white" size="">{{ text }}</marquee>
-          </el-header> -->
+      <el-main class="main">
         <section class="wrapper" >
           <!-- <keep-alive>
             <router-view id="view" v-if="$route.meta.keepAlive"></router-view>
@@ -151,9 +148,10 @@ export default {
 		display: none;
 	}
 </style>
-<style lang="scss">
+<style lang="scss" scoped>
 #work-platform {
   width: 100%;
+  min-width: 1024px;
   height: 100%;
 
   .header {
@@ -178,7 +176,10 @@ export default {
       }
     }
   }
-
+.projectName{
+  margin-left:30px;
+  color:black
+}
   .header-left {
     display: flex;
     align-items: center;
@@ -189,7 +190,12 @@ export default {
     display: flex;
     align-items: center;
   }
-
+.main{
+  padding:0 !important;
+  padding-top:0px !important;
+  overflow:auto !important;
+  background:white !important;
+}
   .wrapper {
     width: 100%;
     height: calc(100%);
@@ -200,105 +206,4 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.introjs-helperLayer{
-    box-shadow: rgba(33, 33, 33, 0.8) 0px 0px 1px 0px, rgba(33, 33, 33, 0.5) 0px 0px 0px 5000px!important;
-    border: 3px dashed #409eff;
-}
-.new-tips{
-    color: #409eff;
-    line-height: 80px;
-    cursor: pointer;
-}
-.introjs-tooltip-title{
-    font-size: 16px;
-    width: 80%;
-    padding-top: 10px;
-}
-.warper {
-  width: 200px;
-  height: 100px;
-  line-height: 100px;
-  text-align: center;
-  border: 1px solid saddlebrown;
-}
-/* 重置引导组件样式(类似element-ui个人使用) */
-.intro-tooltip {
-  color: #ffff;
-  background: #2c3e50;
-}
-/* 引导提示框的位置 */
-.introjs-bottom-left-aligned {
-  left: 45% !important;
-}
-.introjs-right,
-.introjs-left {
-  top: 30%;
-}
-.intro-highlight {
-  background: rgba(255,255,255,0.5);
-}
-.introjs-arrow.left {
-  border-right-color: #2c3e50;
-}
-.introjs-arrow.top {
-  border-bottom-color: #2c3e50;
-}
-.introjs-arrow.right {
-  border-left-color: #2c3e50;
-}
-.introjs-arrow.bottom {
-  border-top-color: #2c3e50;
-}
-/* 提示框头部区域 */
-.introjs-tooltip-header {
-  padding-right: 0 !important;
-  padding-top: 0 !important;
-}
-.introjs-skipbutton {
-  color: #409eff !important;
-  font-size: 14px !important;
-  font-weight: normal !important;
-//   padding: 8px 10px !important ;
-}
-.introjs-tooltipbuttons {
-  border: none !important;
-}
-.introjs-tooltiptext {
-  font-size: 14px !important;
-  padding: 15px !important;
-}
-/* 提示框按钮 */
-.introjs-tooltipbuttons {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-.introjs-button {
-  width: 50px !important;
-  text-align: center;
-  padding: 4px !important;
-  font-size: 12px !important;
-  font-weight: 500 !important;
-  border-radius: 3px !important;
-  border: none !important;
-}
-.introjs-button:last-child {
-  margin-left: 10px;
-}
-.introjs-prevbutton {
-  color: #606266 !important;
-  background: #fff !important;
-  border: 1px solid #dcdfe6 !important;
-}
-.introjs-nextbutton {
-  color: #fff !important;
-  background-color: #409eff !important;
-  border-color: #409eff !important;
-}
-.introjs-disabled {
-  color: #9e9e9e !important;
-  border-color: #bdbdbd !important;
-  background-color: #f4f4f4 !important;
-}
-</style>
+

src/views/project/components/view/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="eventTable">
     <div>
-      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header">
+      <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header">
         <el-table-column label="#" width="60" type="index" align="center">
           <template slot-scope="scope">
             <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
@@ -78,7 +78,7 @@ export default {
         return [
           {
             "key": "name",
-            "name": "事件名称",
+            "name": "名称",
             "type": "list",
             "order": 0,
             "hidden": true
@@ -92,28 +92,28 @@ export default {
           },
           {
             "key": "projectNumber",
-            "name": "相关专题库数量",
+            "name": "事件",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber1",
-            "name": "事件场景",
+            "name": "应用场景",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber2",
-            "name": "事件时间",
+            "name": "调查类型",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber3",
-            "name": "描述",
+            "name": "委托方",
             "type": "list",
             "order": 0,
             "hidden": true

src/views/report/components/view/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="eventTable">
     <div>
-      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header">
+      <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header">
         <el-table-column label="#" width="60" type="index" align="center">
           <template slot-scope="scope">
             <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
@@ -57,7 +57,7 @@ export default {
     tableData: {//数据
       type: Array,
       default: () => {
-        return [{ name: '123', eventNumber: 2, projectNumber: 3, projectNumber1: [{ name: '场景一' }, {name:'场景二'}]},]
+        return [{ name: '123', eventNumber: '手机', projectNumber: '专题库一', projectNumber1: [{ name: '事件一' }]},]
       }
     },
     queryParams: {//分页信息
@@ -75,42 +75,42 @@ export default {
         return [
           {
             "key": "name",
-            "name": "事件名称",
+            "name": "名称",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "eventNumber",
-            "name": "相关报告数量",
+            "name": "标的专利/产品",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber",
-            "name": "相关专题库数量",
+            "name": "相关专题库",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber1",
-            "name": "事件场景",
+            "name": "事件",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber2",
-            "name": "事件时间",
+            "name": "负责人",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber3",
-            "name": "描述",
+            "name": "状态",
             "type": "list",
             "order": 0,
             "hidden": true

src/views/task/components/view/table.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="eventTable">
     <div>
-      <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header">
+      <el-table :data="tableData" style="width: 100%" header-row-class-name="custom-table-header">
         <el-table-column label="#" width="60" type="index" align="center">
           <template slot-scope="scope">
             <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
@@ -49,7 +49,7 @@ export default {
     tableData: {//数据
       type: Array,
       default: () => {
-        return [{ name: '123', eventNumber: 2, projectNumber: 3, projectNumber1: [{ name: '场景一' }, {name:'场景二'}]},]
+        return [{ name: '123', eventNumber: '报告一', projectNumber: '张三', projectNumber1: '',}]
       }
     },
     queryParams: {//分页信息
@@ -67,42 +67,42 @@ export default {
         return [
           {
             "key": "name",
-            "name": "事件名称",
+            "name": "任务名称",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "eventNumber",
-            "name": "相关报告数量",
+            "name": "所属项目",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber",
-            "name": "相关专题库数量",
+            "name": "处理人",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber1",
-            "name": "事件场景",
+            "name": "发起人",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber2",
-            "name": "事件时间",
+            "name": "期限",
             "type": "list",
             "order": 0,
             "hidden": true
           },
           {
             "key": "projectNumber3",
-            "name": "描述",
+            "name": "类型",
             "type": "list",
             "order": 0,
             "hidden": true