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

src/views/components/import/task/components/index.vue

@@ -354,7 +354,7 @@ export default {
     },
     //下载附件
     handleDownload(row) {
-      downLoad2()
+      downLoad2(row.fileGuid)
     }
   },
 };

src/views/components/indicia/components/card.vue

@@ -2,88 +2,89 @@
   <div class="indiciaCard" v-loading="loading">
     <!-- <el-row :gutter="24">
       <el-col :span="6" v-for="(item, index) in cardData" :key="item.index"> -->
-      <template v-if="cardData && cardData.length > 0"  >
-        <el-card class="box-card" v-for="(item, index) in cardData" :key="index">
-          <div slot="header" class="clearfix">
-            <!-- <el-checkbox @change="changeRemark(item)" :value="remarkList.indexOf(item.id) !== -1"> -->
-              <span v-if="componentType == 'indiciaCard'" style="font-weight: 700;"> 序号：{{ (index + 1) + (queryParams.current - 1) * queryParams.size }}</span>
-              <span v-else style="font-weight: 700; "> 序号：{{ index + 1 }}</span>
-            <!-- </el-checkbox> -->
+    <template v-if="cardData && cardData.length > 0">
+      <el-card class="box-card" v-for="(item, index) in cardData" :key="index">
+        <div slot="header" class="clearfix">
+          <!-- <el-checkbox @change="changeRemark(item)" :value="remarkList.indexOf(item.id) !== -1"> -->
+          <span v-if="componentType == 'indiciaCard'" style="font-weight: 700;"> 序号：{{ (index + 1) + (queryParams.current
+            - 1) * queryParams.size }}</span>
+          <span v-else style="font-weight: 700; "> 序号：{{ index + 1 }}</span>
+          <!-- </el-checkbox> -->
+        </div>
+        <div class="card-context text">
+          <div style="display: flex;" class="text textPRight context-marginTop">
+            <span style="font-weight: 700;">标注：</span>
+            <el-tooltip placement="top">
+              <template slot="content">
+                <div style="max-width:500px;">{{ item.markNoteText }}</div>
+              </template>
+              <span class="textPRight">{{ item.markNoteText }}</span>
+            </el-tooltip>
           </div>
-          <div class="card-context text">
-            <div style="display: flex;" class="text textPRight context-marginTop">
-              <span style="font-weight: 700;">标注：</span>
-              <el-tooltip placement="top">
-                <template slot="content">
-                  <div style="max-width:500px;">{{ item.markNoteText }}</div>
-                </template>
-                <span class="textPRight">{{ item.markNoteText }}</span>
-              </el-tooltip>
-            </div>
-            <div class="text context-marginTop">
-              <span style="font-weight: 700;">标注人/时间：</span>
-              <span>{{ item.createName }}</span> <span>{{ item.markTime }}</span>
-            </div>
-            <div style="display: flex;align-items: center;">
-              <!-- 文字前方颜色方块 -->
-              <!-- <div :style="{ 'background': item.color }"
+          <div class="text context-marginTop">
+            <span style="font-weight: 700;">标注人/时间：</span>
+            <span>{{ item.createName }}</span> <span>{{ item.markTime }}</span>
+          </div>
+          <div style="display: flex;align-items: center;">
+            <!-- 文字前方颜色方块 -->
+            <!-- <div :style="{ 'background': item.color }"
                 style="width: 5px;height: 20px;border-radius: 5px;margin-right: 5px;margin-top: 18px;">
               </div> -->
-              <p style="font-weight: 700;min-width: 75px;">标注位置：</p>
-              <el-tooltip placement="top">
-                <template slot="content">
-                  <div style="max-width:500px;">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</div>
-                </template>
-                <!-- 下划线 -->
-                <p v-if="item.markType == 0" :style="{ 'border-bottom': `2px solid ${item.markColor}` }"
-                  class="textPRight textP">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</p>
-                <!-- 高亮 -->
-                <p v-if="item.markType == 1"  :style="{ 'background': item.markColor }" style="color: aliceblue;"
-                  class="textPRight textP">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</p>
-                <!-- 波浪线 -->
-                <p v-if="item.markType == 2"
-                  :style="{ 'text-decoration-line': 'underline', 'text-decoration-style': 'wavy', 'text-decoration-color': item.markColor }"
-                  class="textPRight textP">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</p>
-              </el-tooltip>
-            </div>    
-            
-            <div class="text">
-              <span style="font-weight: 700;">专利号：</span>
-              <el-link @click.native="$commonJS.checkPatentDetails(item.patentNo)">
-                <span style="color: #409EFF;">{{ item.patentNo }}</span>
-              </el-link>
-            </div>
-            <div class="text textPRight context-marginTop">
-              <span style="font-weight: 700;">专利标题：</span>
-              <el-tooltip placement="top">
-                <template slot="content">
-                  <div style="max-width:500px;">{{ item.patentTitle }}</div>
-                </template>
-                <span>{{ item.patentTitle }}</span>
-              </el-tooltip>
-            </div>
-            <div class="text context-marginTop">
-              <!-- <span style="font-weight: 700;">标注人：</span>
+            <p style="font-weight: 700;min-width: 75px;">标注位置：</p>
+            <el-tooltip placement="top">
+              <template slot="content">
+                <div style="max-width:500px;">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</div>
+              </template>
+              <!-- 下划线 -->
+              <p v-if="item.markType == 0" :style="{ 'border-bottom': `2px solid ${item.markColor}` }"
+                class="textPRight textP">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</p>
+              <!-- 高亮 -->
+              <p v-if="item.markType == 1" :style="{ 'background': item.markColor }" style="color: aliceblue;"
+                class="textPRight textP">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</p>
+              <!-- 波浪线 -->
+              <p v-if="item.markType == 2"
+                :style="{ 'text-decoration-line': 'underline', 'text-decoration-style': 'wavy', 'text-decoration-color': item.markColor }"
+                class="textPRight textP">{{ '[' + item.markSelectField + ']' + item.markSelectText }}</p>
+            </el-tooltip>
+          </div>
+
+          <div class="text">
+            <span style="font-weight: 700;">专利号：</span>
+            <el-link @click.native="toPatentDetails(item)">
+              <span style="color: #409EFF;">{{ item.patentNo }}</span>
+            </el-link>
+          </div>
+          <div class="text textPRight context-marginTop">
+            <span style="font-weight: 700;">专利标题：</span>
+            <el-tooltip placement="top">
+              <template slot="content">
+                <div style="max-width:500px;">{{ item.patentTitle }}</div>
+              </template>
+              <span>{{ item.patentTitle }}</span>
+            </el-tooltip>
+          </div>
+          <div class="text context-marginTop">
+            <!-- <span style="font-weight: 700;">标注人：</span>
               <span>{{ item.name }}</span> -->
-            </div>
-           
           </div>
 
-        </el-card>
-      </template>
-      <template v-else>
-        <el-card class="box-card" >
-          <p style="margin-left: 10px;"> 暂 无 数 据 </p>
-        </el-card>
-      </template>
-      <!-- </el-col>
+        </div>
+
+      </el-card>
+    </template>
+    <template v-else>
+      <el-card class="box-card">
+        <p style="margin-left: 10px;"> 暂 无 数 据 </p>
+      </el-card>
+    </template>
+    <!-- </el-col>
     </el-row> -->
   </div>
 </template>
 
 <script>
 export default {
-  props: ['dataArr','queryParams','loading','componentType'],
+  props: ['dataArr', 'queryParams', 'loading', 'componentType'],
   data() {
     return {
       remarkList: [],
@@ -101,14 +102,12 @@ export default {
   },
   methods: {
     // 跳转专利详情
-    handleLink(row, index) {
+    toPatentDetails(row, index) {
       var router = this.$router.resolve({
-        path: '/patentDetails'+':',
-          query:{
-            patentId:row.patentId,
-            patentNo:row.patentNo,
-            id:row.patentId?true:null
-          }
+        path: '/patentDetails/' + row.patentNo,
+        query: {
+          projectId: row.projectId,
+        }
       })
       // this.$s.setSession('params', this.params)
       window.open(router.href, '_blank');
@@ -165,7 +164,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.context-marginTop{
+
+.context-marginTop {
   margin-top: 10px;
 }
 </style>

src/views/product/components/index.vue

@@ -260,7 +260,9 @@ export default {
     },
 
      // 进入商品化专利
-     toCommodity(row) {
+    toCommodity(row) {
+      console.log(row);
+      return
       let router = this.$router.resolve({
         path: '/commodity',
         query: {

src/views/project/patentCollection/components/export/components/patent.vue

@@ -133,7 +133,7 @@ export default {
     height: 650px;
 
     .el-transfer-panel__list {
-      height: 650px;
+      height: 510px;
     }
   }
 

src/views/project/patentDetails/index.vue

@@ -207,7 +207,8 @@ export default {
             evidenceType: evidenceType,
             evidence: evidence,
             signPatentNo:this.signPatentNo,
-            outside:this.outside
+            outside:this.outside,
+            projectType:this.projectType,
           }
         }
       )