rj

channel-access/src/api/patentQuery.js

+import http from "@/http/http.js";
+let baseUrl = "/api/web/action/patentQuery/springBoard";
+//根据申请人获取专利量接口
+export function paCountByApplicantName(name) {
+    return http.post(baseUrl, {
+        actionType: "paCountByApplicantName",
+        actionBody: {
+            applicant_name: name //公司名称
+        }
+    });
+}
+
+//根据申请人获取专利详情列表
+export function paShortListByApplicantName(name) {
+    return http.post(baseUrl, {
+        actionType: "paShortListByApplicantName",
+        actionBody: {
+            applicant_name: name, //公司名称
+            page_size: 1000,
+            current_page: 1
+        }
+    });
+}
+
+//根据公司名称得到软件著作权数量
+export function softwareCountByAuthor(name) {
+    return http.post(baseUrl, {
+        actionType: "softwareCountByAuthor",
+        actionBody: {
+            author: name
+        }
+    });
+}
+
+//根据公司名称得到软件著作权详情
+export function softwareListByAuthor(name) {
+    return http.post(baseUrl, {
+        actionType: "softwareListByAuthor",
+        actionBody: {
+            author: name, //公司名称
+            page_size: 1000,
+            current_page: 1
+        }
+    });
+}
+
+//根据公司名称得到著作权量
+export function worksCountByAuthor(name) {
+    return http.post(baseUrl, {
+        actionType: "worksCountByAuthor",
+        actionBody: {
+            author: name, //公司名称
+        }
+    });
+}
+
+//根据公司名称得到著作权详情
+export function worksListByAuthor(name) {
+    return http.post(baseUrl, {
+        actionType: "worksListByAuthor",
+        actionBody: {
+            author: name, //公司名称
+            page_size: 1000,
+            current_page: 1
+        }
+    });
+}
\ No newline at end of file

channel-access/src/api/tmQuery.js

@@ -9,6 +9,7 @@ export function tradeMarkDetail(params) {
         actionBody: params
     });
 }
+
 //企业查询接口
 export function getCompanyInfoNoUser(name) {
     return http.post(baseUrl, {
@@ -18,3 +19,20 @@ export function getCompanyInfoNoUser(name) {
         }
     });
 }
+
+//申请人查询接口
+export function findTrademarkzcr(name) {
+    return http.post(baseUrl, {
+        actionType: "findTrademarkzcr",
+        actionBody: {
+            regMan: name,
+            sqlbtabkey: "",
+            flzttabkey: "",
+            sqnftabkey: "",
+            zcrname: "",
+            xcl: [],
+            pageSize: 1000,
+            currentPage: 1
+        }
+    });
+}
\ No newline at end of file

channel-access/src/views/pages/companyinformation/copyright.vue

@@ -22,15 +22,22 @@
           <td>首次发布日期</td>
         </tr>
       </thead>
-      <tbody class="copyright-table-body">
+      <tbody class="copyright-table-body" v-if="copyrightList.length != 0">
         <tr v-for="(item, index) in itemList" :key="index">
-          <td>{{ "0" + (index + 1) }}</td>
-          <td>{{ item.name }}</td>
-          <td>{{ item.dengjihao }}</td>
-          <td>{{ item.type }}</td>
-          <td>{{ item.finishTime }}</td>
-          <td>{{ item.registerTime }}</td>
-          <td>{{ item.firstTime }}</td>
+          <td>{{ getIndex(index) }}</td>
+          <td>{{ item.works_name ? item.works_name : "---" }}</td>
+          <td>{{ item.reg_num ? item.reg_num : "---" }}</td>
+          <td>{{ item.works_type ? item.works_type : "---" }}</td>
+          <td>{{ item.finish_time ? item.finish_time : "---" }}</td>
+          <td>{{ item.publish_time ? item.publish_time : "---" }}</td>
+          <td>
+            {{ item.first_publish_time ? item.first_publish_time : "---" }}
+          </td>
+        </tr>
+      </tbody>
+      <tbody v-else class="copyright-table-body">
+        <tr>
+          <td colspan="7">暂无数据</td>
         </tr>
       </tbody>
     </table>
@@ -46,129 +53,25 @@
 </template>
 
 <script>
+import { worksListByAuthor } from "@/api/patentQuery.js";
 export default {
+  props: ["name"],
   data() {
     return {
       pageSize: 5,
-      copyrightList: [
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        },
-        {
-          name: "达摩院青橙奖LOGO",
-          dengjihao: "国作登字-2018-F-00675364",
-          type: "0",
-          finishTime: "2019-12-03",
-          registerTime: "2019-12-03",
-          firstTime: "2019-12-03"
-        }
-      ],
+      currentPage: 1,
+      copyrightList: [],
       itemList: []
     };
   },
   mounted() {
+    worksListByAuthor(this.name).then(res => {
+      console.log(res, "worksListByAuthor");
+      if (res.status == 0 && res.data.data != null) {
+        this.copyrightList = res.data.data;
         this.handleCurrentChange(1);
+      }
+    });
   },
   methods: {
     handleCurrentChange(val) {
@@ -176,6 +79,11 @@ export default {
         (val - 1) * this.pageSize,
         val * this.pageSize
       );
+      this.currentPage = val;
+    },
+    //获取序号
+    getIndex(index) {
+      return index + 1 + this.currentPage * this.pageSize - this.pageSize;
     },
     indexMethod(index) {
       return index * 2;

channel-access/src/views/pages/companyinformation/index.vue

 <template>
   <div class="companyinformation">
+    <div
+      class="companyinformationLoading"
+      v-if="loading"
+      v-loading="true"
+    ></div>
     <div class="companyinformation-header">
       <div class="companyinformation-header-main">
         <img
@@ -26,7 +31,7 @@
         <div class="companyinformation-container-main-top">
           <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item to="/home">首页</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ $route.query.name }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ stateName }}</el-breadcrumb-item>
           </el-breadcrumb>
         </div>
         <div class="companyinformation-container-main-info">
@@ -45,7 +50,7 @@
           <!--  -->
           <div class="companyinfo-right">
             <div class="companyinfo-right-top">
-              <h1>{{ $route.query.name }}</h1>
+              <h1>{{ stateName }}</h1>
               <div class="companyinfo-right-top-type">
                 <span>小微企业</span>
                 <span>小微企业</span>
@@ -100,10 +105,18 @@
                       <tr>
                         <td><span>营业执照 1</span></td>
                         <td>
-                          <span @click="showTable(1)">商标注册证 78</span>
-                          <span @click="showTable(2)"> 专利证书 2 </span>
-                          <span @click="showTable(3)"> 著作权 0 </span>
-                          <span @click="showTable(4)"> 软件著作权 13 </span>
+                          <span @click="showTable(1)"
+                            >商标注册证 {{ trademarkList.length }}</span
+                          >
+                          <span @click="showTable(2)">
+                            专利证书 {{ paCount }}
+                          </span>
+                          <span @click="showTable(3)">
+                            著作权 {{ worksCount }}
+                          </span>
+                          <span @click="showTable(4)">
+                            软件著作权 {{ softwareCount }}
+                          </span>
                           <span @click="showTable(5)"> 域名信息 1</span>
                         </td>
                         <td><span>一般纳税人证 1</span></td>
@@ -116,19 +129,39 @@
               </transition>
               <!-- 需要翻转的表格组件 -->
               <transition name="el-zoom-in-center">
-                <Trademark v-show="show == 1" @unshowOne="unshow" />
+                <Trademark
+                  v-show="show == 1"
+                  @unshowOne="unshow"
+                  :list="trademarkList"
+                />
               </transition>
               <transition name="el-zoom-in-center">
-                <PatentCertificate v-show="show == 2" @unshowOne="unshow" />
+                <PatentCertificate
+                  v-show="show == 2"
+                  @unshowOne="unshow"
+                  :name="$route.query.name"
+                />
               </transition>
               <transition name="el-zoom-in-center">
-                <Copyright v-show="show == 3" @unshowOne="unshow" />
+                <Copyright
+                  v-show="show == 3"
+                  @unshowOne="unshow"
+                  :name="$route.query.name"
+                />
               </transition>
               <transition name="el-zoom-in-center">
-                <SoftwareCopyright v-show="show == 4" @unshowOne="unshow" />
+                <SoftwareCopyright
+                  v-show="show == 4"
+                  @unshowOne="unshow"
+                  :name="$route.query.name"
+                />
               </transition>
               <transition name="el-zoom-in-center">
-                <DomainNameInfo v-show="show == 5" @unshowOne="unshow" />
+                <DomainNameInfo
+                  v-show="show == 5"
+                  @unshowOne="unshow"
+                  :name="$route.query.name"
+                />
               </transition>
               <!--  -->
             </div>
@@ -262,6 +295,14 @@ import {
   getCompanyInfoByLikeName,
   getEntregistryByCompanyName
 } from "@/api/tmTools.js";
+
+import {
+  paCountByApplicantName,
+  softwareCountByAuthor,
+  worksCountByAuthor
+} from "@/api/patentQuery.js";
+
+import { findTrademarkzcr } from "@/api/tmQuery.js";
 export default {
   components: {
     EnterpriseInfo,
@@ -273,8 +314,11 @@ export default {
   },
   data() {
     return {
+      //loading
+      loading: false,
       //输入框内容
       state: "",
+      stateName: "",
       //浏览量
       browseVolume: 0,
       //dialog弹窗
@@ -296,16 +340,65 @@ export default {
         businessTerm: null,
         requestId: null
       },
-      show: 0
+      show: 0,
+      //专利证书数量
+      paCount: 0,
+      //软件注册权数量
+      softwareCount: 0,
+      //著作权数量
+      worksCount: 0,
+      //专利证书数据
+      trademarkList: []
     };
   },
   mounted() {
     this.state = this.$route.query.name;
+    this.stateName = this.$route.query.name;
+    this.loading = true;
     getEntregistryByCompanyName(this.state).then(res => {
       this.companyInfo = res;
+      console.log(res, "getEntregistryByCompanyName");
+      this.getInfo(res.name);
     });
   },
   methods: {
+    //
+    getInfo(name) {
+      let p1 = new Promise(resolve => {
+        paCountByApplicantName(name).then(res => {
+          this.paCount = res.data;
+          resolve();
+        });
+      });
+      let p2 = new Promise(resolve => {
+        softwareCountByAuthor(name).then(res => {
+          this.softwareCount = res.data;
+          resolve();
+        });
+      });
+      let p3 = new Promise(resolve => {
+        worksCountByAuthor(name).then(res => {
+          this.worksCount = res.data;
+          resolve();
+        });
+      });
+      let p4 = new Promise(resolve => {
+        findTrademarkzcr(name).then(res => {
+          resolve();
+          if (res.status == 0) {
+            this.trademarkList = res.data.rows;
+          }
+        });
+      });
+      Promise.all([p1, p3, p2, p4])
+        .then(() => {
+          console.log(12312312312);
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
     //翻转表格
     showTable(index) {
       this.show = null;
@@ -327,6 +420,7 @@ export default {
           path: "/companyinformation",
           query: { name: this.state }
         });
+        window.location.reload();
         this.saveLocalStorage();
         getEntregistryByCompanyName(this.state).then(res => {
           this.companyInfo = res;
@@ -393,6 +487,14 @@ export default {
 <style lang="scss" scoped>
 .companyinformation {
   width: 100%;
+  .companyinformationLoading {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    z-index: 100;
+  }
   .companyinformation-header {
     width: 100%;
     height: 70px;
@@ -590,7 +692,7 @@ export default {
   .main-certificateinfo-left {
     width: 936px;
     .companycertificateinfo:nth-child(1) {
-      thead td:hover{
+      thead td:hover {
         background: #499bff;
         color: #fff;
       }

channel-access/src/views/pages/companyinformation/patentCertificate.vue

@@ -20,13 +20,21 @@
           <td>摘要</td>
         </tr>
       </thead>
-      <tbody class="patentCertificate-table-body">
+      <tbody
+        class="patentCertificate-table-body"
+        v-if="patentCertificateList.length != 0"
+      >
         <tr v-for="(item, index) in itemList" :key="index">
-          <td>{{ "0" + (index + 1) }}</td>
-          <td>{{ item.patentType }}</td>
-          <td>{{ item.gongkaihao }}</td>
-          <td>{{ item.time }}</td>
-          <td>{{ item.zhaiyao }}</td>
+          <td>{{ getIndex(index) }}</td>
+          <td>{{ item.pub_type }}</td>
+          <td>{{ item.filing_no }}</td>
+          <td>{{ item.pub_time }}</td>
+          <td>{{ item.abstr_text }}</td>
+        </tr>
+      </tbody>
+      <tbody v-else class="patentCertificate-table-body">
+        <tr class="notList">
+          <td colspan="5">暂无数据</td>
         </tr>
       </tbody>
     </table>
@@ -42,115 +50,25 @@
 </template>
 
 <script>
+import { paShortListByApplicantName } from "@/api/patentQuery.js";
 export default {
+  props: ["name"],
   data() {
     return {
       pageSize: 5,
-      patentCertificateList: [
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        },
-        {
-          patentType: "发明专利",
-          gongkaihao: "CN110648182A",
-          time: "2019-12-03",
-          zhaiyao:
-            "商品自动定价方法、系统、介质和计算设备本发明的实施方式提供了一种商品自动定价方法。该商品自动定价方法包括：从多个历史数据中，获取环境状态信息，其中，环境状态信息包括表明用户对历史定价行为的响应信息；将环境状态信息输入强化深度"
-        }
-      ],
+      currentPage: 1,
+      patentCertificateList: [],
       itemList: []
     };
   },
   mounted() {
+    paShortListByApplicantName(this.name).then(res => {
+      // console.log(res, "paShortListByApplicantName");
+      if (res.status == 0) {
+        this.patentCertificateList = res.data.data;
         this.handleCurrentChange(1);
+      }
+    });
   },
   methods: {
     handleCurrentChange(val) {
@@ -158,6 +76,11 @@ export default {
         (val - 1) * this.pageSize,
         val * this.pageSize
       );
+      this.currentPage = val;
+    },
+    //获取序号
+    getIndex(index) {
+      return index + 1 + this.currentPage * this.pageSize - this.pageSize;
     },
     indexMethod(index) {
       return index * 2;
@@ -222,21 +145,26 @@ export default {
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap;
-          border: 1px solid #E4EEF6;
-          background: #F2F9FC;
+          border: 1px solid #e4eef6;
+          background: #f2f9fc;
         }
-        td:last-child{
+        td:last-child {
           width: 400px;
         }
       }
     }
     .patentCertificate-table-body {
       width: 100%;
+      .notList {
+        td {
+          text-align: center !important;
+        }
+      }
       tr {
         width: 100%;
         td {
           padding: 15px;
-          border: 1px solid #E4EEF6;
+          border: 1px solid #e4eef6;
           img {
             width: 60px;
             height: 34px;
@@ -244,7 +172,7 @@ export default {
             display: inline-block;
           }
         }
-        td:last-child{
+        td:last-child {
           text-align: left;
         }
       }

channel-access/src/views/pages/companyinformation/softwareCopyright.vue

@@ -4,9 +4,7 @@
       <p class="el-icon-back" @click="showTable">返回</p>
       <b></b>
       <el-breadcrumb separator-class="el-icon-arrow-right">
-        <el-breadcrumb-item
-          ><span>企业证照信息</span></el-breadcrumb-item
-        >
+        <el-breadcrumb-item><span>企业证照信息</span></el-breadcrumb-item>
         <el-breadcrumb-item>软件著作权</el-breadcrumb-item>
       </el-breadcrumb>
     </h3>
@@ -22,15 +20,23 @@
           <td>软件简称</td>
         </tr>
       </thead>
-      <tbody class="softwareCopyright-table-body">
+      <tbody
+        class="softwareCopyright-table-body"
+        v-if="softwareCopyrightList.length != 0"
+      >
         <tr v-for="(item, index) in itemList" :key="index">
-          <td>{{ "0" + (index + 1) }}</td>
-          <td>{{ item.name }}</td>
-          <td>{{ item.dengjihao }}</td>
-          <td>{{ item.version }}</td>
-          <td>{{ item.fenleihao }}</td>
-          <td>{{ item.registerTime }}</td>
-          <td>{{ item.jiancheng }}</td>
+          <td>{{ getIndex(index) }}</td>
+          <td>{{ item.full_name ? item.full_name : "---" }}</td>
+          <td>{{ item.reg_num ? item.reg_num : "---" }}</td>
+          <td>{{ item.software_version ? item.software_version : "---" }}</td>
+          <td>{{ item.cat_num ? item.cat_num : "---" }}</td>
+          <td>{{ item.reg_time ? item.reg_time : "---" }}</td>
+          <td>{{ item.simple_name ? item.simple_name : "---" }}</td>
+        </tr>
+      </tbody>
+      <tbody v-else class="softwareCopyright-table-body">
+        <tr class="notList">
+          <td colspan="7">暂无数据</td>
         </tr>
       </tbody>
     </table>
@@ -46,108 +52,25 @@
 </template>
 
 <script>
+import { softwareListByAuthor } from "@/api/patentQuery.js";
 export default {
+  props: ["name"],
   data() {
     return {
       pageSize: 5,
-      softwareCopyrightList: [
-        {
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        },{
-          name: "萌颜APP",
-          dengjihao: "2019SR0203965",
-          version: "V1.0",
-          fenleihao: "30000-0000",
-          registerTime: "2019-12-03",
-          jiancheng: "萌颜"
-        }
-      ],
+      currentPage: 1,
+      softwareCopyrightList: [],
       itemList: []
     };
   },
   mounted() {
+    softwareListByAuthor(this.name).then(res => {
+      // console.log(res, "softwareListByAuthor");
+      if (res.status == 0) {
+        this.softwareCopyrightList = res.data.data;
+        this.handleCurrentChange(1);
+      }
+    });
     this.handleCurrentChange(1);
   },
   methods: {
@@ -156,6 +79,11 @@ export default {
         (val - 1) * this.pageSize,
         val * this.pageSize
       );
+      this.currentPage = val;
+    },
+    //获取序号
+    getIndex(index) {
+      return index + 1 + this.currentPage * this.pageSize - this.pageSize;
     },
     indexMethod(index) {
       return index * 2;

channel-access/src/views/pages/companyinformation/trademark.vue

@@ -21,16 +21,23 @@
           <td>详情</td>
         </tr>
       </thead>
-      <tbody class="trademark-table-body">
+      <tbody class="trademark-table-body" v-if="trademarkList.length != 0">
         <tr v-for="(item, index) in itemList" :key="index">
-          <td>{{ "0" + (index + 1) }}</td>
-          <td><img :src="item.img" alt="" /></td>
-          <td>{{ item.name }}</td>
-          <td>{{ item.zhucehao }}</td>
-          <td>{{ item.leibie }}</td>
-          <td>{{ item.status }}</td>
-          <td>{{ item.time }}</td>
-          <td>详情</td>
+          <td>{{ getIndex(index) }}</td>
+          <td><img :src="item.logo" alt="" /></td>
+          <td>{{ item.sbmc ? item.sbmc : "---" }}</td>
+          <td>{{ item.sbzch ? item.sbzch : "---" }}</td>
+          <td>{{ item.gjfl ? item.gjfl : "---" }}类</td>
+          <td>{{ item.sbzt ? item.sbzt : "---" }}</td>
+          <td>{{ item.sqrq ? item.sqrq : "---" }}</td>
+          <td class="gotoDetail" @click="gotoDetail(item.sbzch, item.gjfl)">
+            详情
+          </td>
+        </tr>
+      </tbody>
+      <tbody v-else class="trademark-table-body">
+        <tr class="notList">
+          <td colspan="8">暂无数据</td>
         </tr>
       </tbody>
     </table>
@@ -46,121 +53,38 @@
 </template>
 
 <script>
-import img from "../../../assets/imgs/company/zhengzhao2.png";
 export default {
+  props: ["list"],
   data() {
     return {
       pageSize: 5,
-      trademarkList: [
-        {
-          img: img,
-          name: "asd",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "213",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "qwe",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "ghkghkj",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "gjgh",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "ghj",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "hj",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "gffgfg",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "tyuiuy",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "poiu",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "qterd",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        },
-        {
-          img: img,
-          name: "bcfd",
-          zhucehao: "1231321321asdasd213",
-          leibie: 0,
-          status: "已注册",
-          time: "2017-12-08"
-        }
-      ],
+      currentPage: 1,
+      trademarkList: [],
       itemList: []
     };
   },
-  mounted() {
+  mounted() {},
+  watch: {
+    list() {
+      this.trademarkList = this.list;
       this.handleCurrentChange(1);
+    }
   },
   methods: {
+    //跳转详情页
+    gotoDetail(sbzch, gjfl) {
+      this.$router.push({ path: "/jdbycdetailtm", query: { sbzch, gjfl } });
+    },
     handleCurrentChange(val) {
       this.itemList = this.trademarkList.slice(
         (val - 1) * this.pageSize,
         val * this.pageSize
       );
+      this.currentPage = val;
+    },
+    //获取序号
+    getIndex(index) {
+      return index + 1 + this.currentPage * this.pageSize - this.pageSize;
     },
     indexMethod(index) {
       return index * 2;
@@ -176,6 +100,10 @@ export default {
 <style lang="scss">
 .trademark {
   width: 100%;
+  .gotoDetail {
+    color: #1478f0;
+    cursor: pointer;
+  }
   h3 {
     display: flex;
     align-items: center;
@@ -235,6 +163,9 @@ export default {
       width: 100%;
       tr {
         width: 100%;
+        .notList {
+          text-align: center;
+        }
         td {
           width: 12.5%;
           padding: 15px;

channel-access/src/views/pages/jdbycdetailtm/index.vue

@@ -298,6 +298,7 @@ export default {
       this.detaildata = res.data.detaildata[0];
       this.registeredList = res.data.nclexist;
       this.unregisteredList = res.data.nclnotexist;
+      console.log(this.detaildata);
     });
   },
   methods: {

channel-access/src/views/pages/user/forgetPassword/index.vue

@@ -99,7 +99,7 @@ export default {
     submitForm() {
       let from = {
         mobile: this.ruleForm.name, // Y 手机号
-        vcode: this.ruleForm.password, //  Y 验证码
+        vcode: this.ruleForm.verificationCode, //  Y 验证码
         newPwd: this.ruleForm.password, // Y 新密码
         userpin: getCookie("userpin") || "" // N 用户登录凭证key
       };