1

src/views/device/index.vue

@@ -478,10 +478,14 @@
         });
       }
       function handleEdit(record: Recordable) {
-        openEditModal(true, {
+        openModalEnter(true, {
           ...record,
-          isUpdate: true,
+          isUpdate: false,
         });
+        // openEditModal(true, {
+        //   ...record,
+        //   isUpdate: true,
+        // });
       }
       function put() {
         openModalEnter(true);

src/views/device/putModal.vue

@@ -42,6 +42,12 @@
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
         {
+          field: 'id',
+          component: 'Input',
+          label: 'id',
+          show: false,
+        },
+        {
           field: 'snCode',
           component: 'Input',
           required: true,
@@ -60,19 +66,16 @@
             xxl: 18,
           },
           componentProps: {
-            api: cameraAllType,
+            api: async ()=>{
+              let list = await cameraAllType();
+              return list.filter(item => item.name != '旧双目相机');
+            },
             numberToString: true,
             labelField: 'name',
             valueField: 'cameraType',
             immediate: true,
             onChange: (val) => {
-              const wifiObj = {
-                1: '4DKKPRO_',
-                9: '4DKKMI_',
-                10: '4DSS_',
-                11: '4DSG_',
-              };
-              setFieldsValue({ color: null, wifiNamePrefix: wifiObj[val], version: '标准版' });
+              setFieldsValue({ color: '', wifiNamePrefix: '', version: '标准版' });
               let option = [
                 {
                   label: '标准版',
@@ -89,45 +92,25 @@
               }
               // ifShow: val == 9 || val == 10
               updateSchema([
-                { field: 'color', componentProps: { options: getColor(val) } },
+                { field: 'colour', componentProps: { options: getColor(val) } },
                 { field: 'version', componentProps: { options: option } },
+                { field: 'wifiNamePrefix', componentProps: { options: getWifilist(val) } },
               ]);
             },
           },
         },
         {
           field: 'wifiNamePrefix',
-          component: 'Input',
+          component: 'Select',
           label: 'wifi前缀',
           required: true,
+          defaultValue: '4DKKPRO_',
           colProps: {
             span: 18,
           },
-          helpMessage: 'wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”。',
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                // var reg = /\S+@\S+\.\S+/;
-                if (!value) {
-                  return Promise.reject('请输入wifi名称');
-                }
-                var list: string[] = ['4DKKPRO_', '4DKKMI_', '4DSS_', '4DSG_', '4DKK_'];
-                const some = list.some((item) => {
-                  return value.indexOf(item) != -1;
-                });
-                console.log('validator', some);
-                if (!some) {
-                  return Promise.reject(
-                    'wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”。',
-                  );
-                }
-                return Promise.resolve();
-              },
-              trigger: 'change',
-            },
-          ],
+          componentProps: {
+            options: getWifilist(1),
+          },
         },
         {
           field: 'colour',
@@ -139,7 +122,7 @@
             span: 18,
           },
           componentProps: {
-            options: getColor(),
+            options: getColor(1),
           },
         },
         {
@@ -186,20 +169,38 @@
         modelRef.value = data;
         fileFlow.title = data.id ? '编辑' : '设备入库';
         resetFields();
+        let wifiNamePrefix = data.wifiName && data.wifiName.split('_')[0];
+        updateSchema([
+          { field: 'colour', componentProps: { options: getColor(data.type || 1) } },
+          { field: 'wifiNamePrefix', componentProps: { options: getWifilist(data.type || 1) } },
+        ]);
         setFieldsValue({
-          type: data.sceneName,
+          ...data,
+          cameraType: data.type,
+          wifiNamePrefix: wifiNamePrefix + '_',
         });
       }
       function handleVisibleChange() {}
       function getColor(type) {
-        let list = ['黑色', '红色'];
-        if (type == 10) {
-          list.push('蓝色');
-        }
-        if (type == 11) {
-          list.push(...['蓝色', '金色']);
-        }
-        console.log('not passing', list);
+        const Obj = {
+          1: ['黑色', '红色'],
+          9: ['黑色', '红色'],
+          10: ['黑色', '红色', '蓝色'],
+          11: ['黑色', '红色', '蓝色', '金色'],
+        };
+        let list = Obj[type] || ['黑色', '红色'];
+        return list.map((res) => {
+          return { label: res, value: res };
+        });
+      }
+      function getWifilist(type) {
+        const wifiObj = {
+          1: ['4DKKPRO_', 'YUNPRO_'],
+          9: ['4DKKMI_'],
+          10: ['4DSS_'],
+          11: ['4DSG_'],
+        };
+        let list = wifiObj[type] ||  ['4DKKPRO_', '4DKKMI_', '4DSS_', '4DSG_'];
         return list.map((res) => {
           return { label: res, value: res };
         });
@@ -208,7 +209,8 @@
         modelRef.value
         try {
           const params = await validate();
-          await cameraIn(params);
+          let api = params.id ? updateCameraType : cameraIn;
+          await api(params);
           closeModal();
           resetFields();
           createMessage.success(t('common.optSuccess'));

src/views/empower/data.ts

@@ -219,9 +219,9 @@ export const rtkdeviceColumns: any[] = [
     width: 120,
     customRender: ({ record }) => {
       const obj = {
-        0: '千寻板卡千寻账号',
-        1: '千寻板卡移动账号',
-        2: '北云板卡移动账号',
+        0: '千寻板卡',
+        1: '千寻板卡',
+        2: '北云板卡',
       };
       return obj[record.rtkType] || '-';
     },
@@ -248,8 +248,9 @@ export const rtkdeviceColumns: any[] = [
     width: 80,
     customRender: ({ record }) => {
       const obj = {
-        0: '账号池',
-        1: '专用账号',
+        0: '账号池（不限期）',
+        1: '账号池（限期）',
+        2: '专用账号',
       };
       return obj[record.accountType] || '-';
     },

src/views/empower/modal/difference/AddModal.vue

@@ -30,7 +30,8 @@
   import dayjs from 'dayjs';
   import moment from 'moment';
   import { otherInfoStore } from '/@/store/modules/other';
-  import { incrementUseTypeList } from '/@/api/account';
+  import { incrementUseTypeList, currencyList  } from '/@/api/account';
+  import { useUserStore } from '/@/store/modules/user';
 
   const { t } = useI18n();
   export default defineComponent({
@@ -41,6 +42,7 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const otherInfo = otherInfoStore();
+      const userStore = useUserStore();
       const overviewInfo = computed(() => otherInfo.getOverviewInfo);
       // const overviewInfo = getOverviewInfo() || {}
       const fileFlow = reactive({
@@ -96,6 +98,38 @@
           ...newAddschemas,
           ...Addschemas,
           ...schemas,
+          {
+            field: 'amount',
+            component: 'InputNumber',
+            label: '订单金额',
+            required: true,
+            colProps: {
+              span: 16,
+            },
+            componentProps: {
+              precision: 2,
+              min: 0,
+              step: 1,
+            },
+          },
+          {
+            field: 'currencySymbol',
+            component: 'ApiSelect',
+            required: true,
+            label: '币种',
+            defaultValue: userStore.isEnv ? '' : 'CNY',
+            componentProps: {
+              // filterOption: onFilterOption,
+              // showSearch: true,
+              api: currencyList,
+              labelField: 'name',
+              valueField: 'symbol',
+              immediate: true,
+            },
+            colProps: {
+              span: 20,
+            },
+          },
           ...remarkschemas,
         ],
         showActionButtonGroup: false,
@@ -151,6 +185,7 @@
         //     },
         //   });
         // } else {
+        await validate();
         createConfirm({
           iconType: 'warning',
           title: () => h('span', '温馨提示'),

src/views/order/data.ts

@@ -555,7 +555,7 @@ export const localCameraColumns: BasicColumn[] = [
   },
   {
     title: '充值方式',
-    dataIndex: 'payMethod',
+    dataIndex: 'payType',
     width: 100,
   },
   {

src/views/product/rtk/AddenvModal.vue

@@ -129,17 +129,12 @@
           componentProps: {
             options: [
               {
-                label: '千寻板卡千寻账号',
-                value: 0,
-                key: 0,
-              },
-              {
-                label: '千寻板卡移动账号',
+                label: '千寻板卡',
                 value: 1,
                 key: 1,
               },
               {
-                label: '北云板卡移动账号',
+                label: '北云板卡',
                 value: 2,
                 key: 2,
               },

src/views/product/rtk/data.ts

@@ -241,9 +241,9 @@ export const rtkdeviceColumns: any[] = [
     width: 120,
     customRender: ({ record }) => {
       const obj = {
-        0: '千寻板卡千寻账号',
-        1: '千寻板卡移动账号',
-        2: '北云板卡移动账号',
+        0: '千寻板卡',
+        1: '千寻板卡',
+        2: '北云板卡',
       };
       return obj[record.rtkType] || '-';
     },
@@ -270,8 +270,9 @@ export const rtkdeviceColumns: any[] = [
     width: 80,
     customRender: ({ record }) => {
       const obj = {
-        0: '账号池',
-        1: '专用账号',
+        0: '账号池（不限期）',
+        1: '账号池（限期）',
+        2: '专用账号',
       };
       return obj[record.accountType] || '-';
     },

src/views/product/rtk/rtklist.vue

@@ -101,9 +101,9 @@
           width: 120,
           customRender: ({ record }) => {
             let obj = {
-              0: '千寻板卡千寻账号',
-              1: '千寻板卡移动账号',
-              2: '北云板卡移动账号',
+              0: '千寻板卡',
+              1: '千寻板卡',
+              2: '北云板卡',
             };
             return obj[record.rtkType] || '-';
           },

src/views/productOperation/data.ts

@@ -589,16 +589,45 @@ export const getVrColumns = () => {
       width: 80,
     },
     {
-      title: '状态',
+      title: '计算状态',
       dataIndex: 'statusString',
       width: 120,
       slots: { customRender: 'status' },
     },
-    // {
-    //   title: '切图状态',
-    //   dataIndex: 'qtstatus',
-    //   width: 120,
-    // },
+    {
+      title: '切图状态',
+      dataIndex: 'panoStatus',
+      width: 120,
+      customRender: ({ record }) => {
+        if (!record.panoStatus) {
+          return '-';
+        }
+        // 切图状态：-1切图失败 0等待中 1 排队 2切图中 3切图完成
+        let obj = {
+          '-1': '切图失败',
+          '0': '等待中',
+          '1': '排队中',
+          '2': '切图中',
+          '3': '切图完成',
+        };
+        return obj[record.panoStatus];
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      slots: { customRender: 'action' },
+      ifShow: true,
+      fixed: 'right',
+      flag: 'ACTION',
+      width: 280,
+    },
+  ];
+};
+        }
+        return (record && record.addressComponent && record.addressComponent.city) || '-'; // + district + township;
+      },
+    },
     {
       title: '操作',
       dataIndex: 'action',

src/views/productOperation/viewKankan.vue

@@ -67,12 +67,6 @@
             stopButtonPropagation
             :actions="[
               {
-                label: '迁移',
-                disabled: record.calcStatus != 1, //计算中计算失败不予迁移
-                ifShow: getTypeCheckPerm('scenes-move') && tableType != 3,
-                onClick: handleMove.bind(null, record),
-              },
-              {
                 label: '计算优先级',
                 ifShow: getTypeCheckPerm('scenes-priority') && record.calcStatus == -4,
                 onClick: handlePriority.bind(null, record),
@@ -83,6 +77,12 @@
                 onClick: handleQtPriority.bind(null, record),
               },
               {
+                label: '迁移',
+                disabled: record.calcStatus != 1, //计算中计算失败不予迁移
+                ifShow: getTypeCheckPerm('scenes-move') && tableType != 3,
+                onClick: handleMove.bind(null, record),
+              },
+              {
                 label: '解冻',
                 disabled: !record.isColdStorage || !record.calcStatus == 1,
                 ifShow: getTypeCheckPerm('scenes-thaw'),