Merge branch 'dev' of http://face3d.4dage.com:7005/zhangyupeng/zfb_mp into dev

src/api/device/list.ts

@@ -1,5 +1,5 @@
 import { defHttp } from '/@/utils/http/axios';
-import { PageParams, RentListGetResultModel, addCamerParams } from './model';
+import { PageParams, RentListGetResultModel, addCameraParams } from './model';
 
 enum Api {
   pageList = '/zfb-api/zfb/camera/pageList',
@@ -43,7 +43,7 @@ export const allCompanyApi = (params: PageParams) =>
     },
   });
 
-export const addCameraApi = (params: addCamerParams) =>
+export const addCameraApi = (params: addCameraParams) =>
   defHttp.post<RentListGetResultModel>({
     url: Api.addCamera,
     params,
@@ -53,7 +53,7 @@ export const addCameraApi = (params: addCamerParams) =>
     },
   });
 
-export const editCameraApi = (params: addCamerParams) =>
+export const editCameraApi = (params: addCameraParams) =>
   defHttp.post<RentListGetResultModel>({
     url: Api.editCamera,
     params,

src/api/device/model.ts

@@ -4,7 +4,7 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
  */
 export type PageParams = BasicPageParams;
 
-export interface addCamerParams {
+export interface addCameraParams {
   address: string;
   balance: string;
   cameraType: string;

src/api/scene/live.ts

@@ -82,24 +82,24 @@ export const brandTypeListApi = (params: PageParams) =>
 
 export function uploadLiveApi(
   params: UploadFileParams,
-  onUploadProgress: (progressEvent: ProgressEvent) => void,
+  // onUploadProgress: (progressEvent: ProgressEvent) => void,
 ) {
   return defHttp.uploadFile<Result>(
     {
       url: Api.upload,
-      onUploadProgress,
+      // onUploadProgress,
     },
     params,
   );
 }
 export function uploadLiveVideoApi(
   params: UploadFileParams,
-  onUploadProgress: (progressEvent: ProgressEvent) => void,
+  // onUploadProgress: (progressEvent: ProgressEvent) => void,
 ) {
   return defHttp.uploadFile<Result>(
     {
       url: Api.uploadVideo,
-      onUploadProgress,
+      // onUploadProgress,
     },
     params,
   );

src/components/Cropper/src/CopperModal.vue

@@ -167,6 +167,14 @@
           createMessage.error(t('component.upload.maxSizeMultiple', [maxSize]));
           return false;
         }
+        const accept = ['image/jpg', 'image/jpeg', 'image/gif', 'image/png'];
+        const isAccept = accept.find((i) => String(file.type) === i);
+        if (!isAccept) {
+          createMessage.error(t('component.upload.illegalFile'));
+          return false;
+        }
+        console.log('file.type', isAccept, file.type);
+
         const reader = new FileReader();
         reader.readAsDataURL(file);
         src.value = '';

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

@@ -122,6 +122,7 @@ export default {
     uploadWait: '请等待文件上传结束后操作',
     reUploadFailed: '重新上传失败文件',
     empty: '上传文件为空，请重新上传',
+    illegalFile: '非法类型文件',
   },
   verify: {
     error: '验证失败！',

src/views/devices/AddModal.vue

@@ -19,22 +19,14 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { allCompanyApi, addCameraApi } from '/@/api/device/list';
   import { useI18n } from '/@/hooks/web/useI18n';
-  //   address: "11111"
-  // balance: "111"
-  // cameraType: "4"
-  // childName: "11111"
-  // companyId: 1146
-  // orderSn: "1111"
-  // own: "0"
-  // rnd: 0.9923218970879999
-  // snCode: "1111"
-  // wifiName: "1111"
+
   const { t } = useI18n();
   export default defineComponent({
     components: { BasicModal, BasicForm },
     props: {
       userData: { type: Object },
     },
+    emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
       const { createMessage } = useMessage();
@@ -150,7 +142,7 @@
           },
         },
       ];
-      const [registerForm, { getFieldsValue, validateFields, resetFields }] = useForm({
+      const [registerForm, { validate, resetFields }] = useForm({
         labelWidth: 120,
         schemas,
         showActionButtonGroup: false,
@@ -202,19 +194,14 @@
         }
       }
       const handleSubmit = async () => {
-        console.log('getFieldsValue()', getFieldsValue());
         try {
-          const data = await validateFields();
-          const param = await getFieldsValue();
-          let res = await addCameraApi(param);
-          console.log('getFieldsValue()', res, data, param);
-          if (res.code) {
-            createMessage.error(res.error || t('common.optFail'));
-          } else {
-            emit('getList');
-            closeModal();
-            resetFields();
-          }
+          const params = await validate();
+          const res = await addCameraApi(params as any);
+          console.log('res', res);
+          closeModal();
+          resetFields();
+          createMessage.success(res);
+          emit('update');
         } catch (error) {
           console.log('not passing', error);
         }

src/views/devices/list.vue

@@ -48,7 +48,7 @@
         />
       </template>
     </BasicTable>
-    <AddModal @get-list="reload" @register="registerAddModal" />
+    <AddModal @submit="reload" @register="registerAddModal" />
     <EditModal @register="registerEditModal" @update="reload" />
   </div>
 </template>

src/views/scenes/live.vue

@@ -15,7 +15,7 @@
         />
       </template>
       <template #houseType="{ record }">
-        {{ renderHouseType(record.houseType) }}
+        {{ renderHouseType(Number(record.type)) }}
       </template>
 
       <template #action="{ record }">
@@ -98,7 +98,7 @@
         },
         {
           title: t('common.type'),
-          dataIndex: 'houseType',
+          dataIndex: 'type',
           slots: { customRender: 'houseType' },
           width: 100,
         },
@@ -178,7 +178,7 @@
               api: brandTypeListApi,
               resultField: 'list',
               labelField: 'name',
-              valueField: 'id',
+              valueField: 'brandType',
               params: {
                 page: 1,
                 limit: 1000,
@@ -215,16 +215,19 @@
           },
         ],
       };
+
       function renderHouseType(type: number): string {
         switch (type) {
           case 0:
-            return t(`routes.scenes.houseType.0`);
+            return '新房';
           case 1:
-            return t(`routes.scenes.houseType.1`);
+            return '二手房';
           case 2:
-            return t(`routes.scenes.houseType.2`);
+            return '公寓';
           case 3:
-            return t(`routes.scenes.houseType.3`);
+            return '民宿';
+          case 4:
+            return '装修';
           default:
             return t(`routes.scenes.houseType.9`);
         }

src/views/scenes/liveDrawer.vue

@@ -49,7 +49,7 @@
     brandTypeListApi,
     uploadLiveApi,
     getAllSceneApi,
-    uploadLiveVideoApi,
+    // uploadLiveVideoApi,
     addSave,
     getLiveInfoApi,
     brandUpdateApi,
@@ -282,27 +282,27 @@
             span: 20,
           },
         },
-        {
-          field: 'introduceVideo',
-          label: '视频',
-          component: 'Upload',
-          componentProps: {
-            api: uploadLiveVideoApi,
-            maxSize: 100,
-            emptyHidePreview: true,
-            maxNumber: 1,
-            accept: ['video/*'],
-            afterFetch: function (data) {
-              Reflect.set(data, 'url', data.message.video);
-              myData.introduceVideoCover = data.message.image;
-              return data;
-            },
-          },
+        // {
+        //   field: 'introduceVideo',
+        //   label: '视频',
+        //   component: 'Upload',
+        //   componentProps: {
+        //     api: uploadLiveVideoApi,
+        //     maxSize: 100,
+        //     emptyHidePreview: true,
+        //     maxNumber: 1,
+        //     accept: ['video/*'],
+        //     afterFetch: function (data) {
+        //       Reflect.set(data, 'url', data.message.video);
+        //       myData.introduceVideoCover = data.message.image;
+        //       return data;
+        //     },
+        //   },
 
-          colProps: {
-            span: 20,
-          },
-        },
+        //   colProps: {
+        //     span: 20,
+        //   },
+        // },
         {
           field: 'sortOrder',
           component: 'InputNumber',