1

src/views/product/rtk/AddModal.vue

@@ -21,7 +21,8 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { uploadApi, rtksaveOrEdit } from '/@/api/product/index';
+  import { uploadApi } from '/@/api/product/index';
+  import { rtkDevicesaveOrEdit } from '/@/api/rtk/index';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   const { t } = useI18n();
@@ -54,7 +55,7 @@
           },
         },
         {
-          field: 'cameraSnCode',
+          field: 'cameraSn',
           component: 'Input',
           required: true,
           label: '相机sn',
@@ -188,7 +189,7 @@
       function onDataReceive(data) {
         modelRef.value = data;
         fileFlow.title = data.id ? '编辑RTK' : '新增RTK';
-        // handlertkSn(data.cameraSnCode ? true : false);
+        handlertkSn(data.cameraSnCode ? true : false);
         resetFields();
         console.log('data', data);
         handlertkType(data.rtkType);
@@ -271,7 +272,7 @@
           }
           params.rtkSnCode = params.rtkSnCode && params.rtkSnCode.trim();
           console.log('params', Object.values(params), keyData);
-          const res = await rtksaveOrEdit(params);
+          const res = await rtkDevicesaveOrEdit(params);
           console.log('res', res);
           closeModal();
           resetFields();

src/views/product/rtk/AdduserModal.vue

@@ -269,9 +269,9 @@
             return createMessage.error('请填写至少一项数据');
           }
           params.rtkSnCode = params.rtkSnCode && params.rtkSnCode.trim();
-          console.log('params', Object.values(params), keyData);
-          const res = await rtkAccountsaveOrEdit(params);
-          console.log('res', res);
+          params.failureTime = dayjs(params.failureTime).format('YYYY-MM-DD') + ' 23:59:59';
+          console.log('params', params);
+          await rtkAccountsaveOrEdit(params);
           closeModal();
           resetFields();
           createMessage.success(t('common.optSuccess'));

src/views/product/rtk/data.ts

@@ -11,7 +11,7 @@ export const rtksearchForm: Partial<FormProps> = {
   autoSubmitOnEnter: true,
   schemas: [
     {
-      field: 'cameraSnCode',
+      field: 'cameraSn',
       label: '相机Sn',
       component: 'Input',
       labelWidth: 60,
@@ -199,7 +199,6 @@ export const rtkuserColumns: any[] = [
           record.pendingStatus = true;
           const id: string = record.id || '';
           const newStatus = checked ? 0 : 1;
-          alert(newStatus);
           Reflect.set(record, 'useStatus', newStatus);
           await rtkAccountsaveOrEdit({ ...record, useStatus: newStatus });
           createMessage.success('操作成功');
@@ -213,7 +212,7 @@ export const rtkdeviceColumns: any[] = [
   {
     title: '相机SN',
     ellipsis: true,
-    dataIndex: 'cameraSnCode',
+    dataIndex: 'cameraSn',
     width: 100,
   },
   {
@@ -243,10 +242,16 @@ export const rtkdeviceColumns: any[] = [
     width: 180,
   },
   {
+    title: '创建人',
+    ellipsis: true,
+    dataIndex: 'createNickName',
+    width: 120,
+  },
+  {
     title: '创建时间',
     ellipsis: true,
     dataIndex: 'createTime',
-    width: 100,
+    width: 120,
   },
   {
     title: '状态',

src/views/product/rtk/list.vue

@@ -38,7 +38,7 @@
       <BasicTable key="registeruserTable" v-show="activeKey == 1" @register="registeruserTable">
         <template #toolbar>
           <a-button type="primary" @click="handleuserEdit" v-if="getCheckPerm('rtk-addUser')"
-            >新增账户</a-button
+            >新增账号</a-button
           >
           <a-button type="primary" @click="handleExport(4)" v-if="getCheckPerm('rtk-user-batch')"
             >批量导入</a-button