1

src/components/Form/src/components/NumberRange.vue

@@ -18,6 +18,7 @@
     >
       <input-number
         :disabled="disabled"
+        :controls="false"
         placeholder="最小值"
         @blur="handleBlur"
         @focus="handleFocus"
@@ -53,7 +54,7 @@
   const props = defineProps({
     value: {
       type: Array,
-      default: () => [undefined, undefined], // 调用时使用v-model="[min,max]" 绑定
+      default: () => [null, null], // 调用时使用v-model="[min,max]" 绑定
     },
     // 是否禁用
     disabled: {
@@ -97,8 +98,7 @@
   console.log('props', props);
   const minValue_ = computed({
     get() {
-      console.log('props', props.value);
-      return props.value[0] || undefined;
+      return (props.value[0] || props.value[0] === 0 ) ? props.value[0] : undefined;
     },
     set(value) {
       // emit('update:minValue', value);
@@ -108,7 +108,7 @@
 
   const maxValue_ = computed({
     get() {
-      return props.value[1] || undefined;
+      return (props.value[1] || props.value[1] === 0 ) ? props.value[1] : undefined;
     },
     set(value) {
       // emit('update:maxValue', value);

src/views/account/overview/AddSnModal.vue

@@ -29,7 +29,7 @@
     DetailsApi,
     dincrementList,
     AddUserIncrementApi,
-    UnbindCameraApi,
+    incrementBindCamera,
     getAddUserIncrementTime,
     currencyList,
   } from '/@/api/account';
@@ -100,7 +100,7 @@
         });
       }
       const handleSubmit = async () => {
-        const submitUrl = UnbindCameraApi;
+        const submitUrl = incrementBindCamera;
         try {
           const params = await validate();
           console.log('validate', params);

src/views/account/overview/interesModal.vue

@@ -43,7 +43,7 @@
   import AddSnModal from './AddSnModal.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
-  import { GetCameraDetailApi, UnbindCameraApi, incrementUnBindCamera} from '/@/api/account';
+  import { GetCameraDetailApi, UnbindCameraApi, incrementUnBindCamera, incrementBindCamera} from '/@/api/account';
   import { otherInfoStore } from '/@/store/modules/other';
   import { DetailsApi, IncrementDelayApi } from '/@/api/account';
   import { usePermissionStore } from '/@/store/modules/permission';

src/views/account/product/index.vue

@@ -468,6 +468,7 @@
                       afterClose();
                       window.open(res.url);
                       closeModal();
+                      cancelDownload();
                     }
                     downloadOption.value = processres;
                     console.log(processres);

src/views/customer/scene.vue

@@ -359,6 +359,7 @@
                       canDownload.value = false;
                       afterClose();
                       window.open(res.url);
+                      cancelDownload();
                       closeModal();
                     }
                     downloadOption.value = res;

src/views/dealer/loglist.vue

@@ -60,7 +60,7 @@
           width: 250,
         },
         {
-          title: '账号',
+          title: '账户',
           ellipsis: true,
           dataIndex: 'agentUserName',
           width: 120,

src/views/product/rtk/AddModal.vue

@@ -183,6 +183,9 @@
               },
             ],
             onChange: (value) => {
+              // if(value == 0){
+              //   handlertkuserType(1);
+              // }
               handlertkType(value);
             },
           },
@@ -329,8 +332,8 @@
         resetFields();
         console.log('data', data);
         handlertkuserType(data.accountType != null ? data.accountType : 0);
-        handleCarmanType(data.cameraType || 1);
-        handlertkType(data.rtkType || 1);
+        handleCarmanType(data.cameraType != null ? data.cameraType : 1);
+        handlertkType(data.rtkType != null ? data.rtkType : 1);
         setFieldsValue(data);
         clearValidate();
       }
@@ -340,6 +343,17 @@
           { field: 'accountType', ifShow: val != 0 },
           { field: 'failureTime', ifShow: val == 0 },
         ]);
+        if(val == 0){
+          let ifShow = false
+          updateSchema([
+            { field: 'ipAddr', ifShow },
+            { field: 'mountPoint', ifShow },
+            { field: 'port', ifShow },
+            { field: 'userName', ifShow },
+            { field: 'password', ifShow },
+            { field: 'operator', ifShow },
+        ]);
+        }
       }
       function handlertkuserType(val) {
         console.log('val', val);
@@ -360,7 +374,7 @@
         let ifShow = val == 3;
         updateSchema([
           { field: 'sgRtkSn', ifShow },
-          { field: 'failureTime', ifShow: val == 3 },
+          // { field: 'failureTime', ifShow: val == 3 },
           { field: 'cameraSn', required: val != 3 },
         ]);
       }

src/views/product/rtk/data.ts

@@ -275,36 +275,54 @@ export const rtkdeviceColumns: any[] = [
     ellipsis: true,
     dataIndex: 'userName',
     width: 120,
+    customRender: ({ record }) => {
+      return record.userName || '-';
+    },
   },
   {
     title: '运营商',
     ellipsis: true,
     dataIndex: 'operator',
     width: 120,
+    customRender: ({ record }) => {
+      return record.operator || '-';
+    },
   },
   {
     title: 'IP地址',
     ellipsis: true,
     dataIndex: 'ipAddr',
     width: 120,
+    customRender: ({ record }) => {
+      return record.ipAddr || '-';
+    },
   },
   {
     title: '挂载点',
     ellipsis: true,
     dataIndex: 'mountPoint',
     width: 120,
+    customRender: ({ record }) => {
+      return record.mountPoint || '-';
+    },
   },
   {
     title: '端口',
     ellipsis: true,
     dataIndex: 'port',
     width: 50,
+    customRender: ({ record }) => {
+      return record.port || '-';
+    },
   },
   {
     title: '到期时间',
     ellipsis: true,
     dataIndex: 'failureTime',
     width: 160,
+    customRender: ({ record }) => {
+      return record.failureTime || '-';
+    },
   },
   {
     title: '创建人',
@@ -321,7 +339,7 @@ export const rtkdeviceColumns: any[] = [
   {
     title: '状态',
     dataIndex: 'useStatus',
-    width: 60,
+    width: 100,
     // ifShow: getCheckPerm('recruit-publish'),
     customRender: ({ record }) => {
       if (!Reflect.has(record, 'pendingStatus')) {
@@ -465,7 +483,7 @@ export const rtkaccountFormSchema: any[] = [
       maxLength: 50,
       'v-model:visible': false,
       // readonly:preventAutoFill.value,
-      placeholder: '请输入数字、字母大小写组合',
+      // placeholder: '请输入数字、字母大小写组合',
     },
     colProps: { span: 20 },
   },

src/views/product/rtk/list.vue

@@ -138,7 +138,7 @@
         autoSubmitOnEnter: true,
         schemas: [
           {
-            field: 'cameraSnCode',
+            field: 'cameraSn',
             label: '相机Sn',
             component: 'Input',
             colProps: {

src/views/productOperation/cameraScene.vue

@@ -356,6 +356,7 @@
                       afterClose();
                       window.open(res.url);
                       closeModal();
+                      cancelDownload();
                     }
                     downloadOption.value = res;
                     console.log(res);

src/views/productOperation/data.ts

@@ -70,7 +70,7 @@ export const getSchemas = (val) => {
             key: '0',
           },
           {
-            label: 'Salm',
+            label: 'Slam',
             value: 1,
             key: '1',
           },