style: 修改翻译

src/locales/lang/en/code.ts

@@ -20,5 +20,12 @@ export default {
     '4018': 'Insufficient number of downloads!',
     '4019': 'SN code does not exist!',
     '4020': 'Multiple login attempts detected, please try again in five minutes!',
+    '5005': 'Empty scene',
+    '50018': 'Camera does not exist!',
+    '50031': 'Insufficient camera capacity for migration',
+    '50032': 'The scene must migrate under the same camera type!',
+    '50044': 'The scene is captured by this camera and no transfer is required!',
+    '50034': 'SN code does not exist!',
+    '5037': 'Calculating,please wait.',
   }
 };

src/locales/lang/zh-CN/code.ts

@@ -20,5 +20,12 @@ export default {
     '4018': '下载数量不足！',
     '4019': 'sn码不存在！',
     '4020': '频繁登录失败，请五分钟后再次尝试登录!',
+    '5005': '场景为空',
+    '50018': '相机不存在！',
+    '50031': '相机容量不足，不能迁移',
+    '50032': '必须迁移至相同的类型的相机下面！',
+    '50044': '场景在该相机中，无需迁移!',
+    '50034': 'sn码不存在！',
+    '5037': '场景正在计算中，请待计算完成后再操作。',
   }
 };

src/views/equity/EditModal.vue

@@ -142,10 +142,10 @@
       function timeOption(incrementTypeId) {
         let list = []
         let timeVal = incrementTypeId == 1?agent.value.highSubNum:agent.value.majorSubNum
-        let value = 10, unit = '年'
+        let value = 10, unit = t('routes.equity.unit.-1')
         if(incrementTypeId == 1){//高级会员月
           value = timeVal>12?12:timeVal
-          unit = '个月'
+          unit = t('routes.equity.unit.-3')
         }else{
           value = timeVal>10?10:timeVal
         }

src/views/equity/InvoiceModal.vue

@@ -9,284 +9,325 @@
   >
     <div class="pt-2px pr-3px">
       <BasicForm @register="registerForm">
-        <template #text="{ model, field }">
-          {{ model[field]  }}{{fileFlow.type}}
-        </template>
+        <template #text="{ model, field }"> {{ model[field] }}{{ fileFlow.type }} </template>
       </BasicForm>
     </div>
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, nextTick, onMounted, reactive, computed } from 'vue';
-  import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { useI18n } from '/@/hooks/web/useI18n';
-  import { dincrementList, checkUserName, addApi } from '/@/api/equity'
-  import { useUserStore } from '/@/store/modules/user';
-  import dayjs from 'dayjs';
+import { defineComponent, nextTick, onMounted, reactive, computed } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { useI18n } from '/@/hooks/web/useI18n';
+import { dincrementList, checkUserName, addApi } from '/@/api/equity';
+import { useUserStore } from '/@/store/modules/user';
+import dayjs from 'dayjs';
 
-  const { t } = useI18n();
-  export default defineComponent({
-    components: { BasicModal, BasicForm },
-    props: {
-      userData: { type: Object },
-    },
-    emits: ['update', 'register'],
-    setup(props, { emit }) {
-      const fileFlow = reactive({
-        file:null,
-        type:2,//2-普通发票，3-专用发票
-        validTimeType:0,
-      })
-      const userStore = useUserStore();
-      const { createMessage } = useMessage();
-      const agent = computed(() => userStore.getAgent);
-      const schemas: FormSchema[] = [
+const { t } = useI18n();
+export default defineComponent({
+  components: { BasicModal, BasicForm },
+  props: {
+    userData: { type: Object },
+  },
+  emits: ['update', 'register'],
+  setup(props, { emit }) {
+    const fileFlow = reactive({
+      file: null,
+      type: 2, //2-普通发票，3-专用发票
+      validTimeType: 0,
+    });
+    const userStore = useUserStore();
+    const { createMessage } = useMessage();
+    const agent = computed(() => userStore.getAgent);
+    const schemas: FormSchema[] = [
+      {
+        field: 'userName',
+        component: 'Input',
+        label: t('routes.equity.userName'),
+        required: true,
+        componentProps: {
+          autoComplete: 'off',
+          style: 'width:200px',
+          // readonly:preventAutoFill.value
+        },
+        rules: [
           {
-            field: 'userName',
-            component: 'Input',
-            label: t('routes.equity.userName'),
             required: true,
-            componentProps: {
-              autoComplete:'off',
-              style:'width:200px',
-              // readonly:preventAutoFill.value
+            // @ts-ignore
+            validator: async (rule, value) => {
+              console.log('value', value);
+              const regEmail = /^(.+)@(.+)$/;
+              const regPos = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/; // 非中文
+              if (!value) {
+                return Promise.reject(t('routes.equity.rules.userName'));
+              }
+              if (!(regPos.test(value) || regEmail.test(value))) {
+                /* eslint-disable-next-line */
+                return Promise.reject(t('routes.equity.rules.userName1'));
+              }
+              // useThrottleFn(handleSplitLeftMenu, 50);
+              const res = await checkUserName({ userName: value });
+              //await checkUserName({userName:value})
+              // useThrottleFn(,50)()
+              console.log('validator', res);
+              if (!res) {
+                return Promise.reject(t('routes.equity.rules.userName2'));
+              }
+              return Promise.resolve();
             },
-            rules: [
+            trigger: 'blur',
+          },
+        ],
+        colProps: {
+          span: 19,
+        },
+      },
+      {
+        field: 'incrementTypeId',
+        component: 'ApiSelect',
+        label: t('routes.equity.Type'),
+        required: true,
+        componentProps: {
+          maxLength: 50,
+          style: 'width:200px',
+          api: async function () {
+            const list = await dincrementList();
+            return list.map((ele) => {
+              return { name: t(`routes.finance.equityType.${ele.validTimeType}`), value: ele.id };
+            });
+          },
+          numberToString: true,
+          labelField: 'name',
+          valueField: 'value',
+          immediate: true,
+          params: {
+            agentName: '',
+          },
+          onChange: (value) => {
+            let { totalTime, count = 1 } = getFieldsValue();
+            updateSchema([
               {
-                required: true,
-                // @ts-ignore
-                validator: async (rule, value) => {
-                  console.log('value',value)
-                  const regEmail = /^(.+)@(.+)$/
-                  const regPos = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/; // 非中文
-                  if (!value) {
-                    return Promise.reject(t('routes.equity.rules.userName'));
-                  }
-                  if (!(regPos.test(value) || regEmail.test(value))) {
-                    /* eslint-disable-next-line */
-                    return Promise.reject(t('routes.equity.rules.userName1'));
-                  }
-                  // useThrottleFn(handleSplitLeftMenu, 50);
-                  const res = await checkUserName({userName:value})
-                  //await checkUserName({userName:value})
-                  // useThrottleFn(,50)()
-                  console.log('validator',res)
-                  if(!res){
-                    return Promise.reject(t('routes.equity.rules.userName2'));
-                  }
-                  return Promise.resolve();
-                },
-                trigger: 'blur',
+                field: 'incrementTypeId',
+                suffix: `${t('routes.equity.syks')} ${
+                  value == 3 ? agent.value.highSubNum : agent.value.majorSubNum
+                } ${value == 3 ? t('routes.equity.unit.-2') : t('routes.equity.unit.-1')}`,
               },
-            ],
-            colProps: {
-              span: 19,
-            },
-        },{
-            field: 'incrementTypeId',
-            component: 'ApiSelect',
-            label: t('routes.equity.Type'),
-            required: true,
-            componentProps: {
-              maxLength: 50,
-              style:'width:200px',
-              api: async function () {
-                const list = await dincrementList();
-                return list.map(ele => {
-                  return {name:t(`routes.finance.equityType.${ele.validTimeType}`),value:ele.id}
-                });
+              {
+                field: 'count',
+                componentProps: {
+                  max: value == 3 ? agent.value.highSubNum : agent.value.majorSubNum,
+                  min: 1,
+                },
               },
-              numberToString: true,
-              labelField: 'name',
-              valueField: 'value',
-              immediate: true,
-              params: {
-                agentName: '',
+              {
+                field: 'totalTime',
+                suffix:
+                  totalTime && count
+                    ? `${t('routes.equity.jjxs')} ${totalTime * count} ${
+                        value == 3 ? t('routes.equity.unit.-2') : t('routes.equity.unit.-1')
+                      }`
+                    : '',
+                componentProps: {
+                  options: timeOption(value),
+                },
               },
-              onChange:(value)=>{
-                let { totalTime ,count = 1, } = getFieldsValue()
-                updateSchema([{
-                  field: 'incrementTypeId',
-                  suffix:`${t('routes.equity.syks')} ${value == 3?agent.value.highSubNum:agent.value.majorSubNum} ${value == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`, 
-                },{
-                  field: 'count',
-                  componentProps: {
-                    max:value == 3?agent.value.highSubNum:agent.value.majorSubNum,
-                    min:1,
-                  },
-                },{
-                  field: 'totalTime',
-                  suffix:(totalTime && count)?`${t('routes.equity.jjxs')} ${totalTime * count} ${value == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`:'',
-                  componentProps: {
-                    options: timeOption(value)
-                  },
-                }])
-                setFieldsValue({
-                  count:1,
-                  incrementEndTime: dayjs().add(totalTime?totalTime:1,value!='3'?'year':'month').format('YYYY-MM-DD'),
-                });
-              }
+            ]);
+            setFieldsValue({
+              count: 1,
+              incrementEndTime: dayjs()
+                .add(totalTime ? totalTime : 1, value != '3' ? 'year' : 'month')
+                .format('YYYY-MM-DD'),
+            });
+          },
+        },
+        colProps: {
+          span: 23,
+        },
+      },
+      {
+        field: 'count',
+        component: 'InputNumber',
+        label: t('routes.equity.countNumber'),
+        required: true,
+        // suffix:`${t('routes.equity.syks')} ${agent.value.majorSubNum} ${t('routes.equity.unit.1')}`,
+        defaultValue: 1,
+        itemProps: {
+          validateTrigger: 'change',
+        },
+        componentProps: {
+          max: agent.value.majorSubNum,
+          min: 1,
+          onChange: (value) => {
+            let { incrementTypeId, totalTime } = getFieldsValue();
+            console.log('totalTime', totalTime);
+            updateSchema([
+              {
+                field: 'totalTime',
+                suffix:
+                  totalTime && value
+                    ? `${t('routes.equity.jjxs')} ${value * totalTime} ${
+                        incrementTypeId == 3
+                          ? t('routes.equity.unit.-2')
+                          : t('routes.equity.unit.-1')
+                      }`
+                    : '',
               },
-            colProps: {
-              span: 23,
-            },
-          },{
-            field: 'count',
-            component: 'InputNumber',
-            label: t('routes.equity.countNumber'),
-            required: true,
-            // suffix:`${t('routes.equity.syks')} ${agent.value.majorSubNum} ${t('routes.equity.unit.1')}`,
-            defaultValue:1,
-            itemProps: {
-              validateTrigger: 'change',
-            },
-            componentProps: {
-              max:agent.value.majorSubNum,
-              min:1,
-              onChange:(value)=>{
-                let { incrementTypeId, totalTime } = getFieldsValue()
-                console.log('totalTime',totalTime)
-                updateSchema([{
-                  field: 'totalTime',
-                  suffix:(totalTime && value)?`${t('routes.equity.jjxs')} ${value * totalTime} ${incrementTypeId == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`:'',
-                }]);
-              }
-            },
-            colProps: {
-              span: 24,
-            },
-          },{
-            field: 'totalTime',
-            component: 'Select',
-            label: t('routes.equity.totalTime'),
-            required: true,
-            itemProps: {
-              validateTrigger: 'change',
-            },
-            componentProps: {
-              options:[],
-              listHeight:150,
-              style:'width:200px',
-              onChange:(value)=>{
-                let { incrementTypeId ,count = 1, } = getFieldsValue()
+            ]);
+          },
+        },
+        colProps: {
+          span: 24,
+        },
+      },
+      {
+        field: 'totalTime',
+        component: 'Select',
+        label: t('routes.equity.totalTime'),
+        required: true,
+        itemProps: {
+          validateTrigger: 'change',
+        },
+        componentProps: {
+          options: [],
+          listHeight: 150,
+          style: 'width:200px',
+          onChange: (value) => {
+            let { incrementTypeId, count = 1 } = getFieldsValue();
 
-                updateSchema([{
-                  field: 'totalTime',
-                  suffix:(value && count)?`${t('routes.equity.jjxs')} ${value * count} ${incrementTypeId == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`:'',
-                }]);
-                setFieldsValue({
-                  incrementEndTime:dayjs(fileFlow.incrementEndTime || new Date()).add(value,incrementTypeId != 3?'year':'month').format('YYYY-MM-DD')
-                });
-              }
-            },
-            colProps: {
-              span: 23,
-            },
-          },{
-            field: 'incrementEndTime',
-            component: 'DatePicker',
-            label: t('routes.equity.expiryTime'),
-            required: true,
-            defaultValue:dayjs().add(1,'year').format('YYYY-MM-DD'),
-            componentProps: {
-              disabled:true,
-              valueFormat: 'YYYY-MM-DD',
-              format: 'YYYY-MM-DD',
-              disabledDate: (current) => {
-                return current && current < dayjs().endOf('day');
+            updateSchema([
+              {
+                field: 'totalTime',
+                suffix:
+                  value && count
+                    ? `${t('routes.equity.jjxs')} ${value * count} ${
+                        incrementTypeId == 3
+                          ? t('routes.equity.unit.-2')
+                          : t('routes.equity.unit.-1')
+                      }`
+                    : '',
               },
-            },
-            colProps: {
-              span: 24,
-            },
-          }
-      ];
+            ]);
+            setFieldsValue({
+              incrementEndTime: dayjs(fileFlow.incrementEndTime || new Date())
+                .add(value, incrementTypeId != 3 ? 'year' : 'month')
+                .format('YYYY-MM-DD'),
+            });
+          },
+        },
+        colProps: {
+          span: 23,
+        },
+      },
+      {
+        field: 'incrementEndTime',
+        component: 'DatePicker',
+        label: t('routes.equity.expiryTime'),
+        required: true,
+        defaultValue: dayjs().add(1, 'year').format('YYYY-MM-DD'),
+        componentProps: {
+          disabled: true,
+          valueFormat: 'YYYY-MM-DD',
+          format: 'YYYY-MM-DD',
+          disabledDate: (current) => {
+            return current && current < dayjs().endOf('day');
+          },
+        },
+        colProps: {
+          span: 24,
+        },
+      },
+    ];
 
-      const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, getFieldsValue }] = useForm({
+    const [registerForm, { validate, resetFields, setFieldsValue, updateSchema, getFieldsValue }] =
+      useForm({
         labelWidth: 120,
-        schemas:schemas,
+        schemas: schemas,
         showActionButtonGroup: false,
         actionColOptions: {
           span: 24,
         },
       });
-      onMounted(() => {});
-      let addListFunc = () => {};
-      const [register, { closeModal }] = useModalInner((data) => {
-        data && onDataReceive(data);
-      });
+    onMounted(() => {});
+    let addListFunc = () => {};
+    const [register, { closeModal }] = useModalInner((data) => {
+      data && onDataReceive(data);
+    });
 
-      function onDataReceive(data) {
-        resetFields();
-        console.log('validTimeType',data)
-        fileFlow.type = data.type
-        fileFlow.validTimeType = data.validTimeType
-        setFieldsValue(data);
-        updateSchema([
-          {field: 'shipNum',ifShow:fileFlow.type == 3,},
-          {field: 'email',ifShow:fileFlow.type == 2,},
-          {field: 'file',ifShow:fileFlow.type == 2,},
-          {field: 'incrementTypeId', suffix:'', },
-          {field: 'totalTime', suffix:'', },
-          {field: 'count',componentProps:{
-              max:agent.value.majorSubNum,
-              min:1,
-            }},
-        ])
+    function onDataReceive(data) {
+      resetFields();
+      console.log('validTimeType', data);
+      fileFlow.type = data.type;
+      fileFlow.validTimeType = data.validTimeType;
+      setFieldsValue(data);
+      updateSchema([
+        { field: 'shipNum', ifShow: fileFlow.type == 3 },
+        { field: 'email', ifShow: fileFlow.type == 2 },
+        { field: 'file', ifShow: fileFlow.type == 2 },
+        { field: 'incrementTypeId', suffix: '' },
+        { field: 'totalTime', suffix: '' },
+        {
+          field: 'count',
+          componentProps: {
+            max: agent.value.majorSubNum,
+            min: 1,
+          },
+        },
+      ]);
+    }
+    const handleSubmit = async () => {
+      // try {
+      const params = await validate();
+      console.log('params', params);
+      let timeVal = params.incrementTypeId == 3 ? agent.value.highSubNum : agent.value.majorSubNum;
+      if (params.count * params.totalTime > timeVal) {
+        createMessage.error(t('routes.equity.totalMessge'));
+        return;
       }
-      const handleSubmit = async () => {
-        // try {
-          const params = await validate();
-          console.log('params',params)
-          let timeVal = params.incrementTypeId == 3?agent.value.highSubNum:agent.value.majorSubNum
-          if((params.count * params.totalTime)>timeVal){
-            createMessage.error(t('routes.equity.totalMessge'));
-            return
-          }
-          await addApi(params);
-          closeModal();
-          resetFields();
-          createMessage.success(t('common.optSuccess'));
-          emit('update',true);
-        // } catch (error) {
-        //   console.log('not passing', error);
-        // }
-      };
-      function handleVisibleChange(v) {
-        v && props.userData && nextTick(() => onDataReceive(props.userData));
+      await addApi(params);
+      closeModal();
+      resetFields();
+      createMessage.success(t('common.optSuccess'));
+      emit('update', true);
+      // } catch (error) {
+      //   console.log('not passing', error);
+      // }
+    };
+    function handleVisibleChange(v) {
+      v && props.userData && nextTick(() => onDataReceive(props.userData));
+    }
+    function timeOption(incrementTypeId) {
+      let list = [];
+      let timeVal = incrementTypeId == 3 ? agent.value.highSubNum : agent.value.majorSubNum;
+      let value = 10,
+        unit = t('routes.equity.unit.-1');
+      if (incrementTypeId == 3) {
+        //高级会员月
+        value = timeVal > 12 ? 12 : timeVal;
+        unit = t('routes.equity.unit.-3');
+      } else {
+        value = timeVal > 10 ? 10 : timeVal;
       }
-      function timeOption(incrementTypeId) {
-        let list = []
-        let timeVal = incrementTypeId == 3?agent.value.highSubNum:agent.value.majorSubNum
-        let value = 10, unit = t('routes.equity.unit.-1')
-        if(incrementTypeId == 3){//高级会员月
-          value = timeVal>12?12:timeVal
-          unit = t('routes.equity.unit.-3')
-        }else{
-          value = timeVal>10?10:timeVal
-        }
-        for (let index = 1; index <= value; index++) {
-          list.push({
-            label: index+unit,
-            value: index,
-            key: index,
-          })
-        }
-        return list
+      for (let index = 1; index <= value; index++) {
+        list.push({
+          label: index + unit,
+          value: index,
+          key: index,
+        });
       }
-      return {
-        register,
-        registerForm,
-        fileFlow,
-        handleVisibleChange,
-        handleSubmit,
-        addListFunc,
-        resetFields,
-        timeOption,
-        t,
-      };
-    },
-  });
+      return list;
+    }
+    return {
+      register,
+      registerForm,
+      fileFlow,
+      handleVisibleChange,
+      handleSubmit,
+      addListFunc,
+      resetFields,
+      timeOption,
+      t,
+    };
+  },
+});
 </script>

src/views/finance/data.tsx

@@ -77,7 +77,7 @@ export const columns: BasicColumn[] = [
   },
 ];
 export const searchForm: Partial<FormProps> = {
-  labelWidth: isEn.value ? 120 : 100,
+  labelWidth: isEn.value ? 140 : 100,
   schemas: [
     {
       field: 'type',
@@ -109,8 +109,8 @@ export const searchForm: Partial<FormProps> = {
         immediate: true,
       },
       colProps: {
-        xl: 5,
-        xxl: 5,
+        xl: 6,
+        xxl: 6,
       },
     },
     {
@@ -142,8 +142,8 @@ export const searchForm: Partial<FormProps> = {
         ],
       },
       colProps: {
-        xl: 5,
-        xxl: 5,
+        xl: 6,
+        xxl: 6,
       },
     },
     {
@@ -175,8 +175,8 @@ export const searchForm: Partial<FormProps> = {
         },
       },
       colProps: {
-        xl: 7,
-        xxl: 7,
+        xl: 9,
+        xxl: 9,
       },
     },
   ],

src/views/finance/index.vue

@@ -71,7 +71,7 @@ export default defineComponent({
         value: lastMajorNum || 0,
         unit: t('routes.equity.unit.-1'),
         color: 'green',
-        action: t('routes.equity.unit.-2'),
+        action: t('routes.equity.unit.-1'),
       },
       {
         title:  t('routes.equity.CardHighNum'),