Commit 737a69329411e9db8d0f8008c38e919e185b3b59

Authored by sqy
1 parent cb89b20c

'fix:将分析页代码与工作台互换'

Showing 17 changed files with 79 additions and 79 deletions
src/views/dashboard/analysis/components/DynamicInfo.vue renamed from src/views/dashboard/workbench/components/DynamicInfo.vue
src/views/dashboard/analysis/components/ProjectCard.vue renamed from src/views/dashboard/workbench/components/ProjectCard.vue
src/views/dashboard/analysis/components/QuickNav.vue renamed from src/views/dashboard/workbench/components/QuickNav.vue
src/views/dashboard/analysis/components/SaleRadar.vue renamed from src/views/dashboard/workbench/components/SaleRadar.vue
src/views/dashboard/analysis/components/WorkbenchHeader.vue renamed from src/views/dashboard/workbench/components/WorkbenchHeader.vue
src/views/dashboard/analysis/components/data.ts renamed from src/views/dashboard/workbench/components/data.ts
1 1 <template>
2   - <div class="p-4 md:flex">
3   - <div class="md:w-7/10 w-full !mr-4 enter-y">
4   - <GrowCard :loading="loading" class="enter-y" />
5   - <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
6   - <div class="md:flex enter-y">
7   - <Card title="核心流程指南" style="width: 100%">
8   - <img alt="核心流程指南" src="../../../assets/images/flow.png" />
  2 + <PageWrapper>
  3 + <template #headerContent> <WorkbenchHeader /> </template>
  4 + <div class="lg:flex">
  5 + <div class="lg:w-7/10 w-full !mr-4 enter-y">
  6 + <ProjectCard :loading="loading" class="enter-y" />
  7 + <DynamicInfo :loading="loading" class="!my-4 enter-y" />
  8 + </div>
  9 + <div class="lg:w-3/10 w-full enter-y">
  10 + <QuickNav :loading="loading" class="enter-y" />
  11 +
  12 + <Card class="!my-4 enter-y" :loading="loading">
  13 + <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
9 14 </Card>
  15 +
  16 + <SaleRadar :loading="loading" class="enter-y" />
10 17 </div>
11 18 </div>
12   - <div class="md:w-3/10 w-full enter-y">
13   - <HelpDoc />
14   - </div>
15   - </div>
  19 + <BasicModal
  20 + @register="register"
  21 + v-bind="$attrs"
  22 + :mask="true"
  23 + :showCancelBtn="false"
  24 + :showOkBtn="false"
  25 + :canFullscreen="false"
  26 + :closable="false"
  27 + :maskStyle="maskColor"
  28 + :height="600"
  29 + :width="1500"
  30 + :maskClosable="false"
  31 + title="请修改密码"
  32 + :helpMessage="['请您修改密码']"
  33 + >
  34 + <PasswordDialog />
  35 + </BasicModal>
  36 + </PageWrapper>
16 37 </template>
17 38 <script lang="ts" setup>
18   - import { ref } from 'vue';
19   - import GrowCard from './components/GrowCard.vue';
20   - import SiteAnalysis from './components/SiteAnalysis.vue';
  39 + import PasswordDialog from '/@/views/system/password/index.vue';
  40 + import { BasicModal, useModal } from '/@/components/Modal';
  41 + import { getAuthCache } from '/@/utils/auth';
  42 + import { USER_INFO_KEY } from '/@/enums/cacheEnum';
  43 + import { ref, onMounted } from 'vue';
21 44 import { Card } from 'ant-design-vue';
22   - import HelpDoc from './components/HelpDoc.vue';
23   - const loading = ref(true);
  45 + import { PageWrapper } from '/@/components/Page';
  46 + import WorkbenchHeader from './components/WorkbenchHeader.vue';
  47 + import ProjectCard from './components/ProjectCard.vue';
  48 + import QuickNav from './components/QuickNav.vue';
  49 + import DynamicInfo from './components/DynamicInfo.vue';
  50 + import SaleRadar from './components/SaleRadar.vue';
  51 +
  52 + const maskColor = ref({ backgroundColor: 'grey' });
  53 + const statusModel = ref(false);
  54 + const [register, { openModal }] = useModal();
  55 + onMounted(() => {
  56 + const userInfo: object = getAuthCache(USER_INFO_KEY);
  57 + if (userInfo.needSetPwd == true) {
  58 + statusModel.value = true;
  59 + openModal(statusModel.value);
  60 + } else if (userInfo.needSetPwd == false) {
  61 + openModal(statusModel.value);
  62 + }
  63 + });
  64 + //Yunteng123456!!!
  65 + //Password123456!
  66 + //System123456!
  67 + //Testrole123456!
  68 + const loading = ref(false);
24 69 setTimeout(() => {
25 70 loading.value = false;
26 71 }, 1500);
... ...
src/views/dashboard/workbench/components/GrowCard.vue renamed from src/views/dashboard/analysis/components/GrowCard.vue
src/views/dashboard/workbench/components/HelpDoc.vue renamed from src/views/dashboard/analysis/components/HelpDoc.vue
src/views/dashboard/workbench/components/SiteAnalysis.vue renamed from src/views/dashboard/analysis/components/SiteAnalysis.vue
src/views/dashboard/workbench/components/VisitAnalysis.vue renamed from src/views/dashboard/analysis/components/VisitAnalysis.vue
src/views/dashboard/workbench/components/VisitAnalysisBar.vue renamed from src/views/dashboard/analysis/components/VisitAnalysisBar.vue
src/views/dashboard/workbench/components/props.ts renamed from src/views/dashboard/analysis/components/props.ts
src/views/dashboard/workbench/data.ts renamed from src/views/dashboard/analysis/data.ts
1 1 <template>
2   - <PageWrapper>
3   - <template #headerContent> <WorkbenchHeader /> </template>
4   - <div class="lg:flex">
5   - <div class="lg:w-7/10 w-full !mr-4 enter-y">
6   - <ProjectCard :loading="loading" class="enter-y" />
7   - <DynamicInfo :loading="loading" class="!my-4 enter-y" />
8   - </div>
9   - <div class="lg:w-3/10 w-full enter-y">
10   - <QuickNav :loading="loading" class="enter-y" />
11   -
12   - <Card class="!my-4 enter-y" :loading="loading">
13   - <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
  2 + <div class="p-4 md:flex">
  3 + <div class="md:w-7/10 w-full !mr-4 enter-y">
  4 + <GrowCard :loading="loading" class="enter-y" />
  5 + <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
  6 + <div class="md:flex enter-y">
  7 + <Card title="核心流程指南" style="width: 100%">
  8 + <img alt="核心流程指南" src="../../../assets/images/flow.png" />
14 9 </Card>
15   -
16   - <SaleRadar :loading="loading" class="enter-y" />
17 10 </div>
18 11 </div>
19   - <BasicModal
20   - @register="register"
21   - v-bind="$attrs"
22   - :mask="true"
23   - :showCancelBtn="false"
24   - :showOkBtn="false"
25   - :canFullscreen="false"
26   - :closable="false"
27   - :maskStyle="maskColor"
28   - :height="600"
29   - :width="1500"
30   - :maskClosable="false"
31   - title="请修改密码"
32   - :helpMessage="['请您修改密码']"
33   - >
34   - <PasswordDialog />
35   - </BasicModal>
36   - </PageWrapper>
  12 + <div class="md:w-3/10 w-full enter-y">
  13 + <HelpDoc />
  14 + </div>
  15 + </div>
37 16 </template>
38 17 <script lang="ts" setup>
39   - import PasswordDialog from '/@/views/system/password/index.vue';
40   - import { BasicModal, useModal } from '/@/components/Modal';
41   - import { getAuthCache } from '/@/utils/auth';
42   - import { USER_INFO_KEY } from '/@/enums/cacheEnum';
43   - import { ref, onMounted } from 'vue';
  18 + import { ref } from 'vue';
  19 + import GrowCard from './components/GrowCard.vue';
  20 + import SiteAnalysis from './components/SiteAnalysis.vue';
44 21 import { Card } from 'ant-design-vue';
45   - import { PageWrapper } from '/@/components/Page';
46   - import WorkbenchHeader from './components/WorkbenchHeader.vue';
47   - import ProjectCard from './components/ProjectCard.vue';
48   - import QuickNav from './components/QuickNav.vue';
49   - import DynamicInfo from './components/DynamicInfo.vue';
50   - import SaleRadar from './components/SaleRadar.vue';
51   -
52   - const maskColor = ref({ backgroundColor: 'grey' });
53   - const statusModel = ref(false);
54   - const [register, { openModal }] = useModal();
55   - onMounted(() => {
56   - const userInfo: object = getAuthCache(USER_INFO_KEY);
57   - if (userInfo.needSetPwd == true) {
58   - statusModel.value = true;
59   - openModal(statusModel.value);
60   - } else if (userInfo.needSetPwd == false) {
61   - openModal(statusModel.value);
62   - }
63   - });
64   - //Yunteng123456!!!
65   - //Password123456!
66   - //System123456!
67   - //Testrole123456!
68   - const loading = ref(false);
  22 + import HelpDoc from './components/HelpDoc.vue';
  23 + const loading = ref(true);
69 24 setTimeout(() => {
70 25 loading.value = false;
71 26 }, 1500);
... ...
... ... @@ -140,7 +140,7 @@
140 140 }
141 141
142 142 function goLogin() {
143   - userStore.logout(true);
  143 + userStore.logout();
144 144 lockStore.resetLockInfo();
145 145 }
146 146
... ...
... ... @@ -44,7 +44,7 @@
44 44 </ARow>
45 45 <ARow class="enter-x">
46 46 <ACol :span="12">
47   - <FormItem> </FormItem>
  47 + <FormItem />
48 48 </ACol>
49 49 <ACol :span="12">
50 50 <FormItem :style="{ 'text-align': 'right' }">
... ...