优化任务显示问题及专利详情标题显示专利号

RMS-FrontEnd/src/App.vue

@@ -22,7 +22,7 @@
 
                 <template v-if="mark.reportType==7">
                   &NonBreakingSpace;&NonBreakingSpace;
-                  <a v-if="mark.scratchField && mark.scratchField.includes('权利要求') && (mark.signPatentNo == mark.patentNo)" @click="addStateOpinion()" style="font-size: 14px;font-weight: 500;" >添加特征</a>
+                  <a v-if="mark.scratchField && mark.scratchField.includes('权利要求') && (mark.signPatentNo == mark.pno)" @click="addStateOpinion()" style="font-size: 14px;font-weight: 500;" >添加特征</a>
                   <a v-else-if="mark.signPatentNo != mark.patentNo" @click="addStateOpinion()" style="font-size: 14px;font-weight: 500;" >陈述意见</a>
                  </template>
 
@@ -116,7 +116,7 @@ export default {
         // reportType:this.mark.reportType,
         // taskId:this.mark.taskId,
       }
-      this.$refs.addOpinion.open(form,form.patentNo==form.signPatentNo,true)
+      this.$refs.addOpinion.open(form,this.mark.pno==form.signPatentNo,true)
     },
 
 

RMS-FrontEnd/src/config/index.js

@@ -1,6 +1,7 @@
 const doname = /^([\w-]+\.)+((com)|(net)|(org)|(gov\.cn)|(info)|(cc)|(com\.cn)|(net\.cn)|(org\.cn)|(name)|(biz)|(tv)|(cn)|(mobi)|(name)|(sh)|(ac)|(io)|(tw)|(com\.tw)|(hk)|(com\.hk)|(ws)|(travel)|(us)|(tm)|(la)|(me\.uk)|(org\.uk)|(ltd\.uk)|(plc\.uk)|(in)|(eu)|(it)|(jp))$/;
 export default {
     baseURL: "/api",
+    updateTime:'2023-08-03 13:30:00',
     host: window.location.host,
     hostname: window.location.hostname,
     staticURL: process.env.NODE_ENV === 'production' ? window.location.protocol+'//'+window.location.hostname+':8084' : (process.env.NODE_ENV === 'test'?'http://139.224.24.90:8083':'http://192.168.1.24:8084'),

RMS-FrontEnd/src/views/components/articles/ContrastIndex.vue

@@ -23,7 +23,7 @@
                  <patent-list :patent-id="patentId" :project-id="projectId" @on-change="onChange" />
               </div> -->
                <div>
-              <span v-html="getViewDom(patent.publicNo)"></span>
+              <span v-html="getViewDom(patent.patentNo)"></span>
               <el-tag type="primary" effect="dark" size="mini" class="margin-left_10">{{ patent.simpleStatus }}</el-tag>
               <el-tag v-if="taskId" :type="patentStatus2=='0'?'info':'primary'" effect="dark" size="mini" class="margin-left_10" style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2] }}</el-tag>
             </div>

RMS-FrontEnd/src/views/components/articles/components/mixins.js

@@ -827,6 +827,7 @@ export const addContrast = {
           var a = JSON.parse(this.index)
           a.Id = this.currentSelectObj.Id
           a.patentNo = this.currentSelectObj.patentNo
+          a.pno = this.patent.patentNo
           a.text = this.currentSelectObj.text
           a.rangeId = this.reportId
           a.scratchField = this.currentSelectObj.column

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -64,7 +64,7 @@
                   <img src="@/assets/visual/unfixed.png" width="20px" height="20px" v-if="fix===false&&value==true"  @click="gd" style="position:absolute;top:5px;left:5px"/>
                 <!-- <div style="background-image:url('');width:20px;height:20px"></div> -->
                   <div>
-                  <span v-html="getViewDom(patent.publicNo)"></span>
+                  <span v-html="getViewDom(patent.patentNo)"></span>
                   <el-tag type="primary" effect="dark" size="mini" class="margin-left_10">{{ patent.simpleStatus }}</el-tag>
                   <el-tag :type="patentStatus2=='0'?'info':'primary'" effect="dark" size="mini" class="margin-left_10" style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2] }}</el-tag>
                 </div>

RMS-FrontEnd/src/views/components/common/RichText/index.vue

@@ -193,6 +193,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .edit-box{
+  overflow: hidden;
+    text-overflow: ellipsis;
   padding: 0 15px;
     min-height:40px;
     line-height: 40px;
@@ -208,6 +210,7 @@ export default {
     content: attr(placeholder);
     // margin-left:15px;
     font-style: normal;
+    white-space: nowrap;
     color: #cacdd4;
 }
 // .edit-box:focus::before {

RMS-FrontEnd/src/views/components/import/conditionImport/patentDetails/patentDetail.vue

@@ -9,7 +9,7 @@
                                 <img src="@/assets/visual/fixed.png" width="20px" height="20px" v-if="fix===true" @click="qx" style="position:absolute;top:5px;left:5px"/>
                                 <img src="@/assets/visual/unfixed.png" width="20px" height="20px" v-if="fix===false"  @click="gd" style="position:absolute;top:5px;left:5px"/>
                                 <div>
-                                    <span v-html="getViewDom(patent.publicNo)"></span>
+                                    <span v-html="getViewDom(patent.patentNo)"></span>
                                     <el-tag type="primary" effect="dark" size="mini" class="margin-left_10">{{ patent.simpleStatus }}</el-tag>
                                 </div>
                                 <div style="color: #6b6868; font-size: 15px;border-bottom: 1px solid #e6e6e6;padding-bottom: 5px;">

RMS-FrontEnd/src/views/components/task/components/mixins.js

@@ -31,7 +31,7 @@ export const common = {
             taskType2:{
                 1: 'Excel导入',
                 2: '导出',
-                3: '欧专局导入',
+                // 3: '欧专局导入',
                 4: '专利之星导入',
             },
         }

RMS-FrontEnd/src/views/components/task/components/realTime.vue

@@ -1,7 +1,13 @@
 <template>
   <div style="padding:5px 10px;">
     <el-table :data="taskData" border header-row-class-name="custom-table-header" :maxHeight="tableHeight - 150" v-loading="loadingCancel" element-loading-text = "请耐心等待，数据正在加载中...">
-            <el-table-column label="任务名称" prop="taskName" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column label="任务名称" prop="taskName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div style="overflow:hidden;white-space: nowrap;text-overflow: ellipsis;">
+                  {{ scope.row.taskName }}
+                </div>
+              </template>
+            </el-table-column>
             <!-- <el-table-column label="任务数量" prop="total" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>

RMS-FrontEnd/src/views/components/task/components/todoList.vue

@@ -36,7 +36,13 @@
                 <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="任务名称" prop="taskName" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column label="任务名称" prop="taskName" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div style="overflow:hidden;white-space: nowrap;text-overflow: ellipsis;">
+                  {{ scope.row.taskName }}
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column  label="创建时间" prop="createTime" align="center" sortable="custom" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime }}</span>

RMS-FrontEnd/src/views/components/task/index.vue

@@ -46,8 +46,8 @@ export default {
   },
   methods: {
     connectWebSocket() {
-      // let webSocket = new WebSocket(`ws://${this.$c.hostname}:8877/api/v2/ws/`+this.userinfo.id)
-      let webSocket = new WebSocket(`ws://192.168.1.24:8877/api/v2/ws/`+this.userinfo.id)
+      let webSocket = new WebSocket(`ws://${this.$c.hostname}:8877/api/v2/ws/`+this.userinfo.id)
+      // let webSocket = new WebSocket(`ws://192.168.1.24:8877/api/v2/ws/`+this.userinfo.id)
       this.webSocket = webSocket
       webSocket.onopen = () => {
         console.log('WebSocket连接成功')

RMS-FrontEnd/src/views/index/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app" class="keyInput">
-    <img src="https://img2.baidu.com/it/u=3473953544,1174334705&fm=253&fmt=auto&app=138&f=JPEG?w=925&h=500" style=""/>
+    <img v-if="show" src="https://img2.baidu.com/it/u=3473953544,1174334705&fm=253&fmt=auto&app=138&f=JPEG?w=925&h=500" style=""/>
     <el-input v-model="input" id="keyInput"></el-input>
   </div>
 </template>
@@ -36,7 +36,7 @@ export default {
     },
   },
   mounted() {
-    var time = new Date("2023-08-03 10:30:00").getTime()
+    var time = new Date(this.$c.updateTime).getTime()
     var time2 = new Date().getTime()
     if(time2>=time){
       this.show = false

RMS-FrontEnd/src/views/layout/mixins/index.js

@@ -4,8 +4,8 @@ import Store from '@/store'
 export const webSocket = {
   methods: {
     connectWebSocket(userId) {
-      // let webSocket = new WebSocket(`ws://${this.$c.hostname}:8872/api/report/api/ws/`+userId)
-      let webSocket = new WebSocket(`ws://192.168.1.24:8872/api/report/api/ws/`+userId)
+      let webSocket = new WebSocket(`ws://${this.$c.hostname}:8872/api/report/api/ws/`+userId)
+      // let webSocket = new WebSocket(`ws://192.168.1.24:8872/api/report/api/ws/`+userId)
       Store.commit('SET_WEB_SOCKET', webSocket)
       webSocket.onopen = () => {
         console.log('WebSocket连接成功')

RMS-FrontEnd/src/views/login/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="login">
-    <div class="login-weaper">
+  <div class="login" v-if="show">
+    <div class="login-weaper" >
       <div class="login-left">
         <div class="login-time">{{ time.txt }}</div>
         <div class="login-left-box">
@@ -107,6 +107,7 @@ export default {
   },
   data() {
     return {
+      show:false,
       quotationsList: [
         {
           name: '颜渊',
@@ -174,7 +175,18 @@ export default {
       };
     },
   },
+  beforeCreate(){
+    
+  },
   created() {
+    var time = new Date(this.$c.updateTime).getTime()
+    var time2 = new Date().getTime()
+    if(time2 < time){
+      this.$router.push({path: '/'})
+      return false
+    }else{
+      this.show = true
+    }
     
     var url=location.href;
     var params=url.split("?");
@@ -199,7 +211,7 @@ export default {
           }
  
        }
-   
+    
     this.initTime();
    
   },

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/ContrasrProduct.vue

@@ -54,7 +54,7 @@
                       <img src="@/assets/visual/unfixed.png" width="20px" height="20px" v-if="fix===false&&value==true"  @click="gd" style="position:absolute;top:5px;left:5px"/> -->
                   <!-- <div style="background-image:url('');width:20px;height:20px"></div> -->
                   <div>
-                    <span v-html="getViewDom(patent.publicNo)"></span>
+                    <span v-html="getViewDom(patent.patentNo)"></span>
                     <el-tag type="primary" effect="dark" size="mini" class="margin-left_10">{{ patent.simpleStatus
                     }}</el-tag>
                     <el-tag v-if="reportType!=4" :type="patentStatus2 == '0' ? 'info' : 'primary'" effect="dark" size="mini" class="margin-left_10"

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/patentMessage.vue

@@ -8,7 +8,7 @@
               <div class="patent-articles-title-box">
                 <div style="position:relative">
                    <div>
-                  <span v-html="getViewDom(patent.publicNo)"></span>
+                  <span v-html="getViewDom(patent.patentNo)"></span>
                   <el-tag type="primary" effect="dark" size="mini" class="margin-left_10">{{ patent.simpleStatus }}</el-tag>
                   <el-tag :type="patentStatus2 == '0' ? 'info' : 'primary'" effect="dark" size="mini" class="margin-left_10"
                       style="cursor: pointer" @click="changeStatus(patentStatus2)">{{ patentStatus[patentStatus2]

RMS-FrontEnd/src/views/report/InvalidResponse/components/FileDetails/patentDetail.vue

@@ -9,7 +9,7 @@
                                 <img src="@/assets/visual/fixed.png" width="20px" height="20px" v-if="fix===true" @click="qx" style="position:absolute;top:5px;left:5px"/>
                                 <img src="@/assets/visual/unfixed.png" width="20px" height="20px" v-if="fix===false"  @click="gd" style="position:absolute;top:5px;left:5px"/>
                                 <div>
-                                    <span v-html="getViewDom(patent.publicNo)"></span>
+                                    <span v-html="getViewDom(patent.patentNo)"></span>
                                     <el-tag type="primary" effect="dark" size="mini" class="margin-left_10">{{ patent.simpleStatus }}</el-tag>
                                 </div>
                                 <div style="color: #6b6868; font-size: 15px;border-bottom: 1px solid #e6e6e6;padding-bottom: 5px;">