1

src/views/device/putModal.vue

@@ -46,7 +46,7 @@
           colProps: {
             span: 18,
           },
-          helpMessage: 'wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”、“YUNPRO_”。',
+          helpMessage: 'wifi名称需包含前缀，如“4DKKMI_”、“4DSS_”、“4DSG_”。',
           itemProps: {
             validateTrigger: 'blur',
           },
@@ -59,12 +59,12 @@
                 if (!value) {
                   return Promise.reject('请输入wifi名称');
                 }
-                var list:string[] = ['4DKKPRO_','4DKKMI_','4DSS_','4DKK_','4DSG_','YUNPRO_'];
+                var list:string[] = ['4DKKMI_','4DSS_','4DSG_'];
                 const some = list.some(item=>{
                   return value.indexOf(item) != -1
                 })
                 if(!some){
-                  return Promise.reject('wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”、“YUNPRO_”。');
+                  return Promise.reject('wifi名称需包含前缀，如“4DKKMI_”、“4DSS_”、“4DSG_”。');
                 }
                 if (reg.test(value)) {
                   return Promise.reject('格式错误，请重新输入');

src/views/product/app/AddModal.vue

@@ -56,30 +56,32 @@
               { label: '亚马逊', value: 'aws' },
             ],
           },
-        },{
-          field: 'agent',
-          component: 'ApiSelect',
-          required: true,
-          label: '代理商标识',
-          componentProps: {
-            api: async function (params) {
-              const res = (await AppFileAgentList(params)) as any as TreeNode[];
-              return res.map(ele => {
-                return {name:ele,value:ele}
-              });
-            },
-            numberToString: true,
-            labelField: 'name',
-            valueField: 'value',
-            immediate: true,
-            params: {
-              agentName: '',
-            },
-          },
-          colProps: {
-            span: 22,
-          },
-        },{
+        },
+        // {
+        //   field: 'agent',
+        //   component: 'ApiSelect',
+        //   required: true,
+        //   label: '代理商标识',
+        //   componentProps: {
+        //     api: async function (params) {
+        //       const res = (await AppFileAgentList(params)) as any as TreeNode[];
+        //       return res.map(ele => {
+        //         return {name:ele,value:ele}
+        //       });
+        //     },
+        //     numberToString: true,
+        //     labelField: 'name',
+        //     valueField: 'value',
+        //     immediate: true,
+        //     params: {
+        //       agentName: '',
+        //     },
+        //   },
+        //   colProps: {
+        //     span: 22,
+        //   },
+        // },
+        {
           field: 'appType',
           label: 'APP类型',
           component: 'RadioButtonGroup',

src/views/product/app/index.vue

@@ -58,11 +58,12 @@
           ellipsis: false,
           width: 100,
         },
+        // {
+        //   title: '代理商标识',
+        //   dataIndex: 'agent',
+        //   width: 160,
+        // },
         {
-          title: '代理商标识',
-          dataIndex: 'agent',
-          width: 160,
-        },{
           title: 'APP类型',
           dataIndex: 'appType',
           ellipsis: false,
@@ -127,7 +128,7 @@
         title: 'App列表',
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: columns,
-        useSearchForm: true,
+        useSearchForm: false,
         formConfig: searchForm,
         showTableSetting: true,
         showIndexColumn:false,

src/views/productOperation/cameraScene.vue

@@ -2,13 +2,13 @@
   <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="5" tab="深时Mesh场景" :disabled="loading" />
         <a-tab-pane :key="6" tab="深光点云场景" :disabled="loading" />
         <a-tab-pane :key="7" tab="深光Mesh场景" :disabled="loading" />
-        <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading" />
+        <!-- <a-tab-pane :key="3" tab="四维双目Lite" :disabled="loading" /> -->
       </a-tabs>
     </template>
     <div class="desc-wrap-BasicTable">
@@ -191,7 +191,7 @@
       const { getCheckPerm } = permissionStore;
       const loading = ref(false);
       const tableRef = ref<Nullable<TableActionType>>(null);
-      const tableType = ref<Number>(0); //0看看 、1看见、2深时
+      const tableType = ref<Number>(1); //0看看 、1看见、2深时
       const rowSelection = ref({
         type: 'checkbox',
       });
@@ -351,7 +351,11 @@
                       canDownload.value = false;
                       afterClose();
                     }
-                    downloadOption.value = res;
+                    let params = res;
+                    if (tableType.value == 2 || tableType.value == 6) {
+                      params.url = '/' + res.url;
+                    }
+                    downloadOption.value = params;
                     console.log(res);
                   });
                 }, 1000);

src/views/statistics/components/sceneEchart.vue

@@ -37,7 +37,7 @@
     let fields  = {
     'time':'日期',
     'kj':'看见场景',
-    'kk':'看看场景',
+    // 'kk':'看看场景',
     'ss':'深时场景',
     'dy':'深时obj',
     }
@@ -48,7 +48,7 @@
       return {
         'time':ele,
         'kj':kjList.value && kjList.value[index] || 0,
-        'kk':kkList.value && kkList.value[index] || 0,
+        // 'kk':kkList.value && kkList.value[index] || 0,
         'ss':ssList.value && ssList.value[index] || 0,
         'dy':ssobjList.value && ssobjList.value[index] || 0,
       }
@@ -82,20 +82,20 @@
         splitNumber: 4,
       },
       series: [
-          {
+        {
           data: kjList.value,
           type: echartTypr.value,
           itemStyle: { color: '#38a0ff' },
           barMaxWidth: 80,
           name: nameList.value[0],
         },
-        {
-          data: kkList.value,
-          type: echartTypr.value,
-          itemStyle: { color: '#4cca73' },
-          barMaxWidth: 80,
-          name: nameList.value[1],
-        },
+        // {
+        //   data: kkList.value,
+        //   type: echartTypr.value,
+        //   itemStyle: { color: '#4cca73' },
+        //   barMaxWidth: 80,
+        //   name: nameList.value[1],
+        // },
         {
           data: ssList.value,
           type: echartTypr.value,

src/views/statistics/scene/index.vue

@@ -10,88 +10,87 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, reactive } from 'vue';
-import { sceneTotal, sceneTrend } from '/@/api/statistics/index';
-import { GrowCardItem } from '../data';
-import GrowCard from '../components/GrowCard.vue';
-import sceneEchart from '../components/sceneEchart.vue';
-const loading = ref(true);
-const growCardList = ref<GrowCardItem[]>([]);
-const echartData = reactive({
-  xdata: [],
-  kjList:[],
-  kkList:[],
-  ssList:[],
-  ssobjList:[],
-});
-const SearchData = reactive({
-  startTime: '',
-  endTime: '',
-  dataType: 0,
-  type: 2,
-});
-onMounted(() => {
-  getData();
-  getList();
-});
-async function getList() {
-  let downlist = [],
-    xdata = [];
-  const {kjList,kkList,ssList,ssobjList} = await sceneTrend(SearchData);
-  kjList.map((ele) => {
-    xdata.push(ele.groupKey);
-    downlist.push(ele.count);
+  import { ref, onMounted, reactive } from 'vue';
+  import { sceneTotal, sceneTrend } from '/@/api/statistics/index';
+  import { GrowCardItem } from '../data';
+  import GrowCard from '../components/GrowCard.vue';
+  import sceneEchart from '../components/sceneEchart.vue';
+  const loading = ref(true);
+  const growCardList = ref<GrowCardItem[]>([]);
+  const echartData = reactive({
+    xdata: [],
+    kjList: [],
+    kkList: [],
+    ssList: [],
+    ssobjList: [],
   });
-  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)|| []
-}
-function Search(val) {
-  const { startTime, endTime, dataType, type } = val;
-  console.log('params', val);
-  SearchData.startTime = startTime;
-  SearchData.endTime = endTime;
-  SearchData.dataType = type;
-  SearchData.type = dataType;
-  getList();
-}
-async function getData() {
-  try {
-    loading.value = true;
-    const { totalSceneCount = 0, preMonthAddCount = 0, todayAddCount = 0 } = await sceneTotal();
-    let list: GrowCardItem[] = [
-      {
-        title: '累计场景数量',
-        icon: 'fxemoji:notchedrightsemi3dot',
-        value: totalSceneCount,
-        unit: '个',
-        color: 'green',
-        action: '年',
-      },
-      {
-        title: '上月新增场景数量',
-        icon: 'download-count|svg',
-        value: preMonthAddCount,
-        unit: '个',
-        color: 'blue',
-        action: '月',
-      },
-      {
-        title: '今日新增场景数量',
-        icon: 'transaction|svg',
-        value: todayAddCount,
-        unit: '个',
-        color: 'orange',
-        action: '日',
-      },
-    ];
-    loading.value = false;
-    growCardList.value = list;
-  } catch (error) {
-    loading.value = false;
+  const SearchData = reactive({
+    startTime: '',
+    endTime: '',
+    dataType: 0,
+    type: 2,
+  });
+  onMounted(() => {
+    getData();
+    getList();
+  });
+  async function getList() {
+    let downlist = [],
+      xdata = [];
+    const { kjList, kkList, ssList, ssobjList } = await sceneTrend(SearchData);
+    kjList.map((ele) => {
+      xdata.push(ele.groupKey);
+      downlist.push(ele.count);
+    });
+    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) || [];
+  }
+  function Search(val) {
+    const { startTime, endTime, dataType, type } = val;
+    console.log('params', val);
+    SearchData.startTime = startTime;
+    SearchData.endTime = endTime;
+    SearchData.dataType = type;
+    SearchData.type = dataType;
+    getList();
+  }
+  async function getData() {
+    try {
+      loading.value = true;
+      const { totalSceneCount = 0, preMonthAddCount = 0, todayAddCount = 0 } = await sceneTotal();
+      let list: GrowCardItem[] = [
+        {
+          title: '累计场景数量',
+          icon: 'fxemoji:notchedrightsemi3dot',
+          value: totalSceneCount,
+          unit: '个',
+          color: 'green',
+          action: '年',
+        },
+        {
+          title: '上月新增场景数量',
+          icon: 'download-count|svg',
+          value: preMonthAddCount,
+          unit: '个',
+          color: 'blue',
+          action: '月',
+        },
+        {
+          title: '今日新增场景数量',
+          icon: 'transaction|svg',
+          value: todayAddCount,
+          unit: '个',
+          color: 'orange',
+          action: '日',
+        },
+      ];
+      loading.value = false;
+      growCardList.value = list;
+    } catch (error) {
+      loading.value = false;
+    }
   }
-}
 </script>
-