feat(组件): 修改bug

src/views/account/details/OrderList.vue

@@ -7,12 +7,12 @@
             :actions="[
               {
                 label: '编辑',
-                icon: 'ep:edit',
+                ifShow:getCheckPerm('account-equityEdit'),
                 onClick: handleEdit.bind(null, record),
               },
               {
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                ifShow:getCheckPerm('account-equityDelete'),
                 popConfirm: {
                   title: '是否确认删除',
                   confirm: handleDelete.bind(null, record),
@@ -26,7 +26,7 @@
     <a-tab-pane key="2" tab="下载订单">
       <BasicTable @register="registerDown"></BasicTable>
     </a-tab-pane>
-    <a-tab-pane key="3" tab="消费订单">
+    <a-tab-pane key="3" tab="相机订单">
       <BasicTable @register="registerCamera"></BasicTable>
     </a-tab-pane>
   </a-tabs>
@@ -42,8 +42,9 @@ import { DownList,CameraList } from '/@/api/order'
 import { useModal } from '/@/components/Modal';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { cameraColumns, dowmColumns, equityColumns,equitySearchForm } from './data'
+import { cameraColumns, dowmColumns, equityColumns,orderSearchForm } from './data'
 import { otherInfoStore } from '/@/store/modules/other'
+import { usePermissionStore } from '/@/store/modules/permission';
 export default defineComponent({
   components: {
     BasicTable,
@@ -61,6 +62,8 @@ export default defineComponent({
   },
   setup() {
     const { t } = useI18n();
+    const permissionStore = usePermissionStore();
+    const { getCheckPerm } = permissionStore;
     const otherInfo = otherInfoStore();
     const OverviewInfo = computed(() => otherInfo.getOverviewInfo);
     const { userName } = OverviewInfo.value
@@ -96,11 +99,18 @@ export default defineComponent({
       title: '下载列表',
       columns: dowmColumns,
       useSearchForm: true,
-      formConfig: searchForm,
+      formConfig: orderSearchForm,
       showTableSetting: true,
       showIndexColumn: false,
       rowKey: 'id',
       searchInfo,
+      beforeFetch:(T)=>{
+          if(T.ctivated){
+            T.startTime = T.ctivated[0]
+            T.endTime = T.ctivated[1]
+          }
+          return T
+      },
       fetchSetting: {
         pageField: 'pageNum',
         sizeField: 'pageSize',
@@ -121,10 +131,17 @@ export default defineComponent({
       title: '相机列表',
       columns: cameraColumns,
       useSearchForm: true,
-      formConfig: searchForm,
+      formConfig: orderSearchForm,
       showIndexColumn: false,
       showTableSetting: true,
       searchInfo,
+      beforeFetch:(T)=>{
+          if(T.ctivated){
+            T.startTime = T.ctivated[0]
+            T.endTime = T.ctivated[1]
+          }
+          return T
+      },
       rowKey: 'id',
       fetchSetting: {
         pageField: 'pageNum',
@@ -139,10 +156,17 @@ export default defineComponent({
       title: '权益列表',
       columns: equityColumns,
       useSearchForm: true,
-      formConfig: equitySearchForm,
+      formConfig: orderSearchForm,
       showIndexColumn: false,
       showTableSetting: true,
       searchInfo,
+      beforeFetch:(T)=>{
+          if(T.ctivated){
+            T.startTime = T.ctivated[0]
+            T.endTime = T.ctivated[1]
+          }
+          return T
+      },
       rowKey: 'id',
       fetchSetting: {
         pageField: 'pageNum',
@@ -192,6 +216,7 @@ export default defineComponent({
       registerEditModal,
       openAddModal,
       handleEdit,
+      getCheckPerm,
       t,
       searchInfo,
     };

src/views/account/details/data.ts

@@ -148,7 +148,7 @@ export const msgNotifyList: ListItem[] = [
 //权益订单
 export const equityColumns: BasicColumn[] = [
   {
-    title: '时间',
+    title: '下单时间',
     dataIndex: 'createTime',
     width: 150,
     customRender: ({ record }) => {
@@ -168,11 +168,21 @@ export const equityColumns: BasicColumn[] = [
     width: 180,
   },
   {
-    title: '用户名',
+    title: '用户账号',
     dataIndex: 'userName',
+    width: 100,
+  },
+  {
+    title: '数量',
+    dataIndex: 'count',
     width: 80,
   },
   {
+    title: '交易号',
+    dataIndex: 'number',
+    width: 180,
+  },
+  {
     title: '订单金额',
     dataIndex: 'amount',
     width: 80,
@@ -192,40 +202,113 @@ export const equityColumns: BasicColumn[] = [
 ];
 export const equitySearchForm: Partial<FormProps> = {
   labelWidth: 100,
+  autoSubmitOnEnter:true,
+  autoAdvancedLine:1,
+  actionColOptions: {
+    span: 24,
+  },
   schemas: [
     {
-      field: 'sceneName',
+      field: 'ctivated',
       label: '下单时间',
       component: 'RangePicker',
       componentProps: {
         maxLength: 100,
+        format: 'YYYY-MM-DD',
         valueFormat:'YYYY-MM-DD',
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },{
+      field: 'orderSn',
+      label: '订单号',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },{
+      field: 'userName',
+      label: '用户账号',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },{
+      field: 'tradeNum',
+      label: '交易号',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
+  ],
+};
+export const orderSearchForm: Partial<FormProps> = {
+  labelWidth: 100,
+  autoSubmitOnEnter:true,
+  autoAdvancedLine:1,
+  actionColOptions: {
+    span: 24,
+  },
+  schemas: [
+    {
+      field: 'ctivated',
+      label: '下单时间',
+      component: 'RangePicker',
+      componentProps: {
+        maxLength: 100,
         format: 'YYYY-MM-DD',
+        valueFormat:'YYYY-MM-DD',
       },
       colProps: {
         xl: 7,
         xxl: 7,
       },
     },{
-      field: 'sceneName',
+      field: 'orderSn',
       label: '订单号',
       component: 'Input',
       componentProps: {
         maxLength: 100,
       },
       colProps: {
-        xl: 6,
-        xxl: 6,
+        xl: 7,
+        xxl: 7,
+      },
+    },{
+      field: 'tradeNum',
+      label: '交易号',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
       },
-    }
+      colProps: {
+        xl: 7,
+        xxl: 7,
+      },
+    },
   ],
 };
 //下载订单
 export const dowmColumns: BasicColumn[] = [
   {
-    title: '时间',
+    title: '下单时间',
     dataIndex: 'createTime',
-    width: 180,
+    width: 150,
     customRender: ({ record }) => {
       return (
         record.createTime &&
@@ -243,12 +326,20 @@ export const dowmColumns: BasicColumn[] = [
     width: 180,
   },
   {
-    title: '用户名',
+    title: '用户账号',
     dataIndex: 'userName',
-    width: 80,
+    width: 120,
+  },{
+    title: 'SN码',
+    dataIndex: 'snCode',
+    width: 120,
+  },{
+    title: '场景',
+    dataIndex: 'sceneNum',
+    width: 100,
   },
   {
-    title: '订单金额',
+    title: '订单金额(元)',
     dataIndex: 'amount',
     width: 80,
   },
@@ -259,6 +350,11 @@ export const dowmColumns: BasicColumn[] = [
     width: 80,
   },
   {
+    title: '交易号',
+    dataIndex: 'number',
+    width: 180,
+  },
+  {
     title: '订单状态',
     dataIndex: 'payStatus',
     // slots: { customRender: 'orderStatus' },
@@ -270,7 +366,7 @@ export const cameraColumns: BasicColumn[] = [
   {
     title: '下单时间',
     dataIndex: 'orderTime',
-    width: 120,
+    width: 150,
     customRender: ({ record }) => {
       return (
         record.orderTime &&

src/views/account/details/index.vue

@@ -1,6 +1,9 @@
 <template>
   <ScrollContainer>
     <div ref="wrapperRef" :class="prefixCls">
+      <div style="text-align: right;padding:20px;">
+        <a-button type="primary" @click="routerGo">返回</a-button>
+      </div>
       <Tabs tab-position="left" :tabBarStyle="tabBarStyle">
         <template v-for="item in settingList" :key="item.key">
           <TabPane :tab="item.name">
@@ -15,9 +18,9 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { Tabs } from 'ant-design-vue';
-
   import { ScrollContainer } from '/@/components/Container/index';
   import { settingList } from './data';
+  import { useRouter } from 'vue-router';
 
   import Overview from '../overview/index.vue';
   import OrderList from './OrderList.vue';
@@ -33,7 +36,12 @@
       Product,
     },
     setup() {
+      const router = useRouter();
+      function routerGo(){
+          router.go(-1)
+      }
       return {
+        routerGo,
         prefixCls: 'account-setting Level2Tab',
         settingList,
         tabBarStyle: {

src/views/account/lists.vue

@@ -5,7 +5,6 @@
         :actions="[
           {
             label: '详情',
-            icon: 'mdi:account-details',
             onClick: handleEdit.bind(null, record),
           }
         ]"

src/views/account/overview/caremModal.vue

@@ -15,7 +15,6 @@
               :actions="[
                  {
                    label: '解绑',
-                   icon: 'clarity:unlink-line',
                    onClick: handleDelete.bind(null, record, 'edit'),
                  },
               ]"

src/views/account/overview/interesModal.vue

@@ -15,7 +15,6 @@
               :actions="[
                  {
                    label: '续费',
-                   icon: 'carbon:renew',
                    onClick: handleDelete.bind(null, record, 'edit'),
                  },
               ]"

src/views/account/product/data.tsx

@@ -149,19 +149,18 @@ export const searchForm: Partial<FormProps> = {
         xxl: 7,
       },
     },
-
-    // {
-    //   field: 'userName',
-    //   label: '用户账号',
-    //   component: 'Input',
-    //   componentProps: {
-    //     maxLength: 100,
-    //   },
-    //   colProps: {
-    //     xl: 6,
-    //     xxl: 6,
-    //   },
-    // },
+    {
+      field: 'snCode',
+      label: 'SN码',
+      component: 'Input',
+      componentProps: {
+        maxLength: 100,
+      },
+      colProps: {
+        xl: 6,
+        xxl: 6,
+      },
+    },
   ],
 };
 

src/views/account/product/index.vue

@@ -18,7 +18,7 @@
               {
                 label: '删除',
                 color: 'error',
-                ifShow:getCheckPerm('account-productDelete'),
+                ifShow:getTypeCheckPerm('account-productDelete'),
                 popConfirm: {
                   title: '是否删除？',
                   confirm: handleDelete.bind(null, record),
@@ -36,21 +36,20 @@
             :actions="[
               {
                 label: '迁移',
-                ifShow:getCheckPerm('account-productTransfer'),
+                ifShow:getTypeCheckPerm('account-productTransfer'),
+                disabled:!(record.status == 1 || record.status == -2),
                 onClick: handleMove.bind(null, record),
               },
               {
                 label: '下载',
-                disabled:
-                  (record.payStatus - 0 != 1 && record.status - 0 == 0) ||
-                  (record.payStatus - 0 != 1 && record.status - 0 == -1),
-                ifShow:getCheckPerm('account-productDownload'),
+                disabled:!(record.status == 1 || record.status == -2),
+                ifShow:getTypeCheckPerm('account-productDownload'),
                 onClick: handleDownload.bind(null, record),
               },
               {
                 label: '重算',
-                disabled: record.payStatus != 1 && record.status - 0 == 0,
-                ifShow:getCheckPerm('account-productRerun'),
+                disabled: record.status == 0,
+                ifShow:getTypeCheckPerm('account-productRerun'),
                 popConfirm: {
                   title: '是否重算？',
                   confirm: handleReset.bind(null, record),
@@ -58,16 +57,15 @@
               },
               {
                 label: '复制',
-                disabled:
-                  (record.payStatus != 1 && record.status - 0 == 0) ||
-                  (record.payStatus != 1 && record.status - 0 == -1),
-                ifShow:getCheckPerm('account-productCopy'),
+                disabled:!(record.status == 1 || record.status == -2),
+                ifShow:getTypeCheckPerm('account-productCopy'),
                 onClick: handleCopy.bind(null, record),
               },
               {
                 label: '删除',
                 color: 'error',
-                ifShow:getCheckPerm('account-productDelete'),
+                disabled:record.status == 0,
+                ifShow:getTypeCheckPerm('account-productDelete'),
                 popConfirm: {
                   title: '是否删除？',
                   confirm: handleDelete.bind(null, record),
@@ -287,6 +285,10 @@
           .catch(() => {});
       }
 
+      function getTypeCheckPerm(val){
+        let myType = tableType.value
+        return getCheckPerm(val) || getCheckPerm(`${val}-${myType}`)
+      }
       return {
         registerTableViewKankan,
         registerTable,
@@ -308,7 +310,7 @@
         downloadOption,
         cancelDownload,
         ViewReload,
-        getCheckPerm,
+        getTypeCheckPerm,
       };
     },
   });

src/views/account/user/index.vue

@@ -5,7 +5,6 @@
         :actions="[
           {
             label: '详情',
-            icon: 'mdi:account-details',
             onClick: handleEdit.bind(null, record),
           }
         ]"

src/views/anchor/index.vue

@@ -126,7 +126,7 @@
           listField: 'list',
           totalField: 'total',
         },
-        pagination: { pageSize: 20 },
+        // pagination: { pageSize: 20 },
         afterFetch: (T) => {
           return T;
         },

src/views/dashboard/analysis/components/orderEchart.vue

@@ -51,7 +51,7 @@
   const ssobjList = ref<number[]>([]);
   const yixStringData = ref<string[]>([]);
   const echartTypr = ref('line')
-  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','点云场景']);
+  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -66,7 +66,7 @@
     'kj':'看见场景',
     'kk':'看看场景',
     'ss':'深时场景',
-    'dy':'点云场景',
+    'dy':'深时obj',
   }
     let data = yixStringData.value.map((ele,index) => {
       return {

src/views/invoice/index.vue

@@ -10,20 +10,20 @@
             :actions="[
               {
                 label: '开票登记',
-                icon: 'la:file-invoice-dollar',
+                //icon: 'la:file-invoice-dollar',
                 ifShow:getCheckPerm('invoice-checkin') && record.invoiced==0,
                 onClick: handleInvoice.bind(null, record),
               },
               {
                 label: '电子发票',
                 ifShow:record.type == 2 && record.invoiced==1,
-                icon: 'simple-icons:invoiceninja',
+                //icon: 'simple-icons:invoiceninja',
                 onClick: headleDetails.bind(null, record),
               },
               {
                 label: '快递单号',
                 ifShow:record.type != 2&& record.invoiced==1,
-                icon: 'icon-park-outline:express-delivery',
+                //icon: 'icon-park-outline:express-delivery',
                 onClick: headleDetails.bind(null, record),
               },
             ]"

src/views/operate/agent.vue

@@ -15,7 +15,7 @@
             :actions="[
               {
                 label: '处理',
-                icon: 'icon-park-outline:door-handle',
+                //icon: 'icon-park-outline:door-handle',
                 ifShow: getCheckPerm('agent-deal') && record.state == 0,
                 onClick: handleWithdraw.bind(null, record),
               },

src/views/operate/components/new/addModal.vue

@@ -53,6 +53,9 @@
             component: 'Input',
             required: true,
             label: '新闻标题',
+            componentProps: {
+              maxlength: 50,
+            },
             colProps: {
               span: 22,
             },
@@ -61,6 +64,9 @@
             component: 'Input',
             label: '新闻来源',
             required: true,
+            componentProps: {
+              maxlength: 15,
+            },
             colProps: {
               span: 22,
             },
@@ -113,6 +119,9 @@
             colProps: {
               span: 22,
             },
+            componentProps: {
+              maxlength: 200,
+            },
         },
         {
           field: 'content',
@@ -125,7 +134,7 @@
           render: ({ model, field }) => {
             return h(Tinymce, {
               value: model[field],
-              maxlength: 200,
+              maxlength: 10000,
               onChange: (value: string) => {
                 model[field] = value;
               },

src/views/operate/messageList.vue

@@ -16,7 +16,7 @@
             :actions="[
               {
                 label: '处理',
-                icon: 'icon-park-outline:door-handle',
+                //icon: 'icon-park-outline:door-handle',
                 ifShow: getCheckPerm('message-deal') && record.state == 1,
                 onClick: handleWithdraw.bind(null, record),
               },

src/views/operate/newsList.vue

@@ -10,22 +10,22 @@
             :actions="[
               {
                 label: '撤回',
-                icon: 'icon-park-outline:folder-withdrawal-one',
+                //icon: 'icon-park-outline:folder-withdrawal-one',
                 ifShow:getCheckPerm('news-withdraw') && record.isPublic == 1,
                 onClick: handleWithdraw.bind(null, record),
               },{
                 label: '发布',
-                icon: 'arcticons:efa-publish',
+                //icon: 'arcticons:efa-publish',
                 ifShow:getCheckPerm('news-publish') && record.isPublic == 0,
                 onClick: handlePublish.bind(null, record),
               },{
                 label: '编辑',
-                icon: 'ep:edit',
+                //icon: 'ep:edit',
                 ifShow:getCheckPerm('news-edit') && record.isPublic == 0,
                 onClick: handleEdit.bind(null, record),
               },{
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 ifShow:getCheckPerm('news-delete'),
                 popConfirm: {
                   title: '是否确认删除',

src/views/operate/recruitList.vue

@@ -10,12 +10,12 @@
             :actions="[
               {
                 label: '编辑',
-                icon: 'ep:edit',
+                //icon: 'ep:edit',
                 ifShow:record.isPush == 0,
                 onClick: handleEdit.bind(null, record),
               },{
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 popConfirm: {
                   title: '是否确认删除',
                   confirm: handleDelete.bind(null, record),

src/views/operate/sceneList.vue

@@ -18,7 +18,7 @@
             :actions="[
               {
                 label: '发送',
-                icon: 'icon-park-outline:door-handle',
+                //icon: 'icon-park-outline:door-handle',
                 ifShow: getCheckPerm('apply-send') && record.state == 0,
                 onClick: handleWithdraw.bind(null, record),
               },

src/views/order/cameraList.vue

@@ -31,7 +31,7 @@
             :actions="[
               {
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 onClick: handleDelete.bind(null, record),
               },
             ]"
@@ -61,6 +61,7 @@
   import {  downloadByData, } from '/@/utils/file/download';
   import { CameraList,CameraItem, CameraExport } from '/@/api/order'
   import { usePermissionStore } from '/@/store/modules/permission';
+  import { cameraColumns,equitySearchForm } from '../account/details/data'
 
   export default defineComponent({
     components: { 
@@ -80,122 +81,13 @@
       const expandedItem = reactive({
 
       })
-      const columns: BasicColumn[] = [
-        {
-          title: '下单时间',
-          dataIndex: 'orderTime',
-          width: 150,
-          customRender: ({ record }) => {
-            return (
-              record.orderTime &&
-              h(Time, {
-                value: record.orderTime,
-                mode: 'datetime',
-              })
-            );
-          },
-        },
-        {
-          title: '订单号',
-          dataIndex: 'orderSn',
-          ellipsis: false,
-          width: 180,
-        },
-        {
-          title: '用户账号',
-          dataIndex: 'userName',
-          ellipsis: false,
-          width: 120,
-        },
-        {
-          title: '订单金额(元)',
-          dataIndex: 'goodsAmount',
-          ellipsis: false,
-          width: 120,
-        },
-        {
-          title: '支付方式',
-          dataIndex: 'paymentTypeName',
-          width: 80,
-        },
-        {
-          title: '交易号',
-          dataIndex: 'tradeNum',
-          width: 220,
-        },
-        {
-          title: '订单状态',
-          dataIndex: 'paymentStatus',
-          // slots: { customRender: 'orderStatus' },
-          width: 80,
-        },
-      ];
-      const searchForm: Partial<FormProps> = {
-        labelWidth: 80,
-        autoAdvancedLine:1,
-        autoSubmitOnEnter:true,
-        schemas: [
-          {
-            field: 'ctivated',
-            label: '下单时间',
-            component: 'RangePicker',
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-            componentProps:{
-              format: 'YYYY-MM-DD',
-              valueFormat:'YYYY-MM-DD',
-            }
-          },
-          {
-            field: 'orderSn',
-            label: '订单号',
-            component: 'Input',
-            colProps: {
-              xl: 6,
-              xxl: 6,
-            },
-            componentProps: {
-              // api: brandTypeListApi,
-              resultField: 'list',
-              labelField: 'name',
-              valueField: 'brandType',
-              params: {
-                page: 1,
-                limit: 1000,
-              },
-            },
-          },
-          {
-            field: 'userName',
-            component: 'Input',
-            label: '用户账号',
-            colProps: {
-              xl: 6,
-              xxl: 6,
-            },
-          },{
-            field: 'tradeNum',
-            label: '交易号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },
-        ],
-      };
       const [registerTable] = useTable({
         api: CameraList,
         title: '相机列表',
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
-        columns: columns,
+        columns: cameraColumns,
         useSearchForm: true,
-        formConfig: searchForm,
+        formConfig: equitySearchForm,
         showIndexColumn:false,
         showTableSetting: true,
         canResize: true,

src/views/order/downloadList.vue

@@ -10,7 +10,7 @@
             :actions="[
               {
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 onClick: handleDelete.bind(null, record),
               },
             ]"
@@ -39,6 +39,7 @@
   import { DownList,DownExport } from '/@/api/order'
   import {  downloadByData, } from '/@/utils/file/download';
   import { usePermissionStore } from '/@/store/modules/permission';
+  import { dowmColumns,equitySearchForm } from '../account/details/data'
 
   export default defineComponent({
     components: { 
@@ -55,127 +56,13 @@
       const { createConfirm } = useMessage();
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
-      const columns: BasicColumn[] = [
-        {
-          title: '下单时间',
-          dataIndex: 'createTime',
-          width: 150,
-          customRender: ({ record }) => {
-            return (
-              record.createTime &&
-              h(Time, {
-                value: record.createTime,
-                mode: 'datetime',
-              })
-            );
-          },
-        },
-        {
-          title: '订单号',
-          dataIndex: 'orderSn',
-          ellipsis: false,
-          width: 180,
-        },
-        {
-          title: '用户账号',
-          dataIndex: 'userName',
-          width: 120,
-        },{
-          title: 'SN码',
-          dataIndex: 'snCode',
-          width: 120,
-        },{
-          title: '场景',
-          dataIndex: 'sceneNum',
-          width: 100,
-        },
-        {
-          title: '订单金额(元)',
-          dataIndex: 'amount',
-          width: 80,
-        },
-        {
-          title: '支付方式',
-          dataIndex: 'payType',
-          // slots: { customRender: 'orderType' },
-          width: 80,
-        },
-        {
-          title: '交易号',
-          dataIndex: 'number',
-          width: 180,
-        },
-        {
-          title: '订单状态',
-          dataIndex: 'payStatus',
-          // slots: { customRender: 'orderStatus' },
-          width: 80,
-        },
-      ];
-      const searchForm: Partial<FormProps> = {
-        labelWidth: 100,
-        autoAdvancedLine:1,
-        autoSubmitOnEnter:true,
-        actionColOptions: {
-          span: 24,
-        },
-        schemas: [
-          {
-            field: 'ctivated',
-            label: '下单时间',
-            component: 'RangePicker',
-            componentProps: {
-              maxLength: 100,
-              format: 'YYYY-MM-DD',
-              valueFormat:'YYYY-MM-DD',
-            },
-            colProps: {
-              xl: 8,
-              xxl: 8,
-            },
-          },{
-            field: 'orderSn',
-            label: '订单号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },{
-            field: 'userName',
-            label: '用户账号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },{
-            field: 'tradeNum',
-            label: '交易号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },
-        ],
-      };
       const [registerTable] = useTable({
         api: DownList,
         title: '下载列表',
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
-        columns: columns,
+        columns: dowmColumns,
         useSearchForm: true,
-        formConfig: searchForm,
+        formConfig: equitySearchForm,
         showTableSetting: true,
         showIndexColumn:false,
         rowKey: 'id',

src/views/order/equityList.vue

@@ -10,7 +10,7 @@
             :actions="[
               {
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 onClick: handleDelete.bind(null, record),
               },
             ]"
@@ -36,6 +36,7 @@
   import { Descriptions } from 'ant-design-vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { equityColumns,equitySearchForm } from '../account/details/data'
   import {  downloadByData, } from '/@/utils/file/download';
   import { IncrementList,IncrementExport } from '/@/api/order'
   import { usePermissionStore } from '/@/store/modules/permission';
@@ -55,125 +56,14 @@
       const { createMessage,createConfirm } = useMessage();
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
-      const columns: BasicColumn[] = [
-        {
-          title: '下单时间',
-          dataIndex: 'createTime',
-          width: 150,
-          customRender: ({ record }) => {
-            return (
-              record.createTime &&
-              h(Time, {
-                value: record.createTime,
-                mode: 'datetime',
-              })
-            );
-          },
-        },
-        {
-          title: '订单号',
-          dataIndex: 'orderSn',
-          ellipsis: false,
-          width: 180,
-        },
-        {
-          title: '用户账号',
-          dataIndex: 'userName',
-          width: 100,
-        },
-        {
-          title: '数量',
-          dataIndex: 'count',
-          width: 80,
-        },
-        {
-          title: '交易号',
-          dataIndex: 'number',
-          width: 180,
-        },
-        {
-          title: '订单金额',
-          dataIndex: 'amount',
-          width: 80,
-        },
-        {
-          title: '支付方式',
-          dataIndex: 'payType',
-          // slots: { customRender: 'orderType' },
-          width: 80,
-        },
-        {
-          title: '订单状态',
-          dataIndex: 'payStatus',
-          // slots: { customRender: 'orderStatus' },
-          width: 80,
-        },
-      ];
-      const searchForm: Partial<FormProps> = {
-        labelWidth: 100,
-        autoSubmitOnEnter:true,
-        autoAdvancedLine:1,
-        actionColOptions: {
-          span: 24,
-        },
-        schemas: [
-          {
-            field: 'ctivated',
-            label: '下单时间',
-            component: 'RangePicker',
-            componentProps: {
-              maxLength: 100,
-              format: 'YYYY-MM-DD',
-              valueFormat:'YYYY-MM-DD',
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },{
-            field: 'orderSn',
-            label: '订单号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },{
-            field: 'userName',
-            label: '用户账号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },{
-            field: 'tradeNum',
-            label: '交易号',
-            component: 'Input',
-            componentProps: {
-              maxLength: 100,
-            },
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },
-        ],
-      };
       const [registerTable] = useTable({
         api: IncrementList,
         title: '权益列表',
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
-        columns: columns,
+        columns: equityColumns,
         useSearchForm: true,
         showIndexColumn:false,
-        formConfig: searchForm,
+        formConfig: equitySearchForm,
         showTableSetting: true,
         rowKey: 'id',
         beforeFetch:(T)=>{

src/views/product/app/index.vue

@@ -9,7 +9,7 @@
             :actions="[
               {
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 ifShow: getCheckPerm('App-delete'),
                 onClick: handleDelete.bind(null, record),
               },

src/views/product/firmware/index.vue

@@ -26,13 +26,13 @@
             :actions="[
               {
                 label: '编辑',
-                icon: 'ep:edit',
+                //icon: 'ep:edit',
                 ifShow: getCheckPerm('firmware-update'),
                 onClick: handleEdit.bind(null, record),
               },
               {
                 label: '删除',
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 ifShow: getCheckPerm('firmware-delete'),
                 popConfirm: {
                   title: '是否确认删除',

src/views/product/sdk/index.vue

@@ -25,26 +25,26 @@
             :actions="[
               {
                 label: '发布',
-                icon: 'arcticons:efa-publish',
+                //icon: 'arcticons:efa-publish',
                 ifShow:getTypeCheckPerm('sdk-publish') && record.status != 1,
                 onClick: handlePublish.bind(null, record),
               },
               {
                 label: '编辑',
-                icon: 'ep:edit',
+                //icon: 'ep:edit',
                 ifShow: getTypeCheckPerm('sdk-update'),
                 onClick: handleEdit.bind(null, record),
               },
               {
                 label: '下架',
                 ifShow: getTypeCheckPerm('sdk-lower') && record.status == 1,
-                icon: 'akar-icons:statistic-down',
+                //icon: 'akar-icons:statistic-down',
                 onClick: handleOff.bind(null, record),
               },
               {
                 label: '删除',
                 ifShow: getTypeCheckPerm('sdk-delete') && record.status != 1,
-                icon: 'ic:outline-delete-outline',
+                //icon: 'ic:outline-delete-outline',
                 onClick: handleDelete.bind(null, record),
               },
             ]"

src/views/productOperation/cameraScene.vue

@@ -46,7 +46,7 @@
               {
                 label: '复制',
                 disabled:!(record.status == 1 || record.status == -2),
-                ifShow:getTypeCheckPerm('scenes-copy'),
+                ifShow:getTypeCheckPerm('scenes-copy') && tableType != 3,
                 onClick: handleCopy.bind(null, record),
               },
               {

src/views/staff/detailsModal.vue

@@ -4,11 +4,11 @@
     @cancel="resetFields"
     @register="register"
     :title="title"
+    :min-height="300"
+    height="500"
     @ok="handleOk"
   >
-    <div class="pt-3px pr-3px">
-      <BasicForm @register="registerForm" :model="modelRef" />
-    </div>
+    <BasicForm @register="registerForm" :model="modelRef" />
   </BasicModal>
 </template>
 <script lang="ts">
@@ -188,10 +188,15 @@
       function onDataReceive(data) {
         // 方式1;
         console.log('useModalInner', data);
-        setFieldsValue({
-          ...data,
-          roleId: data.roleId != 2 ? data.roleId : '',
-        });
+        setTimeout(()=>{
+            console.log('useModalInner', data);
+            setFieldsValue({
+            ...data,
+            userName:'',
+            password:'',
+            roleId: data.roleId != 2 ? data.roleId : '',
+          });
+        },200)
         let setSchema = [
           {
             field: 'roleId',

src/views/statistics/components/sceneEchart.vue

@@ -24,7 +24,7 @@
   const ssobjList = ref<number[]>([]);
   const yixStringData = ref<string[]>([]);
   const echartTypr = ref('line')
-  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','点云场景']);
+  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -39,7 +39,7 @@
     'kj':'看见场景',
     'kk':'看看场景',
     'ss':'深时场景',
-    'dy':'点云场景',
+    'dy':'深时obj',
   }
     let data = yixStringData.value.map((ele,index) => {
       return {
@@ -50,7 +50,7 @@
         'dy':ssobjList.value && ssobjList.value[index] || 0,
       }
     })
-    exportElsxFile(data,fields,'订单数据')
+    exportElsxFile(data,fields,props.title||'订单数据')
   }
   function handlesetOptions() {
     setOptions({

src/views/statistics/order/index.vue

@@ -17,6 +17,7 @@
     downOrder:[],
     incrementOrder:[],
     partOrder:[],
+    echartTypr:'bar',
   })
   const SearchData = reactive({
     startTime:'',

src/views/statistics/scene/index.vue

@@ -2,7 +2,7 @@
   <div class="p-4">
     <GrowCard :loading="loading" :list="growCardList" class="enter-y" />
     <sceneEchart
-      title="订单数据统计"
+      title="场景趋势分析"
       class="!my-4 enter-y"
       @change="Search"
       :echartData="echartData"
@@ -66,7 +66,7 @@ async function getData() {
         title: '累计场景数量',
         icon: 'fxemoji:notchedrightsemi3dot',
         value: totalSceneCount,
-        unit: '人',
+        unit: '个',
         color: 'blue',
         action: '年',
       },
@@ -74,7 +74,7 @@ async function getData() {
         title: '上月新增场景数量',
         icon: 'download-count|svg',
         value: preMonthAddCount,
-        unit: '人',
+        unit: '个',
         color: 'orange',
         action: '月',
       },
@@ -82,7 +82,7 @@ async function getData() {
         title: '今日新增场景数量',
         icon: 'transaction|svg',
         value: todayAddCount,
-        unit: '人',
+        unit: '个',
         color: 'blue',
         action: '日',
       },

src/views/system/menu/index.vue

@@ -8,11 +8,13 @@
         <TableAction
           :actions="[
             {
-              icon: 'clarity:note-edit-line',
+              label: '编辑',
+              //icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
             },
             {
-              icon: 'ant-design:delete-outlined',
+              label: '删除',
+              //icon: 'ant-design:delete-outlined',
               color: 'error',
               onClick: handleDelete.bind(null, record),
             },