1

src/views/product/rtk/AddModal.vue

@@ -61,9 +61,9 @@
           label: '相机sn',
           componentProps: {
             maxLength: 50,
-            // onChange: (value) => {
-            //   handlertkSn(value.target.value);
-            // },
+            onChange: (value) => {
+              handlertkSn(value.target.value);
+            },
           },
           colProps: {
             span: 20,
@@ -138,14 +138,14 @@
         {
           field: 'sgRtkSn',
           component: 'Input',
-          required: true,
+          required: false,
           label: '深光rtk插件SN号',
           componentProps: {
             maxLength: 50,
           },
           rules: [
             {
-              required: true,
+              required: false,
               // @ts-ignore
               validator: (rule, value) => {
                 console.log('isValidateTxtNonSpec', value);
@@ -160,7 +160,7 @@
                     return Promise.resolve();
                   }
                 } else {
-                  return Promise.reject('不能为空');
+                  return Promise.resolve();
                 }
               },
               trigger: 'change',
@@ -189,7 +189,7 @@
       function onDataReceive(data) {
         modelRef.value = data;
         fileFlow.title = data.id ? '编辑RTK' : '新增RTK';
-        // handlertkSn(data.cameraSnCode ? true : false);
+        handlertkSn(data.cameraSn ? true : false);
         resetFields();
         console.log('data', data);
         handlertkType(data.rtkType);
@@ -214,7 +214,7 @@
         let required = !!val;
         !required && clearValidate();
         updateSchema([
-          { field: 'cameraSnCode', required },
+          { field: 'cameraSn', required },
           { field: 'rtkType', required },
           {
             field: 'rtkSnCode',

src/views/product/rtk/AdduserModal.vue

@@ -26,6 +26,8 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import dayjs from 'dayjs';
   const { t } = useI18n();
+  import moment from 'moment';
+  
   export default defineComponent({
     components: { BasicModal, BasicForm },
     props: {
@@ -43,6 +45,22 @@
         file: null,
         title: '新增RTK账号',
       });
+      const range = (start: number, end: number) => {
+        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],
+        };
+      };
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
         {
@@ -161,9 +179,10 @@
           },
           componentProps: {
             // disabled: true,
-            showTime: { defaultValue: dayjs('00:00:00', 'HH:mm:ss') },
+            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',
+
+            // 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');