tangning 6 hari lalu
induk
melakukan
0f07da1856

+ 1 - 1
src/router/routes/basic.ts

@@ -20,7 +20,7 @@ export const PAGE_NOT_FOUND_ROUTE: AppRouteRecordRaw = {
   children: [
     {
       path: '/:path(.*)*',
-      name: PAGE_NOT_FOUND_NAME + 's',
+      name: PAGE_NOT_FOUND_NAME,
       component: EXCEPTION_COMPONENT,
       meta: {
         title: 'ErrorPage',

+ 4 - 3
src/views/statistics/components/VisitSource.vue

@@ -40,6 +40,7 @@
   import { basicProps } from './props';
   import { Card, Select, DatePicker } from 'ant-design-vue';
   import { jyScatter } from '/@/api/statistics/index';
+  import dayjs from 'dayjs';
   // import { district } from '/@/views/statistics/scene/data';
   import ApiTreeSelect from '/@/components/Form/src/components/ApiTreeSelect.vue';
   const { RangePicker } = DatePicker;
@@ -59,9 +60,9 @@
   const district = ref(props.district);
   // const jyType = ref(props.jyType);
   const SearchData = ref({
-    timeList: [],
-    jyType: null,
-    districtCode: null,
+    jyType: props.jyType || [],
+    timeList: [dayjs().format('YYYY-MM-DD'), dayjs().add(-30, 'day').format('YYYY-MM-DD')],
+    districtCode: props.districtCode || null,
     cameraType: props.cameraType,
     platformId: props.platformId,
     type: 2,

+ 2 - 2
src/views/statistics/components/lineEcharts2.vue

@@ -72,11 +72,11 @@
   type RangeValue = [Dayjs, Dayjs];
   const picker = ref('date');
   const SearchData = ref({
-    timeList: [],
+    timeList: [dayjs().format('YYYY-MM-DD'), dayjs().add(-30, 'day').format('YYYY-MM-DD')],
     jyType: null,
     platformId: props.platformId,
     cameraType: props.cameraType,
-    districtCode: null,
+    districtCode: props.districtCode || null,
     type: 2,
   });
   const viewStaticsData = ref<number[]>([1, 5, 6, 8, 55, 1, 5, 6, 8, 1]);

+ 2 - 1
src/views/statistics/components/orderEchart.vue

@@ -52,6 +52,7 @@
   import { districtScatter } from '/@/api/statistics/index';
   import ApiTreeSelect from '/@/components/Form/src/components/ApiTreeSelect.vue';
   const { RangePicker } = DatePicker;
+  import dayjs from 'dayjs';
   import { ref, Ref, watch, defineEmits, onMounted } from 'vue';
   // import { district, jyType } from '/@/views/statistics/scene/data';
   import { useECharts } from '/@/hooks/web/useECharts';
@@ -68,7 +69,7 @@
   const chartRef = ref<HTMLDivElement | null>(null);
   const { setOptions } = useECharts(chartRef as Ref<HTMLDivElement>);
   const SearchData = ref({
-    timeList: [],
+    timeList: [dayjs().format('YYYY-MM-DD'), dayjs().add(-30, 'day').format('YYYY-MM-DD')],
     jyType: null,
     districtCode: null,
     cameraType: props.cameraType,

+ 4 - 0
src/views/statistics/components/props.ts

@@ -70,4 +70,8 @@ export const basicProps = {
     type: Array as PropType<any>,
     default: [],
   },
+  districtCode: {
+    type: String,
+    default: '',
+  },
 };

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

@@ -3,7 +3,6 @@
     <div class="home flex justify-between">
       <div class="homeLeft" style="margin-bottom: 10px">
         <Select
-          v-if="getUserInfo.roleId != 47"
           v-model:value="platformId"
           style="width: 100px; margin-right: 15px"
           placeholder="全部平台"
@@ -19,11 +18,11 @@
           :options="options"
           allowClear
           :getPopupContainer="(trigger) => trigger.parentNode"
-          @change="handleChange"
+          @change="handleChanges"
         />
         <span>当前账号采集总数:{{ userCount }} <span v-if="useruploadTime">| 更新于 {{ useruploadTime }}</span></span>
       </div>
-      <div v-if="getUserInfo.roleId != 47" class="homeright">
+      <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 })">
           查询并导出</a-button
         >
@@ -39,6 +38,7 @@
           :cameraType="cameraType"
           :platformId="platformId"
           :options="optionsList"
+          :districtCode="getUserInfo.districtCode"
           name="chartRef2"
           class="md:w-1/2 w-full !md:mt-0 !mt-4 !md:mr-4"
           @export="handleExport"
@@ -51,6 +51,7 @@
           :district="district"
           :platformId="platformId"
           :cameraType="cameraType"
+          :districtCode="getUserInfo.districtCode"
           :jyType="jyType"
           @change="Search"
           :propsData="echartData"
@@ -62,6 +63,7 @@
         :district="district"
         :platformId="platformId"
         :cameraType="cameraType"
+        :districtCode="getUserInfo.districtCode"
         :jyType="jyType"
         :hiddens="pageAuth != 'admin'"
         name="chartRef2"
@@ -294,4 +296,11 @@
     loading1.value += 1;
     getData();
   }
+  function handleChanges(val, item = {}) {
+    console.log('val', val, item);
+    // pageAuth.value = item.pageAuth;
+    // loading1.value += 1;
+    getData();
+  }
+  
 </script>

+ 5 - 0
yarn.lock

@@ -11121,6 +11121,11 @@ vue-demi@*:
   resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.6.tgz"
   integrity sha512-02NYpxgyGE2kKGegRPYlNQSL1UWfA/+JqvzhGCOYjhfbLWXU5QQX0+9pAm/R2sCOPKr5NBxVIab7fvFU0B1RxQ==
 
+vue-demi@^0.14.10:
+  version "0.14.10"
+  resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04"
+  integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==
+
 vue-eslint-parser@^8.0.1:
   version "8.3.0"
   resolved "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz"