tangning 2 лет назад
Родитель
Сommit
1623a15a8d

+ 1 - 0
src/views/customer/device.vue

@@ -89,6 +89,7 @@
               '2':'四维看看lite',
               '9':'四维看见',
               '10':'四维深时',
+              '13':'四维深光',
             }
             return typeObj[record.type]
           }

+ 1 - 1
src/views/customer/scene.vue

@@ -152,7 +152,7 @@
       const companyId: Number = router.currentRoute.value.params.id - 0;
       const { createMessage, createConfirm } = useMessage();
       const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
-      const tabList = ref<Array>(['四维看看', '四维看见', '四维深时', '四维双目Lite']);
+      const tabList = ref<Array>(['四维看看', '四维看见', '四维深时', '四维深光', '四维双目Lite']);
       const columns: BasicColumn[] = [
         {
           title: '场景标题',

+ 1 - 0
src/views/device/index.vue

@@ -121,6 +121,7 @@ import { lte } from 'lodash';
               '2':'四维看看lite',
               '9':'四维看见',
               '10':'四维深时',
+              '13':'四维深光',
             }
             return typeObj[record.type]
           }        

+ 43 - 44
src/views/product/updataTips/AddModal.vue

@@ -92,18 +92,6 @@
           },
         },
         {
-          field: 'titleEn',
-          component: 'Input',
-          label: '英文标题',
-          required: true,
-          colProps: {
-            span: 20,
-          },
-          componentProps: {
-            maxLength: 50,
-          },
-        },
-        {
           field: 'description',
           component: 'InputTextArea',
           required: true,
@@ -117,19 +105,6 @@
           },
         },
         {
-          field: 'descriptionEn',
-          component: 'InputTextArea',
-          required: true,
-          label: t('routes.product.description_en'),
-          componentProps: {
-            maxLength:500,
-            rows:4,
-          },
-          colProps: {
-            span: 20,
-          },
-        },
-        {
           field: 'imageUrl',
           component: 'Upload',
           label: '中文图片/视频',
@@ -149,25 +124,6 @@
           },
         },
         {
-          field: 'imageUrlEn',
-          component: 'Upload',
-          label: '英文图片/视频',
-          // helpMessage: t('routes.corporation.uploadHelp'),
-          itemProps: {
-            validateTrigger: 'onBlur',
-          },
-          componentProps: {
-            api: uploadApi,
-            maxNumber: 1,
-            maxSize: 1000,
-            accept: ['jpeg','jpg','png','mp4'],
-          },
-
-          colProps: {
-            span: 20,
-          },
-        },
-        {
           field: 'infoUrl',
           component: 'Input',
           required: true,
@@ -189,6 +145,49 @@
           colProps: {
             span: 20,
           },
+        },{
+          field: 'titleEn',
+          component: 'Input',
+          label: '英文标题',
+          required: true,
+          colProps: {
+            span: 20,
+          },
+          componentProps: {
+            maxLength: 50,
+          },
+        },
+        {
+          field: 'descriptionEn',
+          component: 'InputTextArea',
+          required: true,
+          label: t('routes.product.description_en'),
+          componentProps: {
+            maxLength:500,
+            rows:4,
+          },
+          colProps: {
+            span: 20,
+          },
+        },
+        {
+          field: 'imageUrlEn',
+          component: 'Upload',
+          label: '英文图片/视频',
+          // helpMessage: t('routes.corporation.uploadHelp'),
+          itemProps: {
+            validateTrigger: 'onBlur',
+          },
+          componentProps: {
+            api: uploadApi,
+            maxNumber: 1,
+            maxSize: 1000,
+            accept: ['jpeg','jpg','png','mp4'],
+          },
+
+          colProps: {
+            span: 20,
+          },
         },
         {
           field: 'infoUrlEn',

+ 43 - 86
src/views/product/updataTips/EditModal.vue

@@ -94,60 +94,6 @@
           colProps: {
             span: 20,
           },
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                if (!value?.trim()) {
-                  return Promise.reject(t('common.inputText')+'中文标题');
-                }
-                if(/.*[\u4e00-\u9fa5]+.*$/.test(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持中文字符');
-                }
-                if(isEmojiCharacter(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持emoji表情');
-                }
-                return Promise.resolve();
-              },
-              trigger: 'change',
-            },
-          ],
-          componentProps: {
-            maxLength: 50,
-          },
-        },
-        {
-          field: 'titleEn',
-          component: 'Input',
-          label: '英文标题',
-          required: true,
-          colProps: {
-            span: 20,
-          },
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                if (!value?.trim()) {
-                  return Promise.reject(t('common.inputText')+'英文标题');
-                }
-                if(/.*[\u4e00-\u9fa5]+.*$/.test(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持中文字符');
-                }
-                if(isEmojiCharacter(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持emoji表情');
-                }
-                return Promise.resolve();
-              },
-              trigger: 'change',
-            },
-          ],
           componentProps: {
             maxLength: 50,
           },
@@ -166,19 +112,6 @@
           },
         },
         {
-          field: 'descriptionEn',
-          component: 'InputTextArea',
-          required: true,
-          label: t('routes.product.description_en'),
-          componentProps: {
-            rows:4,
-            maxLength:500,
-          },
-          colProps: {
-            span: 20,
-          },
-        },
-        {
           field: 'imageUrl',
           component: 'Upload',
           label: '中文图片/视频',
@@ -198,25 +131,6 @@
           },
         },
         {
-          field: 'imageUrlEn',
-          component: 'Upload',
-          label: '英文图片/视频',
-          // helpMessage: t('routes.corporation.uploadHelp'),
-          itemProps: {
-            validateTrigger: 'onBlur',
-          },
-          componentProps: {
-            api: uploadApi,
-            maxNumber: 1,
-            maxSize: 1000,
-            accept: ['jpeg','jpg','png','mp4'],
-          },
-
-          colProps: {
-            span: 20,
-          },
-        },
-        {
           field: 'infoUrl',
           component: 'Input',
           required: true,
@@ -238,6 +152,49 @@
           colProps: {
             span: 20,
           },
+        },,{
+          field: 'titleEn',
+          component: 'Input',
+          label: '英文标题',
+          required: true,
+          colProps: {
+            span: 20,
+          },
+          componentProps: {
+            maxLength: 50,
+          },
+        },
+        {
+          field: 'descriptionEn',
+          component: 'InputTextArea',
+          required: true,
+          label: t('routes.product.description_en'),
+          componentProps: {
+            maxLength:500,
+            rows:4,
+          },
+          colProps: {
+            span: 20,
+          },
+        },
+        {
+          field: 'imageUrlEn',
+          component: 'Upload',
+          label: '英文图片/视频',
+          // helpMessage: t('routes.corporation.uploadHelp'),
+          itemProps: {
+            validateTrigger: 'onBlur',
+          },
+          componentProps: {
+            api: uploadApi,
+            maxNumber: 1,
+            maxSize: 1000,
+            accept: ['jpeg','jpg','png','mp4'],
+          },
+
+          colProps: {
+            span: 20,
+          },
         },
         {
           field: 'infoUrlEn',

+ 1 - 1
src/views/statistics/camera/index.vue

@@ -12,7 +12,7 @@
   const loading = ref(true);
   const echartData = reactive({
     xdata:[],
-    nameList:['四维看看','四维看见','四维深时'],
+    nameList:['四维看看','四维看见','四维深时','四维深光'],
     downOrder:[],
     incrementOrder:[],
     partOrder:[],