فهرست منبع

Merge branch 'dev'

zhangyu 4 سال پیش
والد
کامیت
6b8737f06c

+ 1 - 0
src/components/relation/overview/CardList.vue

@@ -271,6 +271,7 @@
           localStorage.setItem('ZoneType',relation.ZoneType)
           localStorage.setItem('MainObject',relation.MainObject)
           localStorage.setItem('FromObject', relation.FromObject)
+          localStorage.setItem('count', relation.count)
           localStorage.setItem('ComputingTime', relation.ComputingTime ? relation.ComputingTime : '')
           } else {
             this.$message.warning("设计中")

+ 2 - 1
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -9,7 +9,7 @@
         <el-col :span="8">
           <p>
             <i class="iconfont icon-doc-line"/>
-            {{values.currentNum}} 0
+            {{values.currentNum}}{{relationCount}}
           </p>
 
           <a :href="downloadProject('excel')">
@@ -94,6 +94,7 @@
     props: ['values'],
     data() {
       return {
+        relationCount:localStorage.getItem('count'),
         dialogExport: false,
         dialogProcess: false,
         activities: [{

+ 2 - 1
src/views/relation/relationShip/index.vue

@@ -258,6 +258,7 @@
   import editRelationShip from "../../../components/relation/relationShip/Modal/editRelationShip";
   import {relDelete, relQuery} from "../../../api/relation/api";
 
+  const ComputingTime = localStorage.getItem('ComputingTime') ? localStorage.getItem('ComputingTime') : ''
   export default {
     name: "index",
     data() {
@@ -274,7 +275,7 @@
           optionTips: `请下载最新最新<${localStorage.getItem('RelationTypeName')}>数据进行手动维护`, //请下载最新最新 xxxx 数据进行手动维护
           currentNum: '当前关系数量:',
           download: '下载模板(含数据)',
-          lastTime: '最后更新时间为' + localStorage.getItem('ComputingTime') || '', //最后更新时间为
+          lastTime: `最后更新时间为:${ComputingTime}`, //最后更新时间为
           uploadTxt: '将Excel文件拖到此处,或<em>单击上传Excel文件<em>',
           uploadTips: '上传的Excel数据将完全覆盖当前关系表(关系表先前数据不会保留)',
           downloadFile: ' 下载报告文件',