1

src/views/account/overview/AddDownModal.vue

@@ -47,7 +47,7 @@
       });
       const { createMessage, createConfirm } = useMessage();
       const schemas: FormSchema[] = [
-        ...Addschemas,
+        // ...Addschemas,
         // {
         //   field: 'id',
         //   component: 'Input',

src/views/account/overview/AddModal.vue

@@ -187,7 +187,7 @@
 
       const [registerForm, { validate, getFieldsValue, resetFields, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 120,
-        schemas: [...Addschemas, ...schemas, ...remarkschemas],
+        schemas: [...schemas, ...remarkschemas],
         showActionButtonGroup: false,
         actionColOptions: {
           span: 24,

src/views/device/detailsMoadl.vue

@@ -6,7 +6,7 @@
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @ok="handleSubmit"
-    :min-height="370"
+    :min-height="160"
   >
     <div class="pt-2px pr-3px">
       <BasicForm @register="registerForm" :model="model">
@@ -96,87 +96,87 @@
             },
           },
         },
-        {
-          field: 'agentId',
-          component: 'ApiSelect',
-          label: '经销商名称',
-          componentProps: {
-            filterOption: onFilterOption,
-            showSearch: true,
-            api: async function () {
-              const { list } = await agentNewList({ pageSize: 1000, pageNum: 1 });
-              return list;
-            },
-            // numberToString: true,
-            labelField: 'name',
-            valueField: 'id',
-            immediate: true,
-            params: {
-              agentName: '',
-            },
-          },
-          colProps: {
-            span: 18,
-          },
-        },
-        {
-          field: 'companyName',
-          component: 'AutoComplete',
-          label: '客户名称',
-          colProps: {
-            span: 18,
-          },
-          componentProps: {
-            filterOption: onFilterOption,
-            onSearch: async (searchText: string) => {
-              const { list } = await companyList({ companyName: searchText });
-              let optionsList =
-                list.map((ele) => {
-                  return { ...ele, value: ele.companyName };
-                }) || [];
-              console.log('paramList', optionsList);
-              optionsName.value = optionsList || [];
-              updateSchema({
-                field: 'companyName',
-                componentProps: {
-                  options: optionsName.value,
-                },
-              });
-            },
-            onChange: (data) => {
-              console.log('data', data);
-            },
-          },
-        },
-        {
-          field: 'orderSn',
-          component: 'AutoComplete',
-          label: '订单号',
-          colProps: {
-            span: 18,
-          },
-          componentProps: {
-            options: optionsOrderSn.value,
-            filterOption: onFilterOption,
-            onSearch: async (searchText: string) => {
-              const { list } = await CameraList({ orderSn: searchText });
-              optionsOrderSn.value = !searchText
-                ? []
-                : list.map((ele) => {
-                    return { value: ele.orderSn };
-                  });
-              updateSchema({
-                field: 'orderSn',
-                componentProps: {
-                  options: optionsOrderSn.value,
-                },
-              });
-            },
-            onChange: (data) => {
-              console.log('data', data);
-            },
-          },
-        },
+        // {
+        //   field: 'agentId',
+        //   component: 'ApiSelect',
+        //   label: '经销商名称',
+        //   componentProps: {
+        //     filterOption: onFilterOption,
+        //     showSearch: true,
+        //     api: async function () {
+        //       const { list } = await agentNewList({ pageSize: 1000, pageNum: 1 });
+        //       return list;
+        //     },
+        //     // numberToString: true,
+        //     labelField: 'name',
+        //     valueField: 'id',
+        //     immediate: true,
+        //     params: {
+        //       agentName: '',
+        //     },
+        //   },
+        //   colProps: {
+        //     span: 18,
+        //   },
+        // },
+        // {
+        //   field: 'companyName',
+        //   component: 'AutoComplete',
+        //   label: '客户名称',
+        //   colProps: {
+        //     span: 18,
+        //   },
+        //   componentProps: {
+        //     filterOption: onFilterOption,
+        //     onSearch: async (searchText: string) => {
+        //       const { list } = await companyList({ companyName: searchText });
+        //       let optionsList =
+        //         list.map((ele) => {
+        //           return { ...ele, value: ele.companyName };
+        //         }) || [];
+        //       console.log('paramList', optionsList);
+        //       optionsName.value = optionsList || [];
+        //       updateSchema({
+        //         field: 'companyName',
+        //         componentProps: {
+        //           options: optionsName.value,
+        //         },
+        //       });
+        //     },
+        //     onChange: (data) => {
+        //       console.log('data', data);
+        //     },
+        //   },
+        // },
+        // {
+        //   field: 'orderSn',
+        //   component: 'AutoComplete',
+        //   label: '订单号',
+        //   colProps: {
+        //     span: 18,
+        //   },
+        //   componentProps: {
+        //     options: optionsOrderSn.value,
+        //     filterOption: onFilterOption,
+        //     onSearch: async (searchText: string) => {
+        //       const { list } = await CameraList({ orderSn: searchText });
+        //       optionsOrderSn.value = !searchText
+        //         ? []
+        //         : list.map((ele) => {
+        //             return { value: ele.orderSn };
+        //           });
+        //       updateSchema({
+        //         field: 'orderSn',
+        //         componentProps: {
+        //           options: optionsOrderSn.value,
+        //         },
+        //       });
+        //     },
+        //     onChange: (data) => {
+        //       console.log('data', data);
+        //     },
+        //   },
+        // },
         {
           field: 'buyDate',
           component: 'DatePicker',

src/views/device/index.vue

@@ -164,17 +164,17 @@ import { lte } from 'lodash';
             return typeObj[record.outType] || '未出库'
           }
         },
-        {
-          title: '经销商名称',
-          dataIndex: 'agentName',
-          ellipsis: false,
-          width: 100,
-        },
-        {
-          title: '客户名称',
-          dataIndex: 'companyName',
-          width: 80,
-        },
+        // {
+        //   title: '经销商名称',
+        //   dataIndex: 'agentName',
+        //   ellipsis: false,
+        //   width: 100,
+        // },
+        // {
+        //   title: '客户名称',
+        //   dataIndex: 'companyName',
+        //   width: 80,
+        // },
         {
           title: '购买日期',
           dataIndex: 'buyDate',
@@ -303,34 +303,34 @@ import { lte } from 'lodash';
               ],
             },
           },
-          {
-            field: 'companyName',
-            label: '客户名称',
-            component: 'Input',
-            colProps: {
-              xl: 6,
-              xxl: 6,
-            },
-            componentProps: {
-              // api: brandTypeListApi,
-              resultField: 'list',
-              labelField: 'name',
-              valueField: 'brandType',
-              params: {
-                page: 1,
-                limit: 1000,
-              },
-            },
-          },
-          {
-            field: 'agentName',
-            component: 'Input',
-            label: '经销商名称',
-            colProps: {
-              xl: 7,
-              xxl: 7,
-            },
-          },
+          // {
+          //   field: 'companyName',
+          //   label: '客户名称',
+          //   component: 'Input',
+          //   colProps: {
+          //     xl: 6,
+          //     xxl: 6,
+          //   },
+          //   componentProps: {
+          //     // api: brandTypeListApi,
+          //     resultField: 'list',
+          //     labelField: 'name',
+          //     valueField: 'brandType',
+          //     params: {
+          //       page: 1,
+          //       limit: 1000,
+          //     },
+          //   },
+          // },
+          // {
+          //   field: 'agentName',
+          //   component: 'Input',
+          //   label: '经销商名称',
+          //   colProps: {
+          //     xl: 7,
+          //     xxl: 7,
+          //   },
+          // },
           {
             field: 'bindStatus',
             component: 'Select',

src/views/statistics/components/props.ts

@@ -18,6 +18,8 @@ export type echartData = {
   kkList?:number[];
   ssList?:number[];
   ssobjList?:number[];
+  sgList?:number[];
+  sgobjList?:number[];
   echartTypr?:string;
 };
 export const basicProps = {

src/views/statistics/components/sceneEchart.vue

@@ -22,9 +22,11 @@
   const kkList = ref<number[]>([]);
   const ssList = ref<number[]>([]);
   const ssobjList = ref<number[]>([]);
+  const sgList = ref<number[]>([]);
+  const sgobjList = ref<number[]>([]);
   const yixStringData = ref<string[]>([]);
   const echartTypr = ref('line')
-  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj']);
+  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj','深光场景','深光obj']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -40,6 +42,8 @@
     // 'kk':'看看场景',
     'ss':'深时场景',
     'dy':'深时obj',
+    'sg':'深光场景',
+    'sgdy':'深光obj',
     }
     if('场景趋势分析' == fileTile){
       fileTile = `${val && val.value == 0?'新增':'累计'}`+fileTile
@@ -51,6 +55,8 @@
         // 'kk':kkList.value && kkList.value[index] || 0,
         'ss':ssList.value && ssList.value[index] || 0,
         'dy':ssobjList.value && ssobjList.value[index] || 0,
+        'sg':sgList.value && sgList.value[index] || 0,
+        'sgdy':sgobjList.value && sgobjList.value[index] || 0,
       }
     })
     exportElsxFile(data,fields,fileTile)
@@ -110,6 +116,20 @@
           barMaxWidth: 80,
           name: nameList.value[3],
         },
+        {
+          data: sgList.value,
+          type: echartTypr.value,
+          itemStyle: { color: '#55d187' },
+          barMaxWidth: 80,
+          name: nameList.value[4],
+        },
+        {
+          data: sgobjList.value,
+          type: echartTypr.value,
+          itemStyle: { color: '#faa19d' },
+          barMaxWidth: 80,
+          name: nameList.value[5],
+        },
       ],
     });
   }
@@ -120,6 +140,8 @@
       kkList.value = echartData.kkList ||[]
       ssList.value = echartData.ssList ||[]
       ssobjList.value = echartData.ssobjList ||[]
+      sgList.value = echartData.sgList ||[]
+      sgobjList.value = echartData.sgobjList ||[]
       yixStringData.value = echartData.xdata ||[]
       if(echartData.nameList){
         nameList.value = echartData.nameList

src/views/statistics/scene/index.vue

@@ -23,6 +23,8 @@
     kkList: [],
     ssList: [],
     ssobjList: [],
+    sgList: [],
+    sgobjList: [],
   });
   const SearchData = reactive({
     startTime: '',
@@ -37,7 +39,7 @@
   async function getList() {
     let downlist = [],
       xdata = [];
-    const { kjList, kkList, ssList, ssobjList } = await sceneTrend(SearchData);
+    const { kjList, kkList, ssList, ssobjList, sgList, sgobjList } = await sceneTrend(SearchData);
     kjList.map((ele) => {
       xdata.push(ele.groupKey);
       downlist.push(ele.count);
@@ -47,6 +49,8 @@
     echartData.kkList = kkList.map((ele) => ele.count);
     echartData.ssList = (ssList && ssList.map((ele) => ele.count)) || [];
     echartData.ssobjList = ssobjList.map((ele) => ele.count) || [];
+    echartData.sgList = (sgList && sgList.map((ele) => ele.count)) || [];
+    echartData.sgobjList = sgobjList.map((ele) => ele.count) || [];
   }
   function Search(val) {
     const { startTime, endTime, dataType, type } = val;