1

src/views/mediaLibrary/modal/grouping.vue

@@ -149,6 +149,7 @@
         });
       }
       const handleSubmit = async () => {
+        window.location.reload();
         emit('update');
         closeModal();
       };

src/views/mediaLibrary/modal/uploadModal.vue

@@ -6,6 +6,8 @@
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @ok="handleSubmit"
+    :okText="loading?`上传中 ${fileFlow.complete}%`:'确认'"
+    :confirmLoading="loading"
     :min-height="250"
     :height="700"
   >
@@ -51,9 +53,11 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
+      const loading = ref(false);
       const fileFlow = reactive({
         file: null,
         title: '上传',
+        complete: 0,
       });
       const { createMessage } = useMessage();
       const schemas: FormSchema[] = [
@@ -132,6 +136,8 @@
         });
       }
       const handleSubmit = async () => {
+        loading.value = true;
+        fileFlow.complete = 0;
         try {
           const params = await validate();
           const apiData = {
@@ -141,12 +147,18 @@
             }
           };
           console.log('res', apiData, params);
-          await uploadApi(apiData);
+          function onUploadProgress(progressEvent: ProgressEvent) {
+              const complete = ((progressEvent.loaded / progressEvent.total) * 100) | 0;
+              fileFlow.complete = complete;
+          }
+          await uploadApi(apiData, onUploadProgress);
           closeModal();
           resetFields();
+          loading.value = false;
           createMessage.success('上传成功。');
           emit('update');
         } catch (error) {
+          loading.value = false;
           console.log('not passing', error);
         }
       };
@@ -167,6 +179,7 @@
         t,
         obj,
         osgb,
+        loading,
       };
     },
   });

src/views/productOperation/cameraScene.vue

@@ -722,9 +722,9 @@
         }
       }
       onMounted(() => {
-        sceneCount({}).then((res) => {
+        operateSceneList({}).then((res) => {
           console.log('res', res);
-          if (res == 0) {
+          if (res.total == 0) {
             qrCodeUrl.value.show = true;
           }
         });

src/views/productOperation/modal/detailModal.vue

@@ -204,6 +204,7 @@
           componentProps: {
             options: getOptionList('editAuth', 1),
             onChange: async (value) => {
+              console.log('onChange', value);
               let params = await getFieldsValue();
               isEdit.value = value.target.value == 0 ? true : false;
               if (value.target.value == 1) {

src/views/productOperation/modal/ryNoSceneModal.vue

@@ -98,11 +98,9 @@
         {
           title: '场景标题',
           dataIndex: 'sceneName',
+          width: 250,
           ellipsis: true,
           slots: { customRender: 'href' },
-          resizable: true,
-          minWidth: 150,
-          width: 150,
         },
         {
           title: '查看权限',
@@ -219,34 +217,34 @@
         numRef.value = data.num;
         console.log('data', caseId.value);
         reload();
-        const { authType } = await getAuthType({ num: numRef.value, caseId: caseId.value });
-        fileFlow.showList = authType ? false : true;
-        type.value = authType;
-        setFieldsValue({
-          type: data.sceneName,
-          authType,
-        });
-        console.log(
-          'roleId',
-          roleId.value,
-          userName.value != data.userName || roleId.value != 1 || roleId.value != 45 || roleId.value != 48,
-        );
-        let disabled = !(
-          userName.value == data.userName ||
-          roleId.value == 1 ||
-          roleId.value == 45 ||
-          roleId.value == 48
-        );
-        updateSchema({
-          field: 'authType',
-          componentProps: {
-            options: [
-              { label: '授权浏览', value: 0, disabled: disabled && authType == 1 },
-              { label: '公开浏览', value: 1, disabled: disabled && authType == 0 },
-            ],
-          },
-        });
-        reload();
+        // const { authType } = await getAuthType({ num: numRef.value, caseId: caseId.value });
+        // fileFlow.showList = authType ? false : true;
+        // type.value = authType;
+        // setFieldsValue({
+        //   type: data.sceneName,
+        //   authType,
+        // });
+        // console.log(
+        //   'roleId',
+        //   roleId.value,
+        //   userName.value != data.userName || roleId.value != 1 || roleId.value != 45 || roleId.value != 48,
+        // );
+        // let disabled = !(
+        //   userName.value == data.userName ||
+        //   roleId.value == 1 ||
+        //   roleId.value == 45 ||
+        //   roleId.value == 48
+        // );
+        // updateSchema({
+        //   field: 'authType',
+        //   componentProps: {
+        //     options: [
+        //       { label: '授权浏览', value: 0, disabled: disabled && authType == 1 },
+        //       { label: '公开浏览', value: 1, disabled: disabled && authType == 0 },
+        //     ],
+        //   },
+        // });
+        // reload();
         // setTimeout(async () => {
         // }, 500);
       }

src/views/statistics/components/props.ts

@@ -13,12 +13,13 @@ export type echartData = {
   downOrder: number[];
   incrementOrder: number[];
   partOrder: number[];
-  nameList?:string[];
-  kjList?:number[];
-  kkList?:number[];
-  ssList?:number[];
-  ssobjList?:number[];
-  echartTypr?:string;
+  nameList?: string[];
+  kjList?: number[];
+  kkList?: number[];
+  ssList?: number[];
+  ssobjList?: number[];
+  yzlList?: number[];
+  echartTypr?: string;
 };
 export const basicProps = {
   width: {

src/views/statistics/components/sceneEchart.vue

@@ -24,9 +24,10 @@
   const ssobjList = ref<number[]>([]);
   const sgList = ref<number[]>([]);
   const sgobjList = ref<number[]>([]);
+  const yzlList = ref<number[]>([]);
   const yixStringData = ref<string[]>([]);
   const echartTypr = ref('line')
-  const nameList = ref<string[]>(['看见场景','看看场景','深时场景','深时obj','深光场景','深光obj']);
+  const nameList = ref<string[]>(['四维看见/Mesh','四维看看/Mesh','四维深时/Mesh','四维深时/点云','四维深光/Mesh','四维深光/点云','圆周率/Mesh']);
   const maxSize = ref(0);
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>)
@@ -38,12 +39,13 @@
     let fileTile = props.title||'订单数据'
     let fields  = {
     'time':'日期',
-    'kj':'看见场景',
-    // 'kk':'看看场景',
-    'ss':'深时场景',
-    'dy':'深时obj',
-    'sg':'深光场景',
-    'sgdy':'深光obj',
+    'kj': nameList.value[0],
+    'kk': nameList.value[1],
+    'ss':nameList.value[2],
+    'dy':nameList.value[3],
+    'sg':nameList.value[4],
+    'sgdy':nameList.value[5],
+    'yzl':nameList.value[6],
     }
     if('场景趋势分析' == fileTile){
       fileTile = `${val && val.value == 0?'新增':'累计'}`+fileTile
@@ -52,11 +54,12 @@
       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,
         'sg':sgList.value && sgList.value[index] || 0,
         'sgdy':sgobjList.value && sgobjList.value[index] || 0,
+        'yzl':yzlList.value && yzlList.value[index] || 0,
       }
     })
     exportElsxFile(data,fields,fileTile)
@@ -95,13 +98,13 @@
           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,
@@ -130,6 +133,13 @@
           barMaxWidth: 80,
           name: nameList.value[5],
         },
+        {
+          data: yzlList.value,
+          type: echartTypr.value,
+          itemStyle: { color: '#00c8af' },
+          barMaxWidth: 80,
+          name: nameList.value[6],
+        },
       ],
     });
   }
@@ -142,6 +152,7 @@
       ssobjList.value = echartData.ssobjList ||[]
       sgList.value = echartData.sgList ||[]
       sgobjList.value = echartData.sgobjList ||[]
+      yzlList.value = echartData.yzlList ||[]
       yixStringData.value = echartData.xdata ||[]
       if(echartData.nameList){
         nameList.value = echartData.nameList

src/views/statistics/scene/index.vue

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