tangning 4 月之前
父節點
當前提交
df5c69cf2f

+ 1 - 1
src/views/account/details/data.ts

@@ -235,7 +235,7 @@ export const equityColumns: BasicColumn[] = [
   {
     title: '订单金额',
     dataIndex: 'amount',
-    width: 80,
+    width: 140,
   },
   {
     title: '币种',

+ 4 - 1
src/views/account/overview/index.vue

@@ -67,7 +67,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, onMounted } from 'vue';
   import { Description } from '/@/components/Description/index';
   import { BasicTable } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
@@ -123,6 +123,9 @@
           ...overviewInfo.value,
         });
       }
+      onMounted(() => {
+        otherInfo.updateOverviewInfo();
+      })
       return {
         registerAddModal,
         registerInteres,

+ 2 - 1
src/views/device/OutflowModal.vue

@@ -34,7 +34,7 @@
     props: {
       userData: { type: Object },
     },
-    emits: ['update', 'register'],
+    emits: ['reload', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
       const fileFlow = reactive({
@@ -107,6 +107,7 @@
           console.log('res', res);
           closeModal();
           resetFields();
+          emit('reload');
           createMessage.success(res || '导出成功');
         } catch (error) {
           console.log('not passing', error);

+ 2 - 1
src/views/device/batchPutModal.vue

@@ -33,7 +33,7 @@
     props: {
       userData: { type: Object },
     },
-    emits: ['update', 'register'],
+    emits: ['reload', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
       const fileFlow = reactive({
@@ -105,6 +105,7 @@
           closeModal();
           resetFields();
           createMessage.success( res || '导入成功');
+          emit('reload');
         } catch (error) {
           console.log('not passing', error);
         }

+ 2 - 2
src/views/empower/apilist.vue

@@ -2,7 +2,7 @@
   <div>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary" @click="handleEdit" v-if="getCheckPerm('empowerCamera-add')"
+        <a-button type="primary" @click="handleEdit" v-if="getCheckPerm('empowerApi-add')"
           >新增</a-button
         >
       </template>
@@ -17,7 +17,7 @@
             {
               label: '删除',
               color: 'error',
-              ifShow: getCheckPerm('empowerCamera-delete'),
+              ifShow: getCheckPerm('empowerApi-delete'),
               onClick: handleDelete.bind(null, record),
             },
           ]"

+ 1 - 0
src/views/empower/differenceList.vue

@@ -6,6 +6,7 @@
           :actions="[
             {
               label: '差分账号授权',
+              ifShow: getCheckPerm('difference-Add'),
               onClick: handleAuthorize.bind(null, record),
             },
             {

+ 3 - 3
src/views/order/data.ts

@@ -402,7 +402,7 @@ export const dowmColumns: BasicColumn[] = [
   {
     title: '订单金额',
     dataIndex: 'amount',
-    width: 80,
+    width: 140,
   },
   {
     title: '币种',
@@ -532,7 +532,7 @@ export const localCameraColumns: BasicColumn[] = [
   {
     title: '订单金额',
     dataIndex: 'amount',
-    width: 80,
+    width: 140,
   },
   {
     title: '币种',
@@ -653,7 +653,7 @@ export const differenceColumns: BasicColumn[] = [
   {
     title: '订单金额',
     dataIndex: 'amount',
-    width: 80,
+    width: 140,
   },
   {
     title: '币种',

+ 1 - 1
src/views/product/rtk/list.vue

@@ -40,7 +40,7 @@
           <a-button type="primary" @click="handleuserEdit" v-if="getCheckPerm('rtk-addUser')"
             >新增账号</a-button
           >
-          <a-button type="primary" @click="handleExport(4)" v-if="getCheckPerm('rtk-user-batch')"
+          <a-button type="primary" @click="handleExport(4)" v-if="getCheckPerm('rtk-batch')"
             >批量导入</a-button
           >
           <a-button

+ 2 - 2
src/views/productOperation/viewKankan.vue

@@ -78,7 +78,7 @@
               },
               {
                 label: '迁移',
-                disabled: record.calcStatus != 1, //计算中计算失败不予迁移
+                disabled: record.calcStatus != 1 || record.panoStatus == 2 || record.panoStatus == 1, //计算中计算失败不予迁移
                 ifShow: getTypeCheckPerm('scenes-move') && tableType != 3,
                 onClick: handleMove.bind(null, record),
               },
@@ -102,7 +102,7 @@
                 //icon: 'ic:outline-delete-outline',
                 color: 'error',
                 ifShow: getTypeCheckPerm('scenes-delete'),
-                disabled: record.calcStatus == 0,
+                disabled: record.calcStatus == 0 || record.panoStatus == 2 || record.panoStatus == 1,
                 //onClick: handleDelete.bind(null, record),
                 popConfirm: {
                   title: '是否删除?',