修改bug

.env.development

@@ -2,11 +2,11 @@
 ENV='development'
 
 # api请求地址
-VUE_APP_BASE_API=''
+VUE_APP_BASE_API='http://172.26.255.58:9970'
 # 文件下载地址
 VUE_APP_BASE_DO_API='http://local.ng.backend.api.com'
 # CDN文件地址
-VUE_APP_CDN_API='http://172.19.234.110:9970'
+VUE_APP_CDN_API='http://172.26.255.58:9970'
 # 页面地址
 VUE_APP_BASE_WEBSITE='http://local.ng.backend.ele.com'
 # 会员端地址

src/components/ExcelUploader/index.vue

@@ -75,8 +75,8 @@
             'uploadToken': '',
             'excelOption': this.excelOption,
           },
-          uploaderRequestUrl: `${this.requestUploadRoute}`,
-          importRequestUrl: `${this.requestImportRoute}`,
+          uploaderRequestUrl: process.env.VUE_APP_BASE_API + `/${this.requestUploadRoute}`,
+          importRequestUrl: process.env.VUE_APP_BASE_API + `/${this.requestImportRoute}`,
           uploaderHeaders: {
             'Device-Type': 'pc',
             'Suppress-Response-Code': '1',

src/components/Upload/index.vue

@@ -80,7 +80,7 @@ export default {
       uploaderFormData: {
         'uploadToken': ''
       },
-      uploaderRequestUrl: `${this.requestRoute}`,
+      uploaderRequestUrl: process.env.VUE_APP_BASE_API + `/${this.requestRoute}`,
       uploaderHeaders: {
         'Device-Type': 'pc',
         'Suppress-Response-Code': '1',

src/layout/components/Navbar.vue

@@ -10,11 +10,12 @@
 
 <!--        <error-log class="errLog-container right-menu-item hover-effect" />-->
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> -->
 
-        <el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom">
+        <!-- <el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
+        <div style="float:left;"> 当前时间：{{ nowDateTime }}   当前期数：{{periodNum}} </div>
 
         <lang-select class="right-menu-item hover-effect" />
 
@@ -62,6 +63,7 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import LangSelect from '@/components/LangSelect'
 import Search from '@/components/HeaderSearch'
+import baseInfo from '@/utils/baseInfo'
 
 export default {
   components: {
@@ -73,18 +75,25 @@ export default {
     LangSelect,
     Search
   },
+  data() {
+		return {
+      periodNum: baseInfo.nowPeriodNum(),
+      nowTime: this.getTime()
+		}
+	},
   computed: {
+    nowDateTime() {
+      return this.$moment(this.nowTime * 1000).utcOffset('+0100' ).format('YYYY-MM-DD HH:mm:ss') + ' (WAT)'
+    },
     ...mapGetters([
       'sidebar',
       'avatar',
       'device'
-    ])
+    ]),
+  },
+  mounted(){
+    this.calcTime()
   },
-	data() {
-		return {
-
-		}
-	},
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -92,7 +101,18 @@ export default {
     async logout() {
       await this.$store.dispatch('user/logout')
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)
-    }
+    },
+    getTime() {
+      let dateObj = new Date()
+      return Math.round(dateObj.getTime() / 1000 + (0 * 86400))
+    },
+    calcTime () {
+      let obj = this
+      setInterval(function () {
+        obj.nowTime += 1
+      }, 1000)
+    },
+    
   }
 }
 </script>

src/utils/tool.js

@@ -40,7 +40,7 @@ const tool = {
     } else {
       dateObj = new Date()
     }
-    return +Math.round(dateObj.getTime() / 1000 + (days * 86400))
+    return Math.round(dateObj.getTime() / 1000 + (days * 86400))
   },
   formatDate(timestamp, withTime = true) {
     const newDate = new Date()

vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://172.28.43.29:9970",
+        target:"http://172.26.255.58:9970",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""