1

src/views/account/overview/AddDownModal.vue

@@ -27,6 +27,7 @@
   import dayjs from 'dayjs';
   import { remarkschemas, Addschemas } from "./data";
   import { otherInfoStore } from '/@/store/modules/other';
+  import { useUserStore } from '/@/store/modules/user';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -37,6 +38,7 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const otherInfo = otherInfoStore();
+      const userStore = useUserStore();
       const overviewInfo = computed(() => otherInfo.getOverviewInfo);
       // const overviewInfo = getOverviewInfo() || {}
       const fileFlow = reactive({
@@ -85,6 +87,7 @@
           component: 'ApiSelect',
           required: true,
           label: '币种',
+          defaultValue: userStore.isEnv ? '' : 'CNY',
           componentProps: {
             // filterOption: onFilterOption,
             // showSearch: true,

src/views/account/overview/AddModal.vue

@@ -27,6 +27,7 @@
   import { DetailsApi, dincrementList, AddUserIncrementApi, getAddUserIncrementTime, currencyList } from '/@/api/account';
   import dayjs from 'dayjs';
   import { otherInfoStore } from '/@/store/modules/other';
+  import { useUserStore } from '/@/store/modules/user';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -37,6 +38,7 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const otherInfo = otherInfoStore();
+      const userStore = useUserStore();
       const overviewInfo = computed(() => otherInfo.getOverviewInfo);
       // const overviewInfo = getOverviewInfo() || {}
       const title = ref('新增权益')
@@ -201,6 +203,7 @@
           field: 'currencySymbol',
           component: 'ApiSelect',
           required: true,
+          defaultValue: userStore.isEnv ? '' : 'CNY',
           label: '币种',
           componentProps: {
             // filterOption: onFilterOption,

src/views/product/rtk/AddModal.vue

@@ -215,7 +215,7 @@
         !required && clearValidate();
         updateSchema([
           { field: 'cameraSn', required },
-          { field: 'rtkType', required },
+          // { field: 'rtkType', required },
           // { field: 'sgRtkSn', required },
           { field: 'ipAddr', required },
           { field: 'mountPoint', required },

src/views/product/rtk/AdduserModal.vue

@@ -27,7 +27,7 @@
   import dayjs from 'dayjs';
   const { t } = useI18n();
   import moment from 'moment';
-  
+
   export default defineComponent({
     components: { BasicModal, BasicForm },
     props: {
@@ -45,21 +45,54 @@
         file: null,
         title: '新增RTK账号',
       });
-      const range = (start: number, end: number) => {
+      let disabledDate = (current: any) => {
+        return current && current < moment().subtract(1, 'days').endOf('day');
+      };
+      let range = (start: any, end: any) => {
         const result = [];
-
         for (let i = start; i < end; i++) {
           result.push(i);
         }
-
         return result;
       };
-      const disabledDateTime = () => {
-        return {
-          disabledHours: () => range(0, 24).splice(4, 20),
-          disabledMinutes: () => range(30, 60),
-          disabledSeconds: () => [55, 56],
-        };
+      let disabledDateTime = (current: any) => {
+        if (current) {
+          let today = moment().date();
+          if (today == current.date()) {
+            let minute = Number(moment().minutes());
+            let hour = Number(moment().hour());
+            let finalHour: number, finalMinute: number;
+            console.log('today', minute, current.hour(), hour);
+            // if (current.hour() > hour) {
+            //   finalMinute = 0;
+            // } else {
+            if (current.minute() >= 58) {
+              finalHour = hour + 1;
+              finalMinute = 0;
+            } else {
+              finalHour = hour;
+              finalMinute = minute + 5;
+            }
+            // }
+            console.log('today', finalHour, finalMinute);
+            return {
+              disabledHours: () => range(0, finalHour),
+              disabledMinutes: () => range(0, finalMinute),
+            };
+          } else if (moment() > current) {
+            return {
+              disabledHours: () => range(0, 24),
+              disabledMinutes: () => range(0, 60),
+              disabledSeconds: () => range(0, 60),
+            };
+          }
+        } else {
+          return {
+            disabledHours: () => range(0, 24),
+            disabledMinutes: () => range(0, 60),
+            disabledSeconds: () => range(0, 60),
+          };
+        }
       };
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
@@ -178,15 +211,13 @@
             span: 16,
           },
           componentProps: {
-            // disabled: true,
+            disabledDate: disabledDate,
+            disabledTime: disabledDateTime,
             showTime: { defaultValue: moment('23:59:59', 'HH:mm:ss') },
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
 
             // defaultValue: dayjs().add(7, 'day').format('YYYY-MM-DD') + ' 23:59:59',
             format: 'YYYY-MM-DD HH:mm:ss',
-            disabledDate: (current) => {
-              return current && current < dayjs().endOf('day');
-            },
           },
         },
       ];
@@ -246,7 +277,7 @@
                     var pattern = /[~!@#$%^&*<>|']/gi;
                     return pattern.test(s);
                   }
-                  if(required && !value){
+                  if (required && !value) {
                     return Promise.reject('请输入板卡SN号');
                   }
                   if (value != null && value !== '') {
@@ -290,7 +321,8 @@
             return createMessage.error('请填写至少一项数据');
           }
           params.rtkSnCode = params.rtkSnCode && params.rtkSnCode.trim();
-          params.failureTime = params.failureTime && dayjs(params.failureTime).format('YYYY-MM-DD HH:mm:ss');
+          params.failureTime =
+            params.failureTime && dayjs(params.failureTime).format('YYYY-MM-DD HH:mm:ss');
           console.log('params', params);
           await rtkAccountsaveOrEdit(params);
           closeModal();