tangning hace 2 años
padre
commit
f31717b2ea

+ 1 - 1
src/enums/pageEnum.ts

@@ -2,7 +2,7 @@ export enum PageEnum {
   // basic login path
   BASE_LOGIN = '/login',
   // basic home path
-  BASE_HOME = '/dashboard/analysis',
+  BASE_HOME = '/statistics/scene',
   // error page path
   ERROR_PAGE = '/exception',
   // error log page path

+ 20 - 20
src/views/customer/device.vue

@@ -85,11 +85,11 @@
           width: 80,
           customRender: ({ record }) => {
             let typeObj ={
-              '0':'旧双目相机',
-              '1':'四维看看',
-              '2':'四维看看lite',
+              // '0':'旧双目相机',
+              // '1':'四维看看',
+              // '2':'四维看看lite',
               '9':'四维看见',
-              '10':'四维深时',
+              // '10':'四维深时',
             }
             return typeObj[record.type]
           }
@@ -158,26 +158,26 @@
             componentProps: {
               maxLength: 100,
               options: [
-                {
-                  label: '旧双目相机',
-                  value: '0',
-                },
-                {
-                  label: '四维看看',
-                  value: '1',
-                },
-                {
-                  label: '四维看看lite',
-                  value: '2',
-                },
+                // {
+                //   label: '旧双目相机',
+                //   value: '0',
+                // },
+                // {
+                //   label: '四维看看',
+                //   value: '1',
+                // },
+                // {
+                //   label: '四维看看lite',
+                //   value: '2',
+                // },
                 {
                   label: '四维看见',
                   value: '9',
                 },
-                {
-                  label: '四维深时',
-                  value: '10',
-                },
+                // {
+                //   label: '四维深时',
+                //   value: '10',
+                // },
               ],
             },
             colProps: {

+ 28 - 28
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[]>(['看见场景','看看场景','深时场景','深时obj']);
+  const nameList = ref<string[]>(['看见场景',])//'看看场景','深时场景','深时obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -64,17 +64,17 @@
     let fields  = {
     'time':'日期',
     'kj':'看见场景',
-    'kk':'看看场景',
-    'ss':'深时场景',
-    'dy':'深时obj',
+    // 'kk':'看看场景',
+    // 'ss':'深时场景',
+    // 'dy':'深时obj',
   }
     let data = yixStringData.value.map((ele,index) => {
       return {
         'time':ele,
         'kj':kjList.value && kjList.value[index] || 0,
-        'kk':kkList.value && kkList.value[index] || 0,
-        'ss':ssList.value && ssList.value[index] || 0,
-        'dy':ssobjList.value && ssobjList.value[index] || 0,
+        // 'kk':kkList.value && kkList.value[index] || 0,
+        // 'ss':ssList.value && ssList.value[index] || 0,
+        // 'dy':ssobjList.value && ssobjList.value[index] || 0,
       }
     })
     exportElsxFile(data,fields,'场景趋势')
@@ -114,27 +114,27 @@
           barMaxWidth: 80,
           name: nameList.value[0],
         },
-        {
-          data: kkList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#4cca73' },
-          barMaxWidth: 80,
-          name: nameList.value[1],
-        },
-        {
-          data: ssList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#FDD56A' },
-          barMaxWidth: 80,
-          name: nameList.value[2],
-        },
-        {
-          data: ssobjList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#d58b55' },
-          barMaxWidth: 80,
-          name: nameList.value[3],
-        },
+        // {
+        //   data: kkList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#4cca73' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[1],
+        // },
+        // {
+        //   data: ssList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#FDD56A' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[2],
+        // },
+        // {
+        //   data: ssobjList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#d58b55' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[3],
+        // },
       ],
     });
   }

+ 2 - 2
src/views/dashboard/analysis/data.ts

@@ -46,7 +46,7 @@ export const growCardList: GrowCardItem[] = [
     icon: 'download-count|svg',
     value: 8000,
     unit: '笔',
-    color: 'orange',
+    color: 'blue',
     action: '月',
   },
   {
@@ -54,7 +54,7 @@ export const growCardList: GrowCardItem[] = [
     icon: 'transaction|svg',
     value: 5000,
     unit: '人',
-    color: 'purple',
+    color: 'blue',
     action: '月',
   },
 ];

+ 1 - 1
src/views/dashboard/analysis/index.vue

@@ -122,7 +122,7 @@ async function getData() {
         icon: 'download-count|svg',
         value: preMonThDownCount,
         unit: '笔',
-        color: 'orange',
+        color: 'blue',
         action: '月',
       },
       {

+ 16 - 16
src/views/device/index.vue

@@ -110,11 +110,11 @@
           width: 80,  
           customRender: ({ record }) => {
             let typeObj ={
-              '0':'旧双目相机',
-              '1':'四维看看',
-              '2':'四维看看lite',
+              // '0':'旧双目相机',
+              // '1':'四维看看',
+              // '2':'四维看看lite',
               '9':'四维看见',
-              '10':'四维深时',
+              // '10':'四维深时',
             }
             return typeObj[record.type]
           }        
@@ -198,21 +198,21 @@
             componentProps: {
               options: [
                 {
-                  label: t('routes.product.type.0'),
-                  value: 0,
-                  key: '0',
-                },{
-                  label: t('routes.product.type.1'),
-                  value: 1,
-                  key: '1',
-                },{
+                //   label: t('routes.product.type.0'),
+                //   value: 0,
+                //   key: '0',
+                // },{
+                //   label: t('routes.product.type.1'),
+                //   value: 1,
+                //   key: '1',
+                // },{
                   label: t('routes.product.type.2'),
                   value: 9,
                   key: '9',
-                },{
-                  label: t('routes.product.type.3'),
-                  value: 10,
-                  key: '10',
+                // },{
+                //   label: t('routes.product.type.3'),
+                //   value: 10,
+                //   key: '10',
                 },
               ],
             },

+ 3 - 3
src/views/product/firmware/index.vue

@@ -2,9 +2,9 @@
   <PageWrapper contentBackground>
     <template #footer>
       <a-tabs v-model:activeKey="searchInfo.type" @change="tabChange">
-        <a-tab-pane :key="1" :tab="t('routes.product.type.1')" />
+        <!-- <a-tab-pane :key="1" :tab="t('routes.product.type.1')" /> -->
         <a-tab-pane :key="2" :tab="t('routes.product.type.2')" />
-        <a-tab-pane :key="3" :tab="t('routes.product.type.3')" />
+        <!-- <a-tab-pane :key="3" :tab="t('routes.product.type.3')" /> -->
       </a-tabs>
     </template>
     <div class="desc-wrap-BasicTable">
@@ -84,7 +84,7 @@ export default defineComponent({
     const permissionStore = usePermissionStore();
     const { getCheckPerm } = permissionStore;
     const searchInfo = reactive<Recordable>({
-      type: 1,
+      type: 2,
     });
     const [registerAddModal, { openModal: openAddModal }] = useModal();
     const [registerEditModal, { openModal: openEditModal }] = useModal();

+ 5 - 4
src/views/productOperation/cameraScene.vue

@@ -2,10 +2,11 @@
   <PageWrapper contentBackground>
     <template #footer >
       <a-tabs v-model:activeKey="tableType" @change="changeTable">
-        <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/>
+        <!-- <a-tab-pane :key="0" tab="四维看看" :disabled="loading"/> -->
         <a-tab-pane :key="1" tab="四维看见" :disabled="loading"/>
-        <a-tab-pane :key="2" tab="四维深时" :disabled="loading"/>
-        <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading"/> </a-tabs
+        <!-- <a-tab-pane :key="2" tab="四维深时" :disabled="loading"/>
+        <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading"/>  -->
+      </a-tabs
     ></template>
     <div class="desc-wrap-BasicTable">
       <BasicTable @register="registerTable">
@@ -131,7 +132,7 @@
       const permissionStore = usePermissionStore();
       const { getCheckPerm } = permissionStore;
       const loading = ref(false);
-      const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
+      const tableType = ref<Recordable>(1); //0看看 、1看见、2深时
       const tabList = ref<Array>(['四维看看', '四维看见', '四维深时', '四维双目Lite']);
       const columns: BasicColumn[] = [
         {

+ 28 - 28
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[]>(['看见场景','看看场景','深时场景','深时obj']);
+  const nameList = ref<string[]>(['看见场景',]);//'看看场景','深时场景','深时obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -37,9 +37,9 @@
     let fields  = {
     'time':'日期',
     'kj':'看见场景',
-    'kk':'看看场景',
-    'ss':'深时场景',
-    'dy':'深时obj',
+    // 'kk':'看看场景',
+    // 'ss':'深时场景',
+    // 'dy':'深时obj',
     }
     if('场景趋势分析' == fileTile){
       fileTile = `${val && val.value == 0?'新增':'累计'}`+fileTile
@@ -48,9 +48,9 @@
       return {
         'time':ele,
         'kj':kjList.value && kjList.value[index] || 0,
-        'kk':kkList.value && kkList.value[index] || 0,
-        'ss':ssList.value && ssList.value[index] || 0,
-        'dy':ssobjList.value && ssobjList.value[index] || 0,
+        // 'kk':kkList.value && kkList.value[index] || 0,
+        // 'ss':ssList.value && ssList.value[index] || 0,
+        // 'dy':ssobjList.value && ssobjList.value[index] || 0,
       }
     })
     exportElsxFile(data,fields,fileTile)
@@ -89,27 +89,27 @@
           barMaxWidth: 80,
           name: nameList.value[0],
         },
-        {
-          data: kkList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#4cca73' },
-          barMaxWidth: 80,
-          name: nameList.value[1],
-        },
-        {
-          data: ssList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#FDD56A' },
-          barMaxWidth: 80,
-          name: nameList.value[2],
-        },
-        {
-          data: ssobjList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#d58b55' },
-          barMaxWidth: 80,
-          name: nameList.value[3],
-        },
+        // {
+        //   data: kkList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#4cca73' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[1],
+        // },
+        // {
+        //   data: ssList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#FDD56A' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[2],
+        // },
+        // {
+        //   data: ssobjList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#d58b55' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[3],
+        // },
       ],
     });
   }

+ 1 - 1
src/views/statistics/register/index.vue

@@ -79,7 +79,7 @@ async function getData() {
         icon: 'ooui:user-active',
         value: todayActiveCount,
         unit: '人',
-        color: 'blue',
+        color: 'orange',
         action: '日',
       },
     ];

+ 3 - 3
src/views/statistics/scene/index.vue

@@ -44,9 +44,9 @@ async function getList() {
   });
   echartData.xdata = xdata;
   echartData.kjList = downlist
-  echartData.kkList = kkList.map(ele => ele.count)
-  echartData.ssList = ssList &&ssList.map(ele => ele.count)|| []
-  echartData.ssobjList = ssobjList.map(ele => ele.count)|| []
+  // echartData.kkList = kkList.map(ele => ele.count)
+  // echartData.ssList = ssList &&ssList.map(ele => ele.count)|| []
+  // echartData.ssobjList = ssobjList.map(ele => ele.count)|| []
 }
 function Search(val) {
   const { startTime, endTime, dataType, type } = val;