Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/components/articles/components/history/examination.vue

@@ -197,7 +197,7 @@ export default {
           })
         }
     },
-    edit(row,index) {
+   async edit(row,index) {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
@@ -216,16 +216,20 @@ export default {
           row.patentNo = this.patent.publicNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
-          this.$api.updateReviewHistory(formData).then(res => { 
+          await this.$api.updateReviewHistory(formData).then(res => { 
             if (res.code==200) {
               this.$message.success('修改成功')
+              this.$refs.upload.clearFiles()
+              row.fileList=[]
               this.getList2(row,index)
             }
           })
         } else {
-          this.$api.addReviewHistory(formData).then(res => { 
+          await this.$api.addReviewHistory(formData).then(res => { 
             if (res.code==200) {
               this.$message.success('保存成功')
+              this.$refs.upload.clearFiles()
+              row.fileList=[]
               this.getList2(row,index)
             }
           })
@@ -241,7 +245,8 @@ export default {
           if(!row.id){
             this.$set(this.reviewData[index],'id',res.data.records[index].id)
           }
-          this.$set(this.reviewData[index],'reportFiles',res.data.records[index].reportFiles)
+          this.$set(this.reviewData[index], 'reportFiles', res.data.records[index].reportFiles)
+          this.total=res.data.total
         }
       })
     },
@@ -296,7 +301,7 @@ export default {
           for (let i = 0; i < res.data.records.length; i++){
             res.data.records[i].vVisible=true
           }
-          this.total=res.data.records.length
+          this.total=res.data.total
           this.reviewData=res.data.records
         }
       })

RMS-FrontEnd/src/views/components/articles/components/history/invalid.vue

@@ -211,7 +211,7 @@ export default {
           })
         }
     },
-    edit(row,index) {
+   async edit(row,index) {
       if (row.vVisible == false) {
         // let data = {
           
@@ -233,16 +233,22 @@ export default {
           row.patentNo = this.patent.publicNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
-          this.$api.editInvalidRecord(formData).then(res => { 
+         await this.$api.editInvalidRecord(formData).then(res => { 
             if (res.code==200) {
               this.$message.success('修改成功')
+              row.fileList=[]
+              this.$refs.upload.clearFiles()
+              
               this.getList2(row,index)
             }
           })
         } else {
-          this.$api.addInvalidRecord(formData).then(res => { 
+          await this.$api.addInvalidRecord(formData).then(res => { 
             if (res.code == 200) {
               this.$message.success('保存成功')
+              row.fileList=[]
+              this.$refs.upload.clearFiles()
+              
               this.getList2(row,index)
             }
           })
@@ -260,7 +266,8 @@ export default {
           if(!row.id){
             this.$set(this.invalidData[index],'id',res.data.records[index].id)
           }
-          this.$set(this.invalidData[index],'reportFiles',res.data.records[index].reportFiles)
+          this.$set(this.invalidData[index], 'reportFiles', res.data.records[index].reportFiles)
+          this.total=res.data.total
         }
       })
     },
@@ -317,7 +324,7 @@ export default {
           for (let i = 0; i < res.data.records.length; i++){
             res.data.records[i].vVisible=true
           }
-          this.total=res.data.records.length
+          this.total=res.data.total
           this.invalidData=res.data.records
         }
       })

RMS-FrontEnd/src/views/components/articles/components/history/litigation.vue

@@ -227,7 +227,7 @@ export default {
           })
         }
     },
-    edit(row,index) {
+    async edit(row,index) {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
@@ -251,16 +251,20 @@ export default {
           row.patentNo = this.patent.publicNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
-          this.$api.editLitigationHistory(formData).then(res => { 
+          await this.$api.editLitigationHistory(formData).then(res => { 
             if (res.code == 200) {
               this.$message.success('修改成功')
+              this.$refs.upload.clearFiles()
+              row.fileList=[]
               this.getList2(row,index)
             }
           })
         } else {
-          this.$api.addLitigationHistory(formData).then(res => { 
+          await this.$api.addLitigationHistory(formData).then(res => { 
             if (res.code == 200) {
               this.$message.success('保存成功')
+              this.$refs.upload.clearFiles()
+              row.fileList=[]
               this.getList2(row,index)
             }
           })
@@ -278,6 +282,7 @@ export default {
             this.$set(this.litigationData[index],'id',res.data.records[index].id)
           }
           this.$set(this.litigationData[index],'reportFiles',res.data.records[index].reportFiles)
+          this.total=res.data.total
         }
       })
     },
@@ -333,7 +338,7 @@ export default {
           for (let i = 0; i <  res.data.records.length; i++){
             res.data.records[i].vVisible=true
           }
-          this.total=res.data.records.length
+          this.total=res.data.total
           this.litigationData = res.data.records
         }
       })

RMS-FrontEnd/src/views/components/articles/components/history/other.vue

@@ -194,7 +194,7 @@ export default {
           })
         }
     },
-    edit(row,index) {
+    async edit(row,index) {
       if (row.vVisible == false) {
         // let data = {
         //   id: row.id,
@@ -213,16 +213,20 @@ export default {
           row.patentNo = this.patent.publicNo
           formData.append("jsons", JSON.stringify(row));
         if (row.id) {
-          this.$api.updateReferences(formData).then(res => { 
+          await this.$api.updateReferences(formData).then(res => { 
               if (res.code==200) {
                 this.$message.success('修改成功')
+                this.$refs.upload.clearFiles()
+              row.fileList=[]
                 this.getList2(row,index)
               }
           })
         } else {
-          this.$api.addReferences(formData).then(res => { 
+          await this.$api.addReferences(formData).then(res => { 
               if (res.code==200) {
                 this.$message.success('保存成功')
+                this.$refs.upload.clearFiles()
+              row.fileList=[]
                 this.getList2(row,index)
               }
           })
@@ -251,7 +255,8 @@ export default {
           if(!row.id){
             this.$set(this.reviewData[index],'id',res.data.records[index].id)
           }
-          this.$set(this.reviewData[index],'reportFiles',res.data.records[index].reportFiles)
+          this.$set(this.reviewData[index], 'reportFiles', res.data.records[index].reportFiles)
+          this.total=res.data.total
         }
       })
     },
@@ -306,7 +311,7 @@ export default {
           for (let i = 0; i < res.data.records.length; i++){
             res.data.records[i].vVisible=true
           }
-          this.total=res.data.records.length
+          this.total=res.data.total
           this.reviewData=res.data.records
         }
       })

RMS-FrontEnd/src/views/components/articles/components/history/permit.vue

@@ -26,13 +26,13 @@
            <el-table-column label="许可时间" prop="licenseTime" align="center">
                <template slot-scope="scope">
                    <span v-if="!scope.row.vVisible">{{scope.row.licenseTime? scope.row.licenseTime.slice(0,10):'' }}</span>
-                   <el-date-picker style="width:100%" v-else v-model="scope.row.licenseTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期时间"> </el-date-picker>
+                   <el-date-picker style="width:100%" v-else v-model="scope.row.licenseTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" placeholder="选择日期时间"> </el-date-picker>
                </template>
            </el-table-column>
            <el-table-column label="截止时间" prop="licenseDeadLine" align="center">
                <template slot-scope="scope">
                    <span v-if="!scope.row.vVisible">{{scope.row.licenseDeadLine? scope.row.licenseDeadLine.slice(0,10):'' }}</span>
-                   <el-date-picker style="width:100%" v-else v-model="scope.row.licenseDeadLine" type="date" value-format="yyyy-MM-dd" placeholder="选择日期时间"> </el-date-picker>
+                   <el-date-picker style="width:100%" v-else v-model="scope.row.licenseDeadLine" type="date" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" placeholder="选择日期时间"> </el-date-picker>
                </template>
            </el-table-column>
            <el-table-column label="许可费用/万元" prop="licenseFee" align="center">

RMS-FrontEnd/src/views/components/common/menu/mixins.js

@@ -13,7 +13,7 @@ export const File = {
                 var FileUrl = this.$p + item.url
                 var isPicture = 0
             }else{
-                var FileUrl =  'http://192.168.1.24:8012/onlinePreview?url='+ btoa(encodeURIComponent(this.$p + item.url))
+                var FileUrl =  'http://192.224.24.90:8012/onlinePreview?url='+ btoa(encodeURIComponent(this.$p + item.url))
                 var isPicture = 0
             }
             const router = this.$router.resolve({

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://139.224.24.90: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://139.224.24.90: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/product/components/framework/framework.vue

@@ -114,7 +114,7 @@ export default {
     commandPackage(row) {
       if (row.pictures && row.pictures.length>0) {
          var item = row.pictures[0]//图片每条信息
-          var FileUrl = this.$p + row.pictures[0].url//每张图片的url
+          var FileUrl = this.$p2 + row.pictures[0].url//每张图片的url
           var isPicture = 1
           const router = this.$router.resolve({
                 path: '/checkFile',

RMS-FrontEnd/src/views/product/components/framework/frameworkTree.vue

@@ -69,7 +69,7 @@
                       <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview"></i>
                       <i class="el-icon-delete" @click.stop="handleRemove"></i></span>
                     </span>
-                    <el-image ref="image" style="width:100%;height: 100%;" :src="frameworkForm.pictures[0].id? $p + frameworkForm.pictures[0].url:frameworkForm.pictures[0].url" :preview-src-list="frameworkForm.pictures"></el-image>
+                    <el-image ref="image" style="width:100%;height: 100%;" :src="frameworkForm.pictures[0].id? $p2 + frameworkForm.pictures[0].url:frameworkForm.pictures[0].url" :preview-src-list="frameworkForm.pictures"></el-image>
                   </span>
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                 </el-upload>

RMS-FrontEnd/src/views/product/components/product.vue

@@ -146,7 +146,7 @@
               <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview"></i>
               <i class="el-icon-delete" @click.stop="handleRemove"></i></span>
             </span>
-            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures"></el-image>
+            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p2 + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures"></el-image>
           </span>
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
@@ -182,7 +182,7 @@
           <el-input v-model="categoryForm.licenseRate" placeholder="请输入参考许可费率(许可费率介于0-1之间)"></el-input>
         </el-form-item>
         <el-form-item label="图片 ">
-          <el-upload ref="upload"  action="#" :auto-upload="false"  :on-change="handleChange"  list-type="picture" :show-file-list="false">
+          <el-upload ref="upload"  action="#" :auto-upload="false"  :on-change="handleChange1"  list-type="picture" :show-file-list="false">
             <span v-if="categoryForm.pictures&&categoryForm.pictures.length>0" class="avatar">
               <span class="deleteImg">
                 <span> 
@@ -190,7 +190,7 @@
                   <i class="el-icon-delete" @click.stop="handleRemove"></i>
                 </span>
               </span>
-                <el-image ref="image" style="width:100%;height: 100%;" :src="categoryForm.pictures[0].id?$p + categoryForm.pictures[0].url:categoryForm.pictures[0].url" :preview-src-list="categoryForm.pictures"></el-image>
+                <el-image ref="image" style="width:100%;height: 100%;" :src="categoryForm.pictures[0].id?$p2 + categoryForm.pictures[0].url:categoryForm.pictures[0].url" :preview-src-list="categoryForm.pictures"></el-image>
             </span>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
@@ -276,7 +276,7 @@ export default {
   },
   computed: {
     userinfo() {
-      return this.$store.state.user.userinfo
+      return this.$store.state.admin.userinfo
     }
   },
   watch:{
@@ -521,7 +521,7 @@ export default {
     previewPictures(row) {
       if (row.pictures && row.pictures.length>0) {
               var item = row.pictures[0]//图片每条信息
-              var FileUrl = this.$p + row.pictures[0].url//每张图片的url
+              var FileUrl = this.$p2 + row.pictures[0].url//每张图片的url
               var isPicture = 1
               const router = this.$router.resolve({
                     path: '/checkFile',
@@ -613,7 +613,10 @@ export default {
       this.$set(this.productForm,'pictures', [{url:file.url}])
       this.file=[file.raw]
     },
-   
+    handleChange1(file, fileList) {
+      this.$set(this.categoryForm,'pictures', [{url:file.url}])
+      this.file=[file.raw]
+    },
   },
 }
 </script>

RMS-FrontEnd/src/views/product/components/productCollapse.vue

@@ -137,7 +137,7 @@ export default {
     previewPictures(row) {
       if (row.pictures && row.pictures.length>0) {
               var item = row.pictures[0]//图片每条信息
-              var FileUrl = this.$p + row.pictures[0].url//每张图片的url
+              var FileUrl = this.$p2 + row.pictures[0].url//每张图片的url
               var isPicture = 1
               const router = this.$router.resolve({
                     path: '/checkFile',

RMS-FrontEnd/src/views/product/components/products.vue

@@ -111,7 +111,7 @@
               <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview"></i>
               <i class="el-icon-delete" @click.stop="handleRemove"></i></span>
             </span>
-            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures"></el-image>
+            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p2 + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures"></el-image>
           </span>
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
@@ -190,7 +190,7 @@ export default {
   },
   computed: {
     userinfo() {
-      return this.$store.state.user.userinfo
+      return this.$store.state.admin.userinfo
     }
   },
   watch:{
@@ -316,7 +316,7 @@ export default {
         case '7':// 图片预览
           if (row.pictures && row.pictures.length>0) {
               var item = row.pictures[0]//图片每条信息
-              var FileUrl = this.$p + row.pictures[0].url//每张图片的url
+              var FileUrl = this.$p2 + row.pictures[0].url//每张图片的url
               var isPicture = 1
               const router = this.$router.resolve({
                     path: '/checkFile',

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Result.vue

@@ -684,7 +684,10 @@ export default {
                 }
                 // this.tableData = []
                 this.$api.selectCompareRecord(a).then(response=>{
-                  if(response.code == 200){
+                  if (response.code == 200) {
+                    if (response.data.length == 0) {
+                      return false
+                    }
                     this.CompareRecord = JSON.parse(JSON.stringify(response.data.records))
                     // //console.log(response.data)
                     var b = JSON.parse(JSON.stringify(this.tableData[0]))