Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/project/patentDetails/components/menu.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="height_100 article_menu">
      <!-- 展开后 -->
-     <div v-if="!isContract" style="width: 300px;height: 100%;">
+     <div v-if="!isContract" style="width: 350px;height: 100%;">
         <el-container>
           <el-header
             style="width: 100%;display: flex;justify-content: space-evenly; align-items: center; height: 50px;line-height: 50px;">
@@ -25,6 +25,13 @@
                 <i v-else class="iconfont icon-duibi1"></i>
               </el-button>
             </el-tooltip>
+            <template v-for="(item,index) in menu" >
+              <el-tooltip :content="item.content" placement="top" :key="index">
+                <el-button size="small" @click="other(item.event)">
+                  <i :class="item.icon || 'el-icon-warning-outline'"></i>
+                </el-button>
+              </el-tooltip>
+            </template>
             <el-tooltip content="收缩" placement="top">
               <el-button size="small" @click="isContract = !isContract">
                 <i class="iconfont icon-shousuo"></i></el-button>
@@ -57,6 +64,13 @@
             <i class="iconfont icon-zhankai"></i>
           </div>
         </el-tooltip>
+        <div v-for="(item,index) in menu" :key="index">
+              <el-tooltip :content="item.content" placement="top">
+                <div class="articles-Loop" @click="other(item.event)">
+                  <i :class="item.icon || 'el-icon-warning-outline'"></i>
+                </div>
+              </el-tooltip>
+            </div>
         <el-tooltip content="设定高亮关键词" placement="right-end">
           <el-popover placement="right" title="关键词高亮" width="320" trigger="click" style="margin-top:20px">
             <patent-keywords-highlight :project-id="projectId" />
@@ -102,6 +116,11 @@ export default {
     PatentLeft
   },
   props: {
+    menu:{
+      default:()=>{
+        return []
+      }
+    },
     projectId:{
       default:0
     },
@@ -209,6 +228,9 @@ export default {
     setting(){
       this.$emit('event','setting')
     },
+    other(event){
+      this.$emit('event',event)
+    },
     //上一篇
     prev(){
       this.index -=1
@@ -235,6 +257,11 @@ export default {
 .article_menu{
   border-right:1px solid #e6e6e6;
   border-left:1px solid #e6e6e6;
+  i{
+    width:16px;
+    height:16px;
+    font-size: 16px;
+  }
 .articles-Loop-div {
     width: 51px;
     height: 100%;

src/views/project/patentDetails/index.vue

@@ -59,6 +59,9 @@ export default {
     goBack(){
 
     },
+    xietong(){
+      console.log(1)
+    },
     getPatentLeft(val) {
       this.patentNo=val
       this.$router.push(