1

src/api/statistics/index.ts

@@ -169,7 +169,6 @@ export const jyScatter = (params) =>
       ignoreCancelToken: true,
     },
     params,
-    data: params,
   });
 export const districtScatter = (params) =>
   defHttp.post<Result>({
@@ -179,7 +178,6 @@ export const districtScatter = (params) =>
       ignoreCancelToken: true,
     },
     params,
-    data: params,
   });
 
 export const sceneTrend = (params) =>

src/views/productOperation/modal/uploadModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="原始数据上传"
+    title="上传"
     :showCancelBtn="false"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
@@ -35,9 +35,7 @@
         </template>
       </BasicForm>
       <div v-if="fileFlow.list.length == 0" style="padding-left: 83px">
-        <span v-if="fileFlow.sourceType == 'orig'"
-          >注‌支持采集完成后，导出的场景原始数据上传。</span
-        >
+        <span v-if="fileFlow.sourceType == 'orig'" >‌支持采集完成后，U 盘导出的场景原始数据上传计算。</span>
         <div style="width: 360px" v-else>
           <div>重要提醒：</div>
           <div>数据上传规则‌：只接收‌其他单位/部门私有化部署的系统‌（比如XX分局自建的平台）下载的数据，本平台已有的场景‌‌不能重复上传‌；</div>
@@ -108,7 +106,7 @@
           field: 'filePath',
           component: 'Upload',
           slot: 'elupload',
-          label: t('routes.product.file'),
+          label: '操作',
           required: true,
           rules: [{ required: true, validator: valiFile, trigger: 'change' }],
           // helpMessage: t('routes.corporation.uploadHelp'),
@@ -134,6 +132,7 @@
 
       function onDataReceive(data) {
         modelRef.value = data;
+        fileFlow.list = [];
         resetFields();
         // setFieldsValue({
         //   type: data.sceneName,
@@ -228,6 +227,7 @@
           closeModal();
           resetFields();
           createMessage.success('上传成功。');
+          fileFlow.list = [];
           emit('update');
         } catch (error) {
           loading.value = false;

src/views/statistics/components/orderEchart.vue

@@ -71,8 +71,8 @@
   const SearchData = ref({
     timeList: [dayjs().format('YYYY-MM-DD'), dayjs().add(-30, 'day').format('YYYY-MM-DD')],
     jyType: null,
-    districtCode: null,
     cameraType: props.cameraType,
+    districtCode: props.districtCode || null,
     platformId: props.platformId,
     type: 2,
   });

src/views/statistics/scene/index.vue

@@ -3,6 +3,7 @@
     <div class="home flex justify-between">
       <div class="homeLeft" style="margin-bottom: 10px">
         <Select
+          v-if="platformOptions && platformOptions.length > 1"
           v-model:value="platformId"
           style="width: 100px; margin-right: 15px"
           placeholder="全部平台"
@@ -20,7 +21,10 @@
           :getPopupContainer="(trigger) => trigger.parentNode"
           @change="handleChanges"
         />
-        <span>当前账号采集总数：{{ userCount }} <span v-if="useruploadTime">| 更新于 {{ useruploadTime }}</span></span>
+        <span>
+          <span v-if="pageAuth != 'admin'">当前账号采集总数：{{ userCount }} |</span>
+          <span v-if="useruploadTime"> 更新于 {{ useruploadTime }}</span>
+        </span>
       </div>
       <div v-if="getUserInfo.platformId == platformId && pageAuth == 'admin' && getUserInfo.roleId != 47 && getUserInfo.roleId != 1" class="homeright">
         <a-button style="margin-right: 15px" type="primary" @click="openModal(true, { district, jyType, platformId })">
@@ -76,6 +80,7 @@
         v-if="pageAuth == 'admin'"
         title="地区分布"
         :district="district"
+        :districtCode="getUserInfo.districtCode"
         :platformId="platformId"
         :cameraType="cameraType"
         :jyType="jyType"