Merge branch 'sqy_dev' into 'main'

'fix:优化未查到数据界面，修复用户详情404问题,改为静态路由,首页增加过滤时间'

See merge request huang/yun-teng-iot-front!83

@@ -16,11 +16,11 @@ VITE_BUILD_COMPRESS = 'gzip'
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 
 # Basic interface address SPA
 # Basic interface address SPA
-VITE_GLOB_API_URL=http://localhost:8080/api
+VITE_GLOB_API_URL=http://101.133.234.90:8080/api
 
 
 # File upload address， optional
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=http://localhost:8080/upload
+VITE_GLOB_UPLOAD_URL=http://101.133.234.90:8080/upload
 
 
 # Interface prefix
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=/yt
 VITE_GLOB_API_URL_PREFIX=/yt

@@ -158,10 +158,10 @@ export const dispatchCustomer = (data) => {
 };
 };
 // 取消分配客户
 // 取消分配客户
 export const cancelDispatchCustomer = (data) => {
 export const cancelDispatchCustomer = (data) => {
-  const { customerId, tbDeviceId } = data;
+  const { tbDeviceId } = data;
   return defHttp.delete(
   return defHttp.delete(
     {
     {
-      url: `/customer/${customerId}/device/${tbDeviceId}`,
+      url: `/customer/device/${tbDeviceId}`,
     },
     },
     {
     {
       joinPrefix: false,
       joinPrefix: false,

@@ -14,8 +14,9 @@ import { setupStore } from '/@/store';
 import { setupGlobDirectives } from '/@/directives';
 import { setupGlobDirectives } from '/@/directives';
 import { setupI18n } from '/@/locales/setupI18n';
 import { setupI18n } from '/@/locales/setupI18n';
 import { registerGlobComp } from '/@/components/registerGlobComp';
 import { registerGlobComp } from '/@/components/registerGlobComp';
-import 'ant-design-vue/dist/antd.less';
-
+if (import.meta.env.DEV) {
+  import('ant-design-vue/dist/antd.less');
+}
 async function bootstrap() {
 async function bootstrap() {
   const app = createApp(App);
   const app = createApp(App);
 
 

@@ -76,31 +76,3 @@ export const ERROR_LOG_ROUTE: AppRouteRecordRaw = {
     },
     },
   ],
   ],
 };
 };
-
-// export const UPDATE_SYSTEM_PASSWORD: AppRouteRecordRaw = {
-//   path: '/system',
-//   name: 'routes.common.system.system',
-//   component: LAYOUT,
-//   redirect: '/system/systemManagement',
-//   meta: {
-//     icon: 'bx:bx-home',
-//     title: 'routes.common.system.system',
-//     status: '0',
-//     menuType: '0',
-//   },
-//   children: [
-//     {
-//       path: '/system/password',
-//       name: 'routes.common.system.modifyPassword',
-//       component: () => import('/@/views/system/password/index.vue'),
-//       meta: {
-//         icon: 'bx:bx-home',
-//         title: 'routes.common.system.modifyPassword',
-//         menuType: '1',
-//         ignoreKeepAlive: true,
-//         hideMenu: false,
-//         status: '0',
-//       },
-//     },
-//   ],
-// };

@@ -3,6 +3,7 @@ import { PAGE_NOT_FOUND_ROUTE, REDIRECT_ROUTE } from '/@/router/routes/basic';
 import { mainOutRoutes } from './mainOut';
 import { mainOutRoutes } from './mainOut';
 import { PageEnum } from '/@/enums/pageEnum';
 import { PageEnum } from '/@/enums/pageEnum';
 import { t } from '/@/hooks/web/useI18n';
 import { t } from '/@/hooks/web/useI18n';
+import { LAYOUT } from '../constant';
 
 
 const modules = import.meta.globEager('./modules/**/*.ts');
 const modules = import.meta.globEager('./modules/**/*.ts');
 const routeModuleList: AppRouteModule[] = [];
 const routeModuleList: AppRouteModule[] = [];
@@ -30,10 +31,33 @@ export const LoginRoute: AppRouteRecordRaw = {
   },
   },
 };
 };
 
 
+// 用户详情静态路由
+export const AccountDetail: AppRouteRecordRaw = {
+  path: '/system',
+  name: '系统管理',
+  component: LAYOUT,
+  meta: {
+    title: '系统管理',
+    hideBreadcrumb: true,
+    hideChildrenInMenu: true,
+  },
+  children: [
+    {
+      path: 'account_detail/:id',
+      name: 'Account_Detail',
+      component: () => import('/@/views/system/account/AccountDetail.vue'),
+      meta: {
+        title: '用户详情',
+      },
+    },
+  ],
+};
+
 // Basic routing without permission
 // Basic routing without permission
 export const basicRoutes = [
 export const basicRoutes = [
   LoginRoute,
   LoginRoute,
   RootRoute,
   RootRoute,
+  AccountDetail,
   ...mainOutRoutes,
   ...mainOutRoutes,
   REDIRECT_ROUTE,
   REDIRECT_ROUTE,
   PAGE_NOT_FOUND_ROUTE,
   PAGE_NOT_FOUND_ROUTE,

-// import type { AppRouteModule } from '/@/router/types';
-
-// import { LAYOUT } from '/@/router/constant';
-// import { t } from '/@/hooks/web/useI18n';
-
-// const dashboard: AppRouteModule = {
-//   path: '/about',
-//   name: 'About',
-//   component: LAYOUT,
-//   redirect: '/about/index',
-//   meta: {
-//     hideChildrenInMenu: true,
-//     icon: 'simple-icons:about-dot-me',
-//     title: t('routes.dashboard.about'),
-//     orderNo: 100000,
-//   },
-//   children: [
-//     {
-//       path: 'index',
-//       name: 'AboutPage',
-//       component: () => import('/@/views/sys/about/index.vue'),
-//       meta: {
-//         title: t('routes.dashboard.about'),
-//         icon: 'simple-icons:about-dot-me',
-//         hideMenu: true,
-//       },
-//     },
-//   ],
-// };
-
-// export default dashboard;

-// import type { AppRouteModule } from '/@/router/types';
-
-// import { LAYOUT } from '/@/router/constant';
-// import { t } from '/@/hooks/web/useI18n';
-
-// const dashboard: AppRouteModule = {
-//   path: '/dashboard',
-//   name: 'Dashboard',
-//   component: LAYOUT,
-//   redirect: '/dashboard/analysis',
-//   meta: {
-//     orderNo: 10,
-//     icon: 'ion:grid-outline',
-//     title: t('routes.dashboard.dashboard'),
-//   },
-//   children: [
-//     {
-//       path: 'analysis',
-//       name: 'Analysis',
-//       component: () => import('/@/views/dashboard/analysis/index.vue'),
-//       meta: {
-//         // affix: true,
-//         title: t('routes.dashboard.analysis'),
-//       },
-//     },
-//     {
-//       path: 'workbench',
-//       name: 'Workbench',
-//       component: () => import('/@/views/dashboard/workbench/index.vue'),
-//       meta: {
-//         title: t('routes.dashboard.workbench'),
-//       },
-//     },
-//   ],
-// };
-
-// export default dashboard;

@@ -34,13 +34,7 @@
       :canFullscreen="false"
       :canFullscreen="false"
     >
     >
       <BasicForm @register="registerForm" />
       <BasicForm @register="registerForm" />
-      <Alert
-        v-if="!isNull"
-        message="当前时间节点暂无历史数据"
-        description="请尝试选择其他时间段查询历史数据"
-        type="warning"
-        show-icon
-      />
+      <Empty v-if="!isNull" />
       <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"></div>
       <div v-show="isNull" ref="chartRef" :style="{ height: '600px', width }"></div>
     </BasicModal>
     </BasicModal>
     <DeviceDetailDrawer @register="registerDetailDrawer" />
     <DeviceDetailDrawer @register="registerDetailDrawer" />
@@ -52,7 +46,7 @@
   import { formSchema, columns } from './config.data';
   import { formSchema, columns } from './config.data';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicTable, useTable } from '/@/components/Table';
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
   import { devicePage } from '/@/api/alarm/contact/alarmContact';
-  import { Tag, Alert } from 'ant-design-vue';
+  import { Tag, Empty } from 'ant-design-vue';
   import { DeviceState } from '/@/api/device/model/deviceModel';
   import { DeviceState } from '/@/api/device/model/deviceModel';
   import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   import { BAI_DU_MAP_URL } from '/@/utils/fnUtils';
   import { useModal, BasicModal } from '/@/components/Modal';
   import { useModal, BasicModal } from '/@/components/Modal';
@@ -72,7 +66,7 @@
     components: {
     components: {
       BasicTable,
       BasicTable,
       Tag,
       Tag,
-      Alert,
+      Empty,
       BasicModal,
       BasicModal,
       BasicForm,
       BasicForm,
       DeviceDetailDrawer,
       DeviceDetailDrawer,

@@ -27,12 +27,46 @@
       <VisitAnalysisBar :dataPointList="state.dataPointList" :messageList="state.messageList" />
       <VisitAnalysisBar :dataPointList="state.dataPointList" :messageList="state.messageList" />
     </div>
     </div>
   </Card>
   </Card>
-  <Card v-bind="$attrs" v-if="isAdmin(role)" title="租户趋势">
-    <TenantTrend />
-  </Card>
-  <Card v-bind="$attrs" v-if="isAdmin(role)" title="客户趋势">
-    <CustomerTrend />
-  </Card>
+  <div v-if="isAdmin(role)">
+    <Card v-bind="$attrs" title="租户趋势">
+      <template #extra>
+        <div class="extra-date">
+          <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
+            <span
+              @click="quickQueryTenantOrCustomerTime(index, item.value, 'tenant')"
+              :class="{ active: index === activeTenantIndex }"
+              >{{ item.label }}</span
+            >
+          </template>
+          <DatePicker.RangePicker
+            @change="onDateTenantChange"
+            size="small"
+            v-model:value="tenantDateValue"
+          />
+        </div>
+      </template>
+      <TenantTrend />
+    </Card>
+    <Card v-bind="$attrs" title="客户趋势">
+      <template #extra>
+        <div class="extra-date">
+          <template v-for="(item, index) in TenantOrCustomerDateList" :key="item.value">
+            <span
+              @click="quickQueryTenantOrCustomerTime(index, item.value, 'customer')"
+              :class="{ active: index === activeCustomerIndex }"
+              >{{ item.label }}</span
+            >
+          </template>
+          <DatePicker.RangePicker
+            @change="onDateCustomerChange"
+            size="small"
+            v-model:value="customerDateValue"
+          />
+        </div>
+      </template>
+      <CustomerTrend />
+    </Card>
+  </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ref, reactive } from 'vue';
   import { ref, reactive } from 'vue';
@@ -42,11 +76,12 @@
   import { isAdmin } from '/@/enums/roleEnum';
   import { isAdmin } from '/@/enums/roleEnum';
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
-  import CustomerTrend from './CustomerTrend.vue';
-  import TenantTrend from './TenantTrend.vue';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { formatToDateTime } from '/@/utils/dateUtil';
   import { getEntitiesId } from '/@/api/dashboard/index';
   import { getEntitiesId } from '/@/api/dashboard/index';
+  import CustomerTrend from './CustomerTrend.vue';
+  import TenantTrend from './TenantTrend.vue';
+  import { useDate } from '../hooks/useDate';
   defineExpose({
   defineExpose({
     isAdmin,
     isAdmin,
   });
   });
@@ -75,6 +110,7 @@
     { label: '7天', value: 604800000 },
     { label: '7天', value: 604800000 },
     { label: '30天', value: 2592000000 },
     { label: '30天', value: 2592000000 },
   ]);
   ]);
+
   // web Socket
   // web Socket
   const token: string = getAuthCache(JWT_TOKEN_KEY);
   const token: string = getAuthCache(JWT_TOKEN_KEY);
   const state = reactive({
   const state = reactive({
@@ -342,6 +378,17 @@
 
 
     console.log(JSON.parse(sendValue), '----interval', state.alarmList);
     console.log(JSON.parse(sendValue), '----interval', state.alarmList);
   }
   }
+
+  const {
+    tenantDateValue,
+    customerDateValue,
+    activeTenantIndex,
+    activeCustomerIndex,
+    TenantOrCustomerDateList,
+    quickQueryTenantOrCustomerTime,
+    onDateTenantChange,
+    onDateCustomerChange,
+  } = useDate();
 </script>
 </script>
 
 
 <style lang="less">
 <style lang="less">

@@ -2,13 +2,13 @@
   <div>
   <div>
     <p class="center">告警数</p>
     <p class="center">告警数</p>
     <div ref="chartRef" :style="{ height, width }" v-show="alarmList.length"></div>
     <div ref="chartRef" :style="{ height, width }" v-show="alarmList.length"></div>
-    <div v-show="!alarmList.length">暂无数据</div>
+    <div v-show="!alarmList.length"><Empty /></div>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { onMounted, ref, Ref, withDefaults, watch } from 'vue';
   import { onMounted, ref, Ref, withDefaults, watch } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
   import { useECharts } from '/@/hooks/web/useECharts';
-
+  import { Empty } from 'ant-design-vue';
   interface Props {
   interface Props {
     width?: string;
     width?: string;
     height?: string;
     height?: string;

@@ -2,12 +2,13 @@
   <div>
   <div>
     <p class="center">消息量</p>
     <p class="center">消息量</p>
     <div ref="chartRef" :style="{ height, width }" v-show="dataPointList.length"></div>
     <div ref="chartRef" :style="{ height, width }" v-show="dataPointList.length"></div>
-    <div v-show="!dataPointList.length">暂无数据</div>
+    <div v-show="!dataPointList.length"><Empty /></div>
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { ref, Ref, watch, withDefaults } from 'vue';
   import { ref, Ref, watch, withDefaults } from 'vue';
   import { useECharts } from '/@/hooks/web/useECharts';
   import { useECharts } from '/@/hooks/web/useECharts';
+  import { Empty } from 'ant-design-vue';
   type DataItem = [number, string];
   type DataItem = [number, string];
   interface Props {
   interface Props {
     width?: string;
     width?: string;

+import { ref } from 'vue';
+export function useDate() {
+  const tenantDateValue = ref([]);
+  const customerDateValue = ref([]);
+  const activeTenantIndex = ref(0);
+  const activeCustomerIndex = ref(0);
+  const TenantOrCustomerDateList = ref([
+    { label: '30天', value: 2592000000 },
+    { label: '最近三个月', value: 7776000000 },
+    { label: '最近一年', value: 31536000000 },
+  ]);
+
+  // 租户趋势和客户趋势快速选择时间
+  function quickQueryTenantOrCustomerTime(
+    index: number,
+    value: number,
+    flag: 'tenant' | 'customer'
+  ) {
+    if (flag === 'tenant') {
+      if (activeTenantIndex.value === index) return;
+      activeTenantIndex.value = index;
+      tenantDateValue.value = [];
+      console.log(value);
+    } else {
+      if (activeCustomerIndex.value === index) return;
+      activeCustomerIndex.value = index;
+      customerDateValue.value = [];
+      console.log(value);
+    }
+  }
+  // 租户选择日期
+  function onDateTenantChange(_, dateString) {
+    activeTenantIndex.value = -1;
+    console.log(dateString);
+  }
+  // 客户趋势选择日期
+  function onDateCustomerChange(_, dateString) {
+    activeCustomerIndex.value = -1;
+    console.log(dateString);
+  }
+  return {
+    tenantDateValue,
+    customerDateValue,
+    activeTenantIndex,
+    activeCustomerIndex,
+    TenantOrCustomerDateList,
+    quickQueryTenantOrCustomerTime,
+    onDateTenantChange,
+    onDateCustomerChange,
+  };
+}

@@ -52,17 +52,17 @@
             :actions="[
             :actions="[
               record.customerId
               record.customerId
                 ? {
                 ? {
-                    tooltip: '取消分配给客户',
+                    label: '取消分配',
                     icon: 'mdi:account-arrow-left',
                     icon: 'mdi:account-arrow-left',
                     ifShow: authBtn(role),
                     ifShow: authBtn(role),
                     popConfirm: {
                     popConfirm: {
-                      title: '是否取消分配给客户',
+                      title: '是否取消分配客户',
                       confirm: handleCancelDispatchCustomer.bind(null, record),
                       confirm: handleCancelDispatchCustomer.bind(null, record),
                     },
                     },
                   }
                   }
                 : {
                 : {
+                    label: '分配客户',
                     icon: 'mdi:account-arrow-right',
                     icon: 'mdi:account-arrow-right',
-                    tooltip: '分配给客户',
                     ifShow: authBtn(role),
                     ifShow: authBtn(role),
                     onClick: handleDispatchCustomer.bind(null, record),
                     onClick: handleDispatchCustomer.bind(null, record),
                   },
                   },
@@ -156,7 +156,7 @@
         showIndexColumn: false,
         showIndexColumn: false,
         searchInfo: searchInfo,
         searchInfo: searchInfo,
         actionColumn: {
         actionColumn: {
-          width: 250,
+          width: 300,
           title: '操作',
           title: '操作',
           dataIndex: 'action',
           dataIndex: 'action',
           slots: { customRender: 'action' },
           slots: { customRender: 'action' },
@@ -179,7 +179,7 @@
       // 取消分配客户
       // 取消分配客户
       async function handleCancelDispatchCustomer(record: Recordable) {
       async function handleCancelDispatchCustomer(record: Recordable) {
         console.log('record', record);
         console.log('record', record);
-        await cancelDispatchCustomer({ ...record, customerId: '' });
+        await cancelDispatchCustomer(record);
         handleSuccess();
         handleSuccess();
       }
       }