Forráskód Böngészése

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

zhuhao 2 éve
szülő
commit
e0a7cfb513

+ 1 - 1
RMS-FrontEnd/src/App.vue

@@ -70,7 +70,7 @@ export default {
   mounted() {
     var time = new Date(this.$c.updateTime).getTime()
     var time2 = new Date().getTime()
-    if(time2 < time){
+    if(time2 < time && !localStorage.canShow){
         this.$router.push({path: '/'})
         return false
     }

+ 21 - 0
RMS-FrontEnd/src/api/report.js

@@ -307,6 +307,27 @@ export default {
     return axios.get('/report/api/References/deleReferences',{params})
   },
 
+  //添加或更新作为无效证据使用历史
+  addOrUpdateInvalidReasonHistory(params){
+    return axios.post('/v2/invalidReasonHistory/addOrUpdateHistory',params)
+  },
+  //查询作为无效证据使用历史
+  queryInvalidReasonHistory(params){
+    return axios.post('/v2/invalidReasonHistory/queryHistory',params)
+  },
+  //删除作为无效证据使用历史
+  deleteInvalidReasonHistory(params){
+    return axios.post('/v2/invalidReasonHistory/deleteHistory',params)
+  },
+
+  //查看无效证据推荐
+  querySimFeaturePatentByPatentNo(params){
+    return axios.post('/report/api/feature/querySimFeaturePatentByPatentNo',params)
+  },
+
+
+
+
   //上一篇、下一篇
   getBetweenPatentList(params){
     return axios.post('/report/api/AssoTaskPersonel/getPartClient',params)

+ 1 - 1
RMS-FrontEnd/src/config/index.js

@@ -1,7 +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-04 08:00:00',
+    updateTime:'2023-08-16 13:48: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'),

+ 9 - 0
RMS-FrontEnd/src/router/index.js

@@ -255,6 +255,15 @@ const routes = [
         },
         component: () => import('@/views/components/task/taskIndex.vue'),
       },
+       //检索历史
+    {
+      path: "/searchHistory",
+      meta: {
+      title: '检索历史',
+      button: [],
+    },
+    component: () => import('@/views/components/import/conditionImport/components/search_history.vue'),
+    },
       {
         path: '/SelectedPatent',
         name:"SelectedPatent",

+ 3 - 3
RMS-FrontEnd/src/views/components/articles/components/PatentFamily.vue

@@ -8,8 +8,8 @@
           <el-option label="扩展同族" :value="3"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="公开号">
-        <el-input v-model="queryParams.patentNo" size="small" placeholder="请输入公开号"></el-input>
+      <el-form-item label="专利号">
+        <el-input v-model="queryParams.patentNo" size="small" placeholder="请输入专利号"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="" size="small" @click="getList">查询</el-button>
@@ -26,7 +26,7 @@
           <span v-else v-html="getViewDom(scope.row.name)"></span>
         </template>
       </el-table-column>
-      <el-table-column label="公开号" align="center" show-overflow-tooltip>
+      <el-table-column label="专利号" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span v-html="getViewDom(scope.row.patentNo)"></span>
         </template>

+ 1 - 1
RMS-FrontEnd/src/views/components/articles/components/PatentRight.vue

@@ -96,7 +96,7 @@ export default {
 .patent-articles-patent-right {
   margin-bottom: 20px;
   .common {
-    font-size: 14px;
+    // font-size: 14px;
     margin-top: 0;
     padding-right: 5px;
     word-break: break-all;

+ 166 - 39
RMS-FrontEnd/src/views/components/articles/components/history/HistoryOfInvalidEvidence.vue

@@ -3,76 +3,92 @@
     <div style="display:flex;justify-content: flex-end;margin-bottom:20px">
         <el-button @click="add">添加</el-button>
     </div>
-    <el-table :data="tableData" v-loading="loading" border style="width: 100%">
-        <el-table-column label="无效案号" prop="newPatentNo" align="center">
+    <el-table :data="tableData" v-loading="loading" :maxHeight="tableHeight" border style="width: 100%">
+        <el-table-column label="无效案号" prop="invalidCaseNum" align="center">
             <template slot-scope="scope">
-                <span>{{scope.row.newPatentNo}}</span>
+                <span>{{scope.row.invalidCaseNum}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="被无效专利" prop="patentNo" align="center">
+        <el-table-column label="被无效专利" prop="invalidedPatent" align="center">
             <template slot-scope="scope">
-                <span>{{scope.row.patentNo}}</span>
+                <span>{{scope.row.invalidedPatent}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="无效时间" prop="time" align="center">
+        <el-table-column label="无效时间" prop="invalidTime" align="center">
             <template slot-scope="scope">
-                <span>{{scope.row.time}}</span>
+                <span v-if="scope.row.invalidTime">{{scope.row.invalidTime.substring(0,10)}}</span>
+                <span v-else></span>
             </template>
         </el-table-column>
-        <el-table-column label="无效理由" prop="reason" align="center">
+        <el-table-column label="无效理由" prop="invalidReason" align="center">
             <template slot-scope="scope">
-                <span>{{scope.row.reason}}</span>
+                <span>{{scope.row.invalidReason}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="是否被审查员认可" prop="approve" align="center">
+        <el-table-column label="是否被审查员认可" prop="ifApproved" align="center">
             <template slot-scope="scope">
-                <span>{{scope.row.approve}}</span>
+                <span>{{scope.row.ifApproved?'是':'否'}}</span>
             </template>
         </el-table-column>
-        <el-table-column label="附件" prop="reportFiles" align="center">
+        <el-table-column label="附件" prop="files" align="center">
             <template slot-scope="scope">
                 <span>
-                    <span v-if="scope.row.reportFiles">
-                        <div v-for="item in scope.row.reportFiles" style="margin:0;display:flex;justify-content:space-around;align-items:center;">
+                    <span v-if="scope.row.files  && scope.row.files.length>0">
+                        <div v-for="item in scope.row.files" style="margin:0;display:flex;justify-content:space-around;align-items:center;">
                             <p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis;cursor: pointer">{{item.name?item.name+'.'+item.suffix:item.fileName}}</p> 
-                            <Menu :data="item" @delFile="delFile1(scope.row,item.id,scope.$index)"></Menu>
+                            <Menu :data="item" @delFile="delFile(scope.row,item.id,1)"></Menu>
                         </div>
                     </span>
                     <span v-else><i class="el-icon-minus"></i></span>
                 </span>
             </template>
         </el-table-column>
+        <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-link @click="edit(scope.row)">编辑</el-link>
+              <el-link type="danger" class="margin-left_10" @click="delData(scope.row)">删除</el-link>
+            </template>
+        </el-table-column>
     </el-table>
-    <el-dialog title="新增无效证据使用历史" :visible.sync="visible" width="1000px" :before-close="close">
+    <div class="pagination">
+      <el-pagination :current-page.sync="queryParams.current" :page-size="queryParams.size" :total="total" @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper" background></el-pagination>
+    </div>
+    <el-dialog :title="title" :visible.sync="visible" width="1000px" :before-close="close">
         <div>
-            <el-form ref="form" :model="form" :rules="rules">
-                <el-form-item label="无效案号" prop="newPatentNo">
-                    <el-input v-model="form.newPatentNo" placeholder="请输入无效案号"></el-input>
+            <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+                <el-form-item label="无效案号" prop="invalidCaseNum">
+                    <el-input v-model="form.invalidCaseNum" placeholder="请输入无效案号"></el-input>
                 </el-form-item>
-                <el-form-item label="被无效专利" prop="patentNo">
-                    <el-input v-model="form.patentNo" placeholder="请输入被无效专利"></el-input>
+                <el-form-item label="被无效专利" prop="invalidedPatent">
+                    <el-input v-model="form.invalidedPatent" placeholder="请输入被无效专利"></el-input>
                 </el-form-item>
-                <el-form-item label="无效时间" prop="time">
+                <el-form-item label="无效时间" prop="invalidTime">
                     <el-date-picker
                         style="width: 100%"
-                        v-model="form.time"
+                        v-model="form.invalidTime"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期时间"
                     >
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="无效理由" prop="reason">
-                    <el-input v-model="form.reason" placeholder="请输入无效理由"></el-input>
+                <el-form-item label="无效理由" prop="invalidReason">
+                    <el-input v-model="form.invalidReason" placeholder="请输入无效理由"></el-input>
                 </el-form-item>
                 <el-form-item label="是否被审查员认可" prop="approve">
-                    <el-input v-model="form.approve" placeholder="请输入是否被审查员认可"></el-input>
+                    <el-switch
+                      v-model="form.ifApproved"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949"
+                      :active-value="1"
+                      :inactive-value="0">
+                    </el-switch>
                 </el-form-item>
                 <el-form-item label="上传附件">
-                    <div v-if="form.reportFiles" class="upload-file">
-                        <div v-for="item in form.reportFiles" style="margin:0;display:flex;justify-content:space-around;">
+                    <div v-if="form.files" class="upload-file">
+                        <div v-for="item in form.files" style="margin:0;display:flex;justify-content:space-around;">
                         <p style="margin:0;width:calc(100% - 40px);overflow: hidden;white-space: nowrap;text-overflow:ellipsis;cursor: pointer">{{item.name?item.name+'.'+item.suffix:item.fileName}}</p> 
-                            <Menu :data="item" @delFile="delFile"></Menu>
+                            <Menu :data="item" @delFile="delFile(form,item.id)"></Menu>
                         </div>
                     </div>
                     <el-upload  ref="upload" class="upload-file" drag action="#" :auto-upload="false" :show-file-list="true" :on-change="onChange" multiple  :on-preview="handlePreview" :on-remove="handleRemove">
@@ -92,11 +108,15 @@
 </template>
 
 <script>
+import Menu from '@/views/components/common/menu/index2.vue'
 export default {
-  components: {},
-  props: {},
+  components:{
+      Menu
+    },
+  props:["patent"],
   data() {
     return {
+        title:'新增无效证据使用历史',
         tableData:[],
         visible:false,
         btnLoading:false,
@@ -104,12 +124,24 @@ export default {
         form:{},
         Already:[],
         file:[],
+        queryParams:{
+          current:1,
+          size:10,
+          patentNo:this.patent.patentNo
+        },
+        total:0,
+        tableHeight:document.documentElement.clientHeight- 410,
         rules:{
 
         }
     };
   },
-  watch: {},
+  watch: {
+    patent(val){
+      this.queryParams.patentNo = val.patentNo
+      this.getList()
+    }
+  },
   computed: {},
   created() {},
   mounted() {
@@ -118,29 +150,124 @@ export default {
   methods: {
     //查询数据
     getList(){
-
+      this.loading = true
+      this.$api.queryInvalidReasonHistory(this.queryParams).then(response=>{
+        if(response.code == 200 ){
+          this.tableData = response.data.records
+          this.total = response.data.total
+          this.loading = false
+        }
+      }).catch(error=>{
+        this.tableData = []
+        this.total = 0
+        this.loading = false
+      })
     },
     //打开弹窗
     add(){
-
+      this.title = '新增无效证据使用历史'
+      this.form = {}
+      this.visible = true
+    },
+    //编辑数据
+    edit(row){
+      this.form = JSON.parse(JSON.stringify(row))
+      this.title = '编辑无效证据使用历史'
+      this.visible = true
     },
     //关闭弹窗
     close(){
-       
+       this.form = {}
+       this.file = []
+       this.$refs.upload.clearFiles()
+       this.visible = false
+    },
+    //删除数据
+    delData(row){
+      this.deletes([row.id])
+    },
+    //批量删除
+    deletes(ids){
+      this.$confirm("确认删除本条数据吗?", "提示", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				}).then(() => {
+          this.$api.deleteInvalidReasonHistory(ids).then(response=>{
+            if(response.code == 200){
+              this.$message.success('删除成功')
+              this.getList()
+            }
+          }).catch(error=>{
+            this.$message.error('删除失败')
+          })
+        })
+      
     },
     //添加数据
     submit(){
         this.btnLoading = true
-        this.btnLoading = false
+        let formData = new FormData()
+          if(this.file && this.file.length>0){
+            for (var i = 0; i < this.file.length; i++) {
+              formData.append("files", this.file[i]);
+            }
+          }
+          this.form.patentNo = this.patent.patentNo
+          formData.append("history", JSON.stringify(this.form));
+          this.$api.addOrUpdateInvalidReasonHistory(formData).then(response=>{
+            if(response.code == 200){
+              if(this.form.id){
+                this.$message.success('更新成功')
+              }else{
+                this.$message.success('添加成功')
+              }
+              this.close()
+              this.getList()
+              this.btnLoading = false
+            }
+          }).catch(error=>{
+            // if(this.form.id){
+            //     this.$message.error('更新失败')
+            //   }else{
+            //     this.$message.error('添加失败')
+            //   }
+            this.btnLoading = false
+          })
+        
+    },
+    //分页
+    handleCurrentChange(val) {
+      this.queryParams.current = val;
+      this.getList();
+    },
+    //删除文件
+    delFile(row,id,index){
+      console.log(row,id)
+        var index1 = row.files.findIndex(item=>{
+          return item.id == id
+        })
+        if(index1!=-1){
+          row.files.splice(index1,1)
+          console.log(row.files)
+        }
+        if(index){
+          this.form = row
+          this.submit()
+          this.$nextTick(()=>{
+            this.from = {}
+          })
+        }
+        
     },
     //切换上传附件
     onChange(file, fileList) {
-      if(this.form.reportFiles){
-        var index3 = this.form.reportFiles.findIndex(item=>{
+      if(this.form.files){
+        var index3 = this.form.files.findIndex(item=>{
           return item.name+'.'+item.suffix == file.raw.name
         })
         if(index3!=-1){
-          this.Already.push(this.form.reportFiles[index3].name)
+          this.Already.push(this.form.files[index3].name)
           var index2 = fileList.reverse().findIndex(item=>{
             return item.raw.name == file.raw.name
           })

+ 130 - 8
RMS-FrontEnd/src/views/components/articles/components/history/InvalidEvidencePush.vue

@@ -1,7 +1,9 @@
 <template>
   <div>
     <el-table
+    v-if="false"
       :data="tableData"
+      :maxHeight="tableHeight"
       border
       v-loading="loading"
       :span-method="objectSpanMethod"
@@ -10,38 +12,158 @@
       <el-table-column prop="patentNo" align="center" label="专利号" width="200px">
         <template slot-scope="scope">
           <div>
-            <el-link type="primary" >{{ scope.row.patentNo }}</el-link>
+            <el-link type="primary" >{{ scope.row.CompareRecord.patentNo }}</el-link>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="content" align="center" label="文字">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.CompareRecord.content }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Fcontent" align="center" label="特征">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.feature.content }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="content" align="center" label="文字"></el-table-column>
-      <el-table-column prop="Fcontent" align="center" label="特征"></el-table-column>
     </el-table>
+
+    <el-table
+      v-if="true"
+      :data="tableData"
+      :maxHeight="tableHeight"
+      row-key="patentNo"
+      :expand-row-keys="expands"
+      @expand-change="expandChange"
+      v-loading="loading"
+      style="width:100%">
+      <el-table-column type="expand">
+      <template slot-scope="scope">
+        <div style="padding:10px 20px">
+          <el-table
+          :data="scope.row.compareRecords"
+          border
+          v-loading="loading"
+          :span-method="objectSpanMethod"
+          style="min-width: 100%; overflow: auto"
+        >
+          <el-table-column prop="content" align="center" label="文字">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.content }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="Fcontent" align="center" label="特征">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.featureContent }}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        </div>
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="专利号"
+      prop="patentNo"
+      align="center"
+      >
+    </el-table-column>
+    <el-table-column
+      label="标题"
+      prop="title"
+      align="center"
+      >
+    </el-table-column>
+    
+  </el-table>
+    <div class="pagination">
+      <el-pagination :current-page.sync="queryParams.current" :page-size="queryParams.size" :total="total" @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper" background></el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
 export default {
   components: {},
-  props: {},
+  props:["patent"],
   data() {
     return {
         tableData:[],
+        expands:[],
         loading:false,
-        mergeArr:{},
-        mergeObj:{}
+        mergeArr:['id', 'patentNo'],
+        mergeObj:{},
+        queryParams:{
+          patentNo:this.patent.patentNo,
+          current:1,
+          size:10
+        },
+        total:0,
+        tableHeight:document.documentElement.clientHeight- 320,
     };
   },
-  watch: {},
+  watch: {
+    patent(val){
+      this.queryParams.patentNo = this.patent.patentNo
+      this.getList()
+    }
+  },
   computed: {},
   created() {},
   mounted() {
     this.getList()
   },
   methods: {
+    //展开行
+    expandChange(row, expanded){
+      if(this.expands.indexOf(row.patentNo)!=-1){
+        this.expands = []
+      }else{
+        this.expands = [row.patentNo]
+      }
+      
+    },
+    //分页
+    handleCurrentChange(val) {
+      this.queryParams.current = val;
+      this.getList();
+    },
     //获取数据
     getList(){
-
+      this.loading = true
+      // var params={
+      //   patentNo:this.patent.patentNo
+      // }
+      this.tableData = []
+      this.$api.querySimFeaturePatentByPatentNo(this.queryParams).then(response=>{
+        if(response.code == 200){
+          this.tableData = response.data.records
+          this.total = response.data.total
+          // response.data.forEach(item=>{
+          //   item.features.forEach(y=>{
+          //     y.CompareRecords.forEach(i=>{
+          //       for(let key in y.feature){
+          //         i['F'+key] = y.feature[key]
+          //       }
+          //       this.tableData.push(i)
+          //     })
+          //   })
+            
+          // })
+          this.getSpanArr(this.tableData)
+          this.loading = false
+        }
+      }).catch(error=>{
+        this.tableData = []
+        this.loading = false
+      })
     },
     //获取每个元素所需合并的行数
     getSpanArr(data) {

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

@@ -98,7 +98,7 @@ export default {
   },
   watch:{
       patent(val){
-            this.queryParams.patentNo = val.patentNo
+            this.queryParams.patentNo = val.publicNo
             this.getList()
         }
    },

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

@@ -110,7 +110,7 @@ export default {
   },
   watch:{
         patent(val){
-            this.queryParams.patentNo = val.patentNo
+            this.queryParams.patentNo = val.publicNo
             this.getList()
         }
    },

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

@@ -128,7 +128,7 @@ export default {
   },
   watch:{
         patent(val){
-            this.queryParams.patentNo = val.patentNo
+            this.queryParams.patentNo = val.publicNo
             this.getList()
         }
    },

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

@@ -95,7 +95,7 @@ export default {
   },
   watch:{
         patent(val){
-            this.queryParams.patentNo = val.patentNo
+            this.queryParams.patentNo = val.publicNo
             this.getList()
         }
    },

+ 16 - 2
RMS-FrontEnd/src/views/components/common/menu/component/checkFile.vue

@@ -7,7 +7,9 @@
             </div>
         </div>
         <div style="display:flex;justify-content: center;">
-            <iframe v-if="isPicture == 0" :src="FileUrl" frameborder="0" width="100%" :height="height"></iframe>
+            <div v-if="isPicture == 0"  v-loading="loadLoading" style="width:100%">
+                <iframe id="checkIframe" :src="FileUrl" frameborder="0" width="100%" :height="height"></iframe>
+            </div>
             <el-image v-else :src="FileUrl" width="100%" :preview-src-list="srcList"></el-image>
         </div>
         
@@ -18,6 +20,7 @@ import { downLoad2 } from '@/utils'
 export default {
     data() {
         return {
+            loadLoading:false,
             FileName:'',
             height:document.documentElement.clientHeight - 200,
             srcList:[],
@@ -39,8 +42,19 @@ export default {
     },
     mounted(){
         this.FileName = this.row.name?this.row.name+'.'+this.row.suffix:this.row.fileName
-        if(this.isPicture){
+        if(this.isPicture == 1){
             this.srcList = [this.FileUrl]
+        }else{
+            var that = this
+            this.$nextTick(()=>{
+                var a = document.getElementById('checkIframe')
+                a.onload = function() {
+                    that.loadLoading = false
+                };
+                if(a.contentDocument.readyState == 'complete'){
+                    that.loadLoading = false
+                }
+            })
         }
         
     },

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

@@ -2,9 +2,54 @@ import { downLoad2 } from '@/utils'
 export const File = {
     methods: {
         downLoad(item){
-            downLoad2(item.url) 
+            if(item.originalName){
+                var  href = `http://${this.$c.hostname}:8801/fileManager/downloadSystemFile?fileId=${item.id}`
+                const anchor = document.createElement('a');
+                const fileName = 'download';
+                if ('download' in anchor) {
+                    anchor.href = href;
+                    anchor.setAttribute("download", fileName);
+                    anchor.className = "download-js-link";
+                    anchor.innerHTML = "downloading...";
+                    anchor.style.display = "none";
+                    document.body.appendChild(anchor);
+                    setTimeout(function () {
+                    anchor.click();
+                    document.body.removeChild(anchor);
+                    }, 66);
+                    return true;
+                }
+            }else{
+                downLoad2(item.url) 
+            }
+            
         },
-        preview(item){
+        preview(row){
+            var item = JSON.parse(JSON.stringify(row))
+            if(item.originalName){
+                item.url = `http://${this.$c.hostname}:8801/fileManager/downloadSystemFile?fileId=${item.id}`
+                var arr = ['png','jpeg','bmp','jpg']
+                if(arr.includes(item.suffix)){
+                    var FileUrl = item.url
+                    var isPicture = 1
+                }else if(item.suffix == 'pdf'){
+                    var FileUrl = item.url
+                    var isPicture = 0
+                }else{
+                    var FileUrl =  `http://${this.$c.hostname}:8012/onlinePreview?url=`+ btoa(encodeURIComponent(item.url+ '&fullfilename=test.'+item.suffix))
+                    var isPicture = 0
+                }
+                const router = this.$router.resolve({
+                    path: '/checkFile',
+                    query: {
+                        row: JSON.stringify(item),
+                        FileUrl: FileUrl,
+                        isPicture:isPicture
+                    }
+                })
+                window.open(router.href, '_blank');
+                return false
+            }
             var arr = ['png','jpeg','bmp','jpg']
             if(arr.includes(item.suffix)){
                 var FileUrl = this.$p + item.url

+ 4 - 0
RMS-FrontEnd/src/views/index/index.vue

@@ -26,6 +26,7 @@ export default {
             if(that.input == 'xiaoshi'){
               that.show = false
               clearInterval(that.timer)
+              localStorage.canShow = true
               that.$router.push(
                 {
                   name: 'Login',
@@ -46,6 +47,9 @@ export default {
     var time2 = new Date().getTime()
     if(time2>=time){
       this.show = false
+      if(localStorage.canShow){
+        localStorage.canShow = false
+      }
       this.$router.push({path: '/admin/login'})
     }else{
       this.show = true