事件的修改

src/router/index.js

@@ -143,7 +143,7 @@ const routes = [
             path:'/',
             meta: {
               title: '产品',
-              sign:'Product'
+              sign:'product'
             },
             component: () => import('@/views/product/index.vue'),
           },
@@ -211,7 +211,7 @@ const routes = [
             path:'/',
             meta: {
               title: '事件',
-              sign:'Event',
+              sign:'event',
             },
             component: () => import('@/views/event/index.vue'),
           }

src/utils/model/card/index.vue

@@ -56,6 +56,19 @@ export default {
   },
 };
 </script>
+<style lang="scss">
+.myCard{
+    .el-form-item{
+    margin-bottom: 0px;
+  }
+  .el-form-item__content{
+    font-family: var(--fm) !important;
+    color: var(--color2) !important;
+    // width:100%;
+    text-align: right;
+  }
+}
+</style>
 <style lang="scss" scoped>
 .myCard{
     background-color: #FFF;
@@ -96,6 +109,8 @@ export default {
         border-top: none !important;
         padding: 0px;
     }
+
+    
 }
 .is-always-shadow{
     box-shadow: 10px 18px 12px 0 rgba(27, 23, 23, 0.1);

src/views/event/components/dialog/addEvent.vue

@@ -11,7 +11,7 @@
               @select="handleSelectQuestion" @blur="blur($event, { $index: 0 })" style="width: 100%;">
             </el-autocomplete>
           </el-form-item>
-          <el-form-item label="所属客户" prop="clientId">
+          <el-form-item label="所属客户" prop="clientId" v-if="userinfo.tenantType == 1">
             <el-select v-model="formData[0].clientId" :disabled="(formData[0].id && !this.row) ? true : false"
               style="width: 100%;" placeholder="请选择客户">
               <el-option
@@ -118,6 +118,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   props: [],
   data() {
@@ -150,6 +151,9 @@ export default {
     }
   },
   watch: {},
+  computed:{
+    ...mapGetters(["userinfo"]),
+  },
   async mounted() {
     // 应用场景(是通过字典还是接口待定)
     await this.getCommonData()

src/views/event/components/index.vue

@@ -19,13 +19,15 @@
             <el-button :type="viewSelected === 'Table' ? 'primary' : ''" @click="onChange2('Table')" size="small">列表</el-button>
             <el-button :type="viewSelected === 'Card' ? 'primary' : ''" @click="onChange2('Card')" size="small">卡片</el-button>
           </el-button-group>
-          <el-dropdown trigger="click" split-button type="primary" size="small" @command="handleCommand($event)">
+          <el-button type="primary" size="small" @click="handleCommand('1')" class="margin-left_10">添加事件</el-button>
+          <!-- <el-dropdown trigger="click" split-button type="primary" size="small" @command="handleCommand($event)">
             <span @click="handleCommand('1')">添加事件</span>
             <el-dropdown-menu slot="dropdown" class="text-align_center">
               <el-dropdown-item command="1">添加事件</el-dropdown-item>
               <el-dropdown-item command="2">批量添加事件</el-dropdown-item>
+              <el-dropdown-item command="2">批量添加事件</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
         </div>
       </el-header>
       <el-main id="patent-list-container" class="main" v-loading="loading">

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

@@ -32,7 +32,7 @@
             </div>
           </div>
           <div>
-            <el-form label-position="right" label-width="140px">
+            <el-form label-position="left" label-width="110px">
               <el-form-item label="报告数量："> {{ item.reportNum || 0  }} </el-form-item>
               <el-form-item label="专题库数量：">{{ item.reportNum || 0 }}</el-form-item>
               <el-form-item label="应用场景：">
@@ -82,19 +82,7 @@ export default {
 </script>
 <style lang="scss">
 .eventCard{
-  .el-form-item__label{
-    // text-align: justify;
-    // text-align-last: justify;
-    // text-justify: distribute-all-lines;
-
-  }
-  .el-form-item{
-    margin-bottom: 0px;
-  }
-  .el-form-item__content{
-    font-family: var(--fm) !important;
-    color: var(--color2) !important;
-  }
+  
 }
 </style>
 <style lang="scss" scoped>

src/views/layout/components/UserBar.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="admin-user-bar">
     <div class="menu">
-      <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-link :underline="true" v-for="item in menu" :key="item.path" @click="changePage(item.path)" :type="item.sign==sign?'primary':'default'">{{ item.label }}</el-link>
       <el-dropdown @command="importPatent">
-        <el-link :underline="true" :type="title == '专利检索'?'danger':'default'" class="el-dropdown-link">
+        <el-link :underline="true" :type="sign == '专利检索'?'danger':'default'" class="el-dropdown-link">
           专利检索<i class="el-icon-arrow-down el-icon--right"></i>
           </el-link>
-        <el-dropdown-menu slot="dropdown">children_item
+        <el-dropdown-menu slot="dropdown">
           <el-dropdown-item>接口检索</el-dropdown-item>
           <el-dropdown-item>本地专利检索</el-dropdown-item>
         </el-dropdown-menu>
@@ -137,45 +137,52 @@ export default {
       };
     return {
       menu:[
-        {
-          value:'7',
-          label:'企业专利数据库',
-          path:'/enterprisePatentDB',
-        },
+        // {
+        //   value:'7',
+        //   label:'企业专利数据库',
+        //   path:'/enterprisePatentDB',
+        // },
         {
           value:'5',
           label:'场景可视化',
           path:'/visual',
+          sign:'visual'
         },
         {
           value:'3',
           label:'事件',
           path:'/Event',
+          sign:'event'
         },
         {
           value:'1',
-          label:'专题库',
+          label:'专利数据库',
           path:'/project',
+          sign:'project'
         },
         {
           value:'4',
           label:'报告',
           path:'/AllReport',
+          sign:'report'
         },
         {
           value:'2',
           label:'产品',
           path:'/product',
+          sign:'product'
         },
         {
           value:'6',
           label:'专利挖掘',
           path:'/patentMining',
+          sign:'patentMining'
         },
         {
           value:'8',
           label:'我的任务',
           path:'/rTaskList',
+          sign:'task'
         },
       ],
       clientTitle:'',
@@ -209,8 +216,8 @@ export default {
   },
   computed: {
     ...mapGetters(['userinfo']),
-    title(){
-      return this.$route.meta.title
+    sign(){
+      return this.$route.meta.sign
     }
   },
   mounted() {
@@ -346,10 +353,27 @@ export default {
 .menu{
   .el-link{
     font-family: var(--fm);
+    color: var(--color2);
+    font-weight: bold;
+  }
+  .el-link.el-link--default:hover,.el-link.el-link--primary:hover,.el-link.el-link--primary{
+    color:var(--color1)
+  }
+  .el-link.el-link--default:hover.is-underline::after,.el-link.el-link--primary:hover.is-underline::after{
+    position: absolute;
+    top: calc(100% + 5px);
+    border-bottom: 3px solid var(--color1);
+  }
+  .el-link.el-link--primary.is-underline::after {
+    content: "";
+    position: absolute;
+    top: calc(100% + 5px);
+    left: 0;
+    right: 0;
+    height: 0;
+    bottom: 0;
+    border-bottom: 3px solid var(--color1);
   }
-  // .el-link.el-link--default:hover{
-  //   color:var(--bg)
-  // }
 }
 .admin-user-bar {
   display: flex;

src/views/layout/components/help.vue

@@ -50,7 +50,7 @@ export default {
             e.preventDefault()
           }
           var moveY = e.clientY - startY
-          var bottom = 20
+          var bottom = 50
           if(moveY < 0){
             bottom = clientHeight - start - height + Math.abs(moveY)
             if(bottom - height > clientHeight - 200){
@@ -58,8 +58,8 @@ export default {
             }
           }else{
             bottom = clientHeight - start - height - Math.abs(moveY)
-            if(bottom < 20){
-                bottom = 20
+            if(bottom < 50){
+                bottom = 50
             }
           }
           dragBox.style.bottom = bottom + 'px'
@@ -116,7 +116,7 @@ export default {
     border-radius: 5px 0 0 10px;
     position: fixed;
     right: 0;
-    bottom:20px;
+    bottom:50px;
     div{
         border-bottom: 1px solid var(--color1);
         padding: 5px 0;