Procházet zdrojové kódy

feat(device): 设备新增与sncode

gemercheung před 3 roky
rodič
revize
265f30eec4

+ 3 - 3
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,

+ 1 - 1
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;

+ 10 - 23
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();
@@ -146,7 +138,7 @@
           },
         },
       ];
-      const [registerForm, { getFieldsValue, validateFields, resetFields }] = useForm({
+      const [registerForm, { validate, resetFields }] = useForm({
         labelWidth: 120,
         schemas,
         showActionButtonGroup: false,
@@ -198,19 +190,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);
         }

+ 1 - 1
src/views/devices/list.vue

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