凉纪 2 éve
szülő
commit
1eaf89c88b

+ 1 - 1
src/assets/css/mixin.scss

@@ -7,7 +7,7 @@
     clear: both;
   }
 }
- 
+
 // 多行隐藏
 @mixin textoverflow($clamp:1) {
   display: block;

BIN
src/assets/img/banner.png


+ 1 - 1
src/config/env.staging.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-test',   //项目名称
   baseUrl: 'https://test.xxx.com', // 测试项目地址
-  baseApi: 'https://test.xxx.com/api', // 测试api请求地址
+  baseApi: '/', // 测试api请求地址
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

+ 4 - 5
src/utils/globalMixins.js

@@ -18,7 +18,10 @@ export default {
     }
   },
   computed:{
-
+    //根据字典类型获取字典值,返回字典label
+    getDicts(s,dict){
+      return  this[dict].find(v=> s == v.dictValue).dictLabel;
+    },
   },
   methods: {
     //根据字典类型获取字典值
@@ -30,10 +33,6 @@ export default {
         }
       })
     },
-    //根据字典类型获取字典值,返回字典label
-    getDicts(s,dict){
-      return  this[dict].find(v=> s == v.dictValue).dictLabel;
-    },
   }
 
 }

+ 4 - 2
src/views/menu/LZRegister/edit.vue

@@ -155,10 +155,10 @@ export default {
   data(){
     return {
       activeNames: ['1'],
-      //基本信息
-      taskInfo:[],
       //区域列表
       areaList:[],
+      //基本信息
+      taskInfo:[],
       //
       fileList:[],
       //字典
@@ -178,6 +178,8 @@ export default {
   created() {
     this.getData();
   },
+  computed:{
+  },
   watch:{
     NFCList(){
       if(!this.NFCList) return;

+ 9 - 9
src/views/menu/LZRegister/index.vue

@@ -16,7 +16,7 @@
                   v-for="v in dayList.unfinished"
                   :key="v.id"
                   :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime)"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
                   is-link
                   :to="{path:path,query:{id:v.id}}"
                   :value="getDicts(v.status,'resumption_status')"
@@ -30,7 +30,7 @@
                   v-for="v in dayList.proceed"
                   :key="v.id"
                   :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime)"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
                   is-link
                   :to="{path:path,query:{id:v.id}}"
                   :value="getDicts(v.status,'resumption_status')"
@@ -44,7 +44,7 @@
                   v-for="v in dayList.finished"
                   :key="v.id"
                   :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime)"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'HH:mm')"
                   is-link
                   :to="{path:path,query:{id:v.id}}"
                   :value="getDicts(v.status,'resumption_status')"
@@ -65,7 +65,7 @@
                   v-for="v in otherList.unfinished"
                   :key="v.id"
                   :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime)"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
                   is-link
                   :to="{path:path,query:{id:v.id}}"
                   :value="getDicts(v.status,'resumption_status')"
@@ -79,7 +79,7 @@
                   v-for="v in otherList.proceed"
                   :key="v.id"
                   :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime)"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
                   is-link
                   :to="{path:path,query:{id:v.id}}"
                   :value="getDicts(v.status,'resumption_status')"
@@ -93,7 +93,7 @@
                   v-for="v in otherList.finished"
                   :key="v.id"
                   :title="v.planName"
-                  :label="formatTime(v.planStartTime,v.planEndTime)"
+                  :label="formatTime(v.planStartTime,v.planEndTime,'YYYY-MM-DD')"
                   is-link
                   :to="{path:path,query:{id:v.id}}"
                   :value="getDicts(v.status,'resumption_status')"
@@ -148,9 +148,9 @@ export default {
     ...mapGetters(['orgName','orgId']),
   },
   methods:{
-    //格式化日期范围
-    formatTime(start,end){
-      return `${dayjs(start).format('HH:mm')}-${dayjs(end).format('HH:mm')}`
+    //格式化时间范围
+    formatTime(start,end,format){
+      return `${dayjs(start).format(format)}-${dayjs(end).format(format)}`;
     },
     //页面第一次加载
     initDatalist(){