Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

src/components/UploadVod/index.vue

@@ -184,7 +184,7 @@ const createUploader = () => {
       data.fileList.forEach((item) => {
         if (item.name === fileName) {
           item.status = progressPercent === 100 ? 'success' : 'uploading'
-          item.percent = progressPercent
+          item.percentage = progressPercent
         }
       })
     },

src/utils/dictionary.js

@@ -55,6 +55,12 @@ export const POWER_TYPE = [
   { label: '混合', value: 3 }
 ]
 
+export const FILE_TYPE = [
+  { label: 'M300', value: 1 },
+  { label: '御2', value: 2 },
+  { label: '御3E', value: 3 }
+]
+
 /**
  * 状态
  */

src/views/equipment-library/uva-manage/tools/form.js

@@ -1,11 +1,12 @@
 import { reactive } from 'vue'
-import { POWER_TYPE } from '@/utils/dictionary.js'
+import { POWER_TYPE, FILE_TYPE } from '@/utils/dictionary.js'
 
 export const form = reactive({
   uvaForm: {
     code: null,
     name: null,
     powerType: null,
+    srt_type: null,
     accuracy: null,
     manufacturer: null
   },
@@ -13,6 +14,7 @@ export const form = reactive({
     code: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
     name: [{ required: true, message: '请输入设备名称', type: 'string', trigger: 'blur' }],
     powerType: [{ required: true, type: 'number', message: '请选择动力类型', trigger: 'blur' }],
+    srt_type: [{ required: true, type: 'number', message: '请选择文件类型', trigger: 'blur' }],
     accuracy: [{ required: true, type: 'number', message: '请输入定位精度', trigger: 'blur' }],
     manufacturer: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }]
   },
@@ -20,6 +22,7 @@ export const form = reactive({
     { type: 'input', key: 'code', label: '设备编号', props: { maxlength: '20', placeholder: '请输入设备编号', clearable: true }},
     { type: 'input', key: 'name', label: '设备名称', props: { maxlength: '20', placeholder: '请输入设备名称', clearable: true }},
     { type: 'select', key: 'powerType', label: '动力类型', props: { options: POWER_TYPE, clearable: true }},
+    { type: 'select', key: 'srt_type', label: '文件类型', props: { options: FILE_TYPE, clearable: true }},
     { type: 'number', key: 'accuracy', label: '定位精度', props: { min: 0, placeholder: '请输入通道编码', showButton: false, clearable: true }, suffix: '米' },
     { type: 'input', key: 'manufacturer', label: '生产厂家', props: { maxlength: '20', placeholder: '请输入生产厂家', clearable: true }}
   ]

src/views/equipment-library/uva-manage/tools/table.js

@@ -2,7 +2,7 @@ import { h, ref, reactive } from 'vue'
 import TableTags from '@/components/DataTable/tools/Tags.vue'
 import TableAction from '@/components/DataTable/tools/Action.vue'
 import { uvaDelete } from '@/api/equipment/uva.js'
-import { POWER_TYPE } from '@/utils/dictionary.js'
+import { POWER_TYPE, FILE_TYPE } from '@/utils/dictionary.js'
 
 /* 注册table */
 const tableRef = ref()
@@ -70,6 +70,17 @@ const data = reactive({
         })
       }
     },
+    {
+      title: '文件类型',
+      key: 'srt_type',
+      align: 'center',
+      render(row) {
+        return h(TableTags, {
+          data: row.srt_type,
+          filters: FILE_TYPE
+        })
+      }
+    },
     {
       title: '定位精度',
       key: 'accuracy',