Kaynağa Gözat

修复上传视频bug

shaogen1995 3 yıl önce
ebeveyn
işleme
3f92741158

+ 1 - 1
src/components/tab3Dialog.vue

@@ -173,7 +173,7 @@ export default {
       const typeOk =
         file.type === 'video/mp4' ||
         file.type === 'video/avi' ||
-        file.type === 'video/mov' || file.type === 'video/rmvb' || file.type === 'video/rm' || file.type === 'video/flv' || file.type === 'video/3gp'
+        file.type === 'video/quicktime' || file.type === 'video/rmvb' || file.type === 'video/rm' || (file.type === '' && file.name.includes('.flv')) || file.type === 'video/3gpp'
       return new Promise((resolve, reject) => {
         if (file.name.length > 32) {
           this.$message.error('视频名字不能超过32个字')

+ 1 - 1
src/components/tab5Dialog.vue

@@ -210,7 +210,7 @@ export default {
       const typeOk =
         file.type === 'video/mp4' ||
         file.type === 'video/avi' ||
-        file.type === 'video/mov' || file.type === 'video/rmvb' || file.type === 'video/rm' || file.type === 'video/flv' || file.type === 'video/3gp'
+        file.type === 'video/quicktime' || file.type === 'video/rmvb' || file.type === 'video/rm' || (file.type === '' && file.name.includes('.flv')) || file.type === 'video/3gpp'
       return new Promise((resolve, reject) => {
         if (file.name.length > 32) {
           this.$message.error('视频名字不能超过32个字')

+ 1 - 1
src/views/tab4/index.vue

@@ -160,7 +160,7 @@ export default {
           temp.conten = `摄像头:${temp.data.camera}个;巡逻车:${temp.data.cruiser}辆;门禁锁:${temp.data.door}个;无人机:${temp.data.aerial}辆`
         } else {
           temp.type = '设备情况'
-          temp.conten = `监控-启用:${temp.data.cameraStart};监控-停用:${temp.data.cameraStop};消防-启用:${temp.data.cruiserStart};消防-停用:${temp.data.cruiserStop};监测-启用:${temp.data.doorStart};监测-停用:${temp.data.doorStop};功能-启用:${temp.data.aerialStart};功能-停用:${temp.data.aerialStop}`
+          temp.conten = `监控-启用:${temp.data.cameraStart};监控-停用:${temp.data.cameraStop};消防-启用:${temp.data.cruiserStart};消防-停用:${temp.data.cruiserStop};监测-启用:${temp.data.doorStart};监测-停用:${temp.data.doorStop};功能-启用:${temp.data.aerialStart};功能-停用:${temp.data.aerialStop}`
         }
         this.tableData.push(temp)
       })

+ 1 - 1
src/views/tab5/edit1.vue

@@ -46,7 +46,7 @@
             v-model.number="ruleForm.pm25"
             type="number"
           ></el-input>
-          <span class="unit">μg/m3</span>
+          <span class="unit">μg/m³</span>
           <!-- 下拉框 -->
           <el-select v-model="ruleForm.pm25Scope" placeholder="请选择状态">
             <el-option label="正常" value="正常"></el-option>

+ 1 - 1
src/views/tab5/index.vue

@@ -279,7 +279,7 @@ export default {
         temp.type = '环境情况'
         temp.data = JSON.parse(v.data)
         temp.time = v.userUpdateTime
-        temp.conten = `温度:${temp.data.temp}°--${temp.data.tempScope};湿度:${temp.data.humidity}RH--${temp.data.humidityScope};PM2.5:${temp.data.pm25}μg/m3--${temp.data.pm25Scope};PM10:${temp.data.pm10};噪音:${temp.data.noise};风速:${temp.data.windSpeed};AIQ:${temp.data.aiq};TSP:${temp.data.tsp}`
+        temp.conten = `温度:${temp.data.temp}--${temp.data.tempScope};湿度:${temp.data.humidity}RH--${temp.data.humidityScope};PM2.5:${temp.data.pm25}μg/m³--${temp.data.pm25Scope};PM10:${temp.data.pm10};噪音:${temp.data.noise};风速:${temp.data.windSpeed};AIQ:${temp.data.aiq};TSP:${temp.data.tsp}`
         this.tableData.push(temp)
       })
     },