修改bug

src/components/Table/src/BasicTable.vue

@@ -21,6 +21,9 @@
       v-show="getEmptyDataIsShowTable"
       @change="handleTableChange"
     >
+      <!-- <template #bodyCell="{ text, record, index, column }">{{column.customTitle}}
+        <span v-if="column?.customTitle != '序号'">{{  text  ? text : "-"  }}</span>
+        </template> -->
       <template #[item]="data" v-for="item in Object.keys($slots)" :key="item">
         <slot :name="item" v-bind="data || {}"></slot>
       </template>

src/views/customer/modal/DownLoadModal.vue

@@ -14,6 +14,7 @@
         <p>正在打包场景离线数据{{ downloadPercent }}</p>
         <span>{{ modelRef.sceneName }}.zip</span>
         <Progress :percent="downloadOption.percent" />
+        <div>下载需要一定时间，关闭弹窗将继续为您下载，建议稍后再来。</div>
       </div>
     </div>
   </BasicModal>

src/views/product/rtk/AddModal.vue

@@ -324,21 +324,22 @@
       const [register, { closeModal }] = useModalInner((data) => {
         data && onDataReceive(data);
       });
-
+      let tg = false
       function onDataReceive(data) {
         modelRef.value = data;
         fileFlow.title = data.id ? '编辑RTK' : '新增RTK';
         // handlertkSn(data.cameraSn ? true : false);
         resetFields();
         console.log('data', data);
-        handlertkuserType(data.accountType != null ? data.accountType : 0);
+        tg = data.rtkType == 1 && data.accountType == 1 ? true : false
         handleCarmanType(data.cameraType != null ? data.cameraType : 1);
+        handlertkuserType(data.accountType != null ? data.accountType : 0);
         handlertkType(data.rtkType != null ? data.rtkType : 1);
         setFieldsValue(data);
         clearValidate();
       }
       function handlertkType(val) {
-        console.log('val', val);
+        console.log('handlertkType', val);
         let upload = [
           { field: 'accountType', ifShow: val != 0 },
           { field: 'failureTime', ifShow: val == 0 },
@@ -346,7 +347,8 @@
         setFieldsValue({
           accountType: ''
         })
-        let ifShow = false
+        let ifShow = tg || false
+        // let ifShow = false
         upload.push(
           ...[
           { field: 'ipAddr', ifShow },
@@ -358,9 +360,10 @@
       ]
         )
         updateSchema(upload);
+        tg = false
       }
       function handlertkuserType(val) {
-        console.log('val', val);
+        console.log('handlertkuserType', val);
         let ifShow = val == 1;
         updateSchema([
           { field: 'ipAddr', ifShow },
@@ -378,7 +381,6 @@
         let ifShow = val == 3;
         updateSchema([
           { field: 'sgRtkSn', ifShow },
-          // { field: 'failureTime', ifShow: val == 3 },
           { field: 'cameraSn', required: val != 3 },
         ]);
       }

src/views/product/rtk/data.ts

@@ -255,6 +255,9 @@ export const rtkdeviceColumns: any[] = [
     title: '深光rtk插件SN号',
     ellipsis: true,
     dataIndex: 'sgRtkSn',
+    customRender: ({ record }) => {
+      return record.sgRtkSn || '-';
+    },
     width: 160,
   },
   {
@@ -271,15 +274,6 @@ export const rtkdeviceColumns: any[] = [
     },
   },
   {
-    title: '用户名称',
-    ellipsis: true,
-    dataIndex: 'userName',
-    width: 120,
-    customRender: ({ record }) => {
-      return record.userName || '-';
-    },
-  },
-  {
     title: '运营商',
     ellipsis: true,
     dataIndex: 'operator',
@@ -316,6 +310,15 @@ export const rtkdeviceColumns: any[] = [
     },
   },
   {
+    title: '用户名称',
+    ellipsis: true,
+    dataIndex: 'userName',
+    width: 120,
+    customRender: ({ record }) => {
+      return record.userName || '-';
+    },
+  },
+  {
     title: '到期时间',
     ellipsis: true,
     dataIndex: 'failureTime',
@@ -461,33 +464,6 @@ const disabledDateTime = (current: any) => {
 };
 export const rtkaccountFormSchema: any[] = [
   {
-    field: 'userName',
-    component: 'Input',
-    required: true,
-    label: '用户名称',
-    ifShow: false,
-    componentProps: {
-      maxLength: 50,
-    },
-    colProps: {
-      span: 20,
-    },
-  },
-  {
-    field: 'password',
-    component: 'Input',
-    label: '密码',
-    required: true,
-    ifShow: false,
-    componentProps: {
-      maxLength: 50,
-      'v-model:visible': false,
-      // readonly:preventAutoFill.value,
-      // placeholder: '请输入数字、字母大小写组合',
-    },
-    colProps: { span: 20 },
-  },
-  {
     field: 'operator',
     component: 'Input',
     required: true,
@@ -548,6 +524,33 @@ export const rtkaccountFormSchema: any[] = [
     },
   },
   {
+    field: 'userName',
+    component: 'Input',
+    required: true,
+    label: '用户名称',
+    ifShow: false,
+    componentProps: {
+      maxLength: 50,
+    },
+    colProps: {
+      span: 20,
+    },
+  },
+  {
+    field: 'password',
+    component: 'Input',
+    label: '密码',
+    required: true,
+    ifShow: false,
+    componentProps: {
+      maxLength: 50,
+      'v-model:visible': false,
+      // readonly:preventAutoFill.value,
+      // placeholder: '请输入数字、字母大小写组合',
+    },
+    colProps: { span: 20 },
+  },
+  {
     field: 'failureTime',
     component: 'DatePicker',
     label: '到期日期',

src/views/product/rtk/list.vue

@@ -298,6 +298,7 @@
       function handleEdit(record = {}) {
         openModal(true, {
           ...record,
+          accountType: record.rtkType == 0 ? 0 : record.accountType,
           authorizeTime: `${record.authorizeTime || '10'}_${record.authorizeTimeUnit || '1'}`,
         });
       }

src/views/productOperation/cameraScene.vue

@@ -254,7 +254,7 @@
           sgetForm.updateSchema(getSchemas(val))
         }
         console.log('sgetForm', sgetForm);
-        setColumns(getColumns(val == 6));
+        setColumns(getColumns(val));
         clearSelectedRowKeys();
         reload();
       }

src/views/productOperation/data.ts

@@ -332,7 +332,8 @@ export const getviewColumns = () => {
     },
   ];
 };
-export const getColumns = (isobj) => {
+export const getColumns = (val) => {
+  const isobj = val == 6;
   return [
     {
       title: '场景标题',
@@ -403,7 +404,7 @@ export const getColumns = (isobj) => {
       title: 'obj生成状态',
       dataIndex: 'isObj',
       ellipsis: true,
-      ifShow: isobj,
+      ifShow: isobj || val == 2,
       width: 180,
       customRender: ({ record }) => {
         return record.isObj == 0 ? '未生成' : record.isObj == 1 ? '已生成' : '计算中';

src/views/productOperation/modal/DownLoadModal.vue

@@ -13,6 +13,7 @@
         <p>正在打包场景离线数据{{ downloadPercent }}</p>
         <span>{{ modelRef.sceneName }}.zip</span>
         <Progress :percent="downloadOption.percent" />
+        <div>下载需要一定时间，关闭弹窗将继续为您下载，建议稍后再来。</div>
       </div>
     </div>
   </BasicModal>