修改

prod.config.js

@@ -9,7 +9,7 @@ const externals = isProd
       vuex: "Vuex",
       "vue-router": "VueRouter",
       axios: "axios",
-      clipboard: "Clipboard",
+      //clipboard: "Clipboard",
     }
   : {};
 
@@ -79,11 +79,11 @@ const cdns = {
   build: {
     css: [],
     js: [
-      `${ossCDN}/library/vue.3.0.0.min.js`,
+      `${ossCDN}/library/vue.next.min.js`,
       `${ossCDN}/library/vuex.next.min.js`,
       `${ossCDN}/library/vue-router.next.min.js`,
       `${ossCDN}/library/axios.min.js`,
-      `${ossCDN}/library/clipboard.min.js`,
+      //`${ossCDN}/library/clipboard.min.js`,
     ],
   },
 };

src/layout/components/AppHeader.vue

@@ -1,6 +1,6 @@
 <template>
   <a-layout-header class="web-header">
-    <p class="title-font web-title">{{title}}</p>
+    <p class="title-font web-title">{{ title }}</p>
     <!-- logo -->
     <!-- <router-link to="/"
                  custom
@@ -14,8 +14,17 @@
     <!-- 站点搜索/添加 -->
     <!-- <app-header-channel v-model:channel="current_site" /> -->
     <!-- 用户操作 -->
-    <app-header-user v-if="user"
-                     :name="user" />
+    <menu-unfold-outlined
+      v-if="collapsed"
+      class="trigger"
+      @click="changeType"
+    />
+    <menu-fold-outlined
+      v-else
+      class="trigger"
+      @click="changeType"
+    />
+    <app-header-user v-if="user" :name="user" />
   </a-layout-header>
 </template>
 
@@ -25,11 +34,14 @@ import { computed, defineComponent, reactive, ref, toRefs } from "vue";
 
 import AppHeaderChannel from "./AppHeaderChannel.vue";
 import AppHeaderUser from "./AppHeaderUser.vue";
-
+import { MenuUnfoldOutlined, MenuFoldOutlined } from "@ant-design/icons-vue";
+import { MutationType } from "@/store/modules/app/_type";
 const AppHeader = defineComponent({
   components: {
     AppHeaderChannel,
     AppHeaderUser,
+    MenuUnfoldOutlined,
+    MenuFoldOutlined,
   },
   setup() {
     const { store } = useApp();
@@ -37,10 +49,17 @@ const AppHeader = defineComponent({
     const data = reactive({
       user: computed(() => store.getters.user.nickname),
       title: computed(() => store.getters.pageTitle),
+      collapsed: false,
     });
 
+    const changeType = () => {
+      data.collapsed = !data.collapsed;
+      store.commit(MutationType.setCollapsed, data.collapsed);
+    };
+
     return {
       ...toRefs(data),
+      changeType,
     };
   },
 });

src/layout/components/AppSubMenu.vue

@@ -6,7 +6,7 @@
       >
     </template>
     <template v-for="child in menus.children">
-      <template v-if="child.children">
+      <template v-if="child.children && !child.meta.noMenu">
         <app-sub-menu
           :menus="child"
           :parent-path="formatRoutes(child.path, parentPath)"

src/layout/index.vue

@@ -34,10 +34,11 @@
                 v-slot="{ navigate }"
               >
                 <a-menu-item>
-                  <span @click.stop="navigate"
+                  <p @click.stop="navigate"><span
                     ><component :is="route.icon" />
                     <span>{{ route.meta.title }}</span></span
-                  >
+                  ></p>
+                  
                 </a-menu-item>
               </router-link>
             </template>
@@ -86,7 +87,7 @@ const LayoutComponent = defineComponent({
     const data = reactive({
       navRoutes: computed(() => store.getters.permissionRoutes),
       roles: computed(() => store.getters.userRoles),
-      collapsed: true,
+      collapsed: computed(() => store.getters.collapsed),
       menuActive: computed(() => {
         const {
           meta: { activeMenu },
@@ -121,15 +122,11 @@ const LayoutComponent = defineComponent({
       return openKeys;
     };
     const openKeys = ref(onCalcOpenKeys());
-    const toggleCollapsed = () => {
-      data.collapsed = !data.collapsed;
-    };
     return {
       ...toRefs(data),
       openKeys,
       filterRoutes,
       formatRoutes,
-      toggleCollapsed,
     };
   },
 });

src/plugins/vue-clipboard.ts

@@ -27,7 +27,6 @@ const $copyText = (
     });
 
     clipboard.on(status.success, (e: ClipboardJS.Event) => {
-     
       clipboard.destroy();
       resolve(e);
     });
@@ -57,7 +56,6 @@ const bind = (
       action: () => (binding.arg === "cut" ? "cut" : "copy"),
       container: VueClipboardConfig.autoSetContainer ? el : undefined,
     });
-
     clipboard.on(status.success, (e) => {
       const cb = el._vClipboard_success;
       cb && cb(e);

src/router/async.ts

@@ -3,7 +3,7 @@ import { RouteConfig } from "@/types/route";
 export const AccountManager: RouteConfig = {
   name: "AccountManager",
   path: "/account",
-  icon:'ProjectOutlined',
+  icon: "ProjectOutlined",
   meta: {
     title: "公众号管理",
   },
@@ -28,7 +28,6 @@ const PutAdAccount: RouteConfig = {
   component: () => import("@/views/put/put-ad-account.vue"),
 };
 
-
 const PutData: RouteConfig = {
   name: "PutData",
   path: "data",
@@ -58,11 +57,12 @@ const PutDataMore: RouteConfig = {
   component: () => import("@/views/put/put-data-more.vue"),
 };
 
- const PutAdGroup: RouteConfig = {
+const PutAdGroup: RouteConfig = {
   name: "PutAdGroup",
   path: "/put/datas/group",
   meta: {
     title: "广告组数据",
+    activeMenu: "/put/datas",
   },
   component: () => import("@/views/put/ad-group.vue"),
 };
@@ -72,34 +72,36 @@ const PutAdAcountL: RouteConfig = {
   path: "/put/datas/count",
   meta: {
     title: "广告账号数据",
+    activeMenu: "/put/datas",
   },
   component: () => import("@/views/put/ad-countdata.vue"),
 };
 
- const PutAdPlan: RouteConfig = {
+const PutAdPlan: RouteConfig = {
   name: "PutAdPlan",
   path: "/put/datas/ad-plan",
   meta: {
     title: "广告计划数据",
+    activeMenu: "/put/datas",
   },
   component: () => import("@/views/put/put-ad-plan.vue"),
 };
 
-
 export const PutDataTab: RouteConfig = {
   name: "PutDataTab",
   path: "/put/datas",
   meta: {
     title: "广告数据",
+    noMenu: true,
   },
-  children: [PutAdAcountL,PutAdGroup,PutAdPlan],
+  children: [PutAdAcountL, PutAdGroup, PutAdPlan],
   component: () => import("@/views/put/ad_datas.vue"),
 };
 
 export const PutManager: RouteConfig = {
   name: "PutManager",
   path: "/put",
-  icon:'DesktopOutlined',
+  icon: "DesktopOutlined",
   meta: {
     title: "投放管理",
   },
@@ -107,13 +109,10 @@ export const PutManager: RouteConfig = {
   component: () => import("@/views/put/index.vue"),
 };
 
-
-
-
 export const Financial: RouteConfig = {
   name: "Financial",
   path: "/financial",
-  icon:'PayCircleOutlined',
+  icon: "PayCircleOutlined",
   meta: {
     title: "财务管理",
   },

src/scss/index.scss

@@ -1,6 +1,7 @@
 // @import "./common.scss";
 @import "./transition.scss";
 @import "./antd.scss";
+
 // @import "./components/index.scss";
 // @import "./views/index.scss";
 body {
@@ -32,6 +33,18 @@ body {
   .web-header {
     position: relative;
 
+    .trigger {
+      font-size: 18px;
+      line-height: 64px;
+      padding: 0 24px;
+      cursor: pointer;
+      transition: color 0.3s;
+      color:#fff;
+      &:hover{
+        color: #1890ff;
+      }
+    }
+
     .web-title {
       font-size: 32px;
       color: #fff;
@@ -56,8 +69,7 @@ body {
   }
 
   .web-container {
-    background: url(//firemanage.oss-cn-hangzhou.aliyuncs.com/FE-resource/images/background.svg)
-      #f0f2f5 no-repeat top left / contain fixed;
+    background: url(//firemanage.oss-cn-hangzhou.aliyuncs.com/FE-resource/images/background.svg) #f0f2f5 no-repeat top left / contain fixed;
   }
 }
 
@@ -108,4 +120,4 @@ body {
   span {
     font-weight: bold;
   }
-}
+}

src/store/modules/app/_type.ts

@@ -14,6 +14,7 @@ type State = {
   user: Partial<IUser>;
   officials: SelectOptions<number>;
   platforms: SelectOptions<string>;
+  collapsed:boolean;
 };
 
 // mutation 定义
@@ -23,6 +24,7 @@ enum MutationType {
   setUser = "setUser",
   setOfficial = "setOfficial",
   setPlatforms = "setPlatforms",
+  setCollapsed = 'setCollapsed'
 }
 
 type Mutations<S = State> = {
@@ -31,6 +33,7 @@ type Mutations<S = State> = {
   [MutationType.setUser](state: S, user: Partial<IUser>): void;
   [MutationType.setOfficial](state: S, officials: SelectOptions<number>): void;
   [MutationType.setPlatforms](state: S, platforms: SelectOptions<string>): void;
+  [MutationType.setCollapsed](state: S, platforms: boolean): void;
 };
 
 // action 定义
@@ -63,6 +66,7 @@ type Getters = {
   pageTitle(state: State): string;
   officials(state: State): SelectOptions<number>;
   platforms(state: State): SelectOptions<string>;
+  collapsed(state: State): boolean;
 };
 
 export { State, Mutations, MutationType, Actions, ActionType, Getters };

src/store/modules/app/getters.ts

@@ -9,6 +9,7 @@ const getters: GetterTree<State, RootState> & Getters = {
   pageTitle: (state) => state.pageTitle,
   officials: (state) => state.officials,
   platforms: (state) => state.platforms,
+  collapsed: (state) => state.collapsed,
 };
 
 export default getters;

src/store/modules/app/mutations.ts

@@ -5,6 +5,10 @@ const mutations: MutationTree<State> & Mutations = {
   [MutationType.setRoles](state, roles) {
     state.roles = roles;
   },
+  [MutationType.setCollapsed](state, collapsed) {
+    state.collapsed = collapsed;
+    state.store.setItem("collapsed", `${collapsed}`);
+  },
   [MutationType.setRoutes](state, routes) {
     state.routes = routes;
   },

src/store/modules/app/state.ts

@@ -22,6 +22,10 @@ const state: State = {
   user: store.getItem("user")?.parse<IUser>() ?? {},
   officials: [],
   platforms: [],
+  collapsed:
+    store.getItem("collapsed") && store.getItem("collapsed") === "true"
+      ? true
+      : false,
 };
 
 export default state;

src/types/route.d.ts

@@ -5,6 +5,7 @@ type RouteMeta = {
   icon: string;
   roles: string[];
   activeMenu: string;
+  noMenu:boolean;
 };
 
 export type RouteConfig = RouteRecordRaw & {

src/views/account/account.vue

@@ -21,7 +21,7 @@
              :data-source="list"
              @change="onLoadOfficials" >
          <template #operte="{ text, record }">
-           <p v-clipboard:text="record.fans_add_monitor_link" v-clipboard:success="copySuccess"><a>复制监测链接</a></p>
+           <p v-clipboard:copy="record.fans_add_monitor_link" v-clipboard:success="copySuccess"><a>复制监测链接</a></p>
          </template>
 
 

src/views/put/ad-countdata.vue

@@ -70,7 +70,7 @@ const Adgroup = defineComponent({
       inConfirm: false,
       list: ref<AdgroupList[]>([]),
       rangePick: picker,
-      pickered: [],
+      pickered: [moment().subtract(30, "d"), moment()],
       columns: AdCoundCloumn,
       fields: {},
     });

src/views/put/ad-group.vue

@@ -55,7 +55,7 @@ const Adgroup = defineComponent({
       inConfirm: false,
       list: ref<AdGroupData[]>([]),
       rangePick: picker,
-      pickered: [],
+      pickered: [moment().subtract(30, "d"), moment()],
       columns: AdgroupCloumn,
       fields: {},
     });
@@ -121,7 +121,7 @@ const Adgroup = defineComponent({
     switchMethod(record:any){
         let data = {
         campaign_id: record.campaign_id,
-        status: Number(!record.is_enable),
+        status: Number(!record.is_enable)==1?'enable':'disable',
       };
       setGroupStatus(data).then((res) => {
         this.$message.success("状态修改成功");

src/views/put/put-data.vue

@@ -30,13 +30,18 @@
         修改天数
       </a-button>
     </div>
-    <a-table :columns="columns" :data-source="list" :scroll="{ x: 3000 }" @change="handleTableChange">
+    <a-table
+      :columns="columns"
+      :data-source="list"
+      :scroll="{ x: 3000 }"
+      @change="handleTableChange"
+    >
     </a-table>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, toRefs, ref } from "vue";
+import { defineComponent, reactive, toRefs, ref, onMounted,} from "vue";
 import { picker } from "@/helper/config/range";
 import ToolBar from "@/components/tool-bar/index.vue";
 import moment from "moment";
@@ -67,7 +72,7 @@ const PutData = defineComponent({
       list: ref<any>([]),
       fields: {},
       drawerlist: ref<moreStatPlanItem[]>([]),
-      pickered: [],
+      pickered: [moment().subtract(30, "d"), moment()],
       columns: listed,
       pickerFilter: [],
       drawercolumns: TableColumnOfMoreStat,
@@ -78,23 +83,23 @@ const PutData = defineComponent({
       filterNumber: 120,
       show: false,
     });
+
+    const getList = (query:any) => {
+      let [begin_dates, end_dates] = state.pickered;
+      let start_time = moment(begin_dates).format("YYYY-MM-DD");
+      let end_time = moment(end_dates).format("YYYY-MM-DD");
+      let data = Object.assign({ start_time, end_time }, state.fields, query);
+      getDeliveryStatList(data).then((res) => {
+        state.list = res.data.list;
+        meta.value = res.data.meta;
+      });
+    };
+
     const onSearch = async (fields: Record<string, string>) => {
       try {
         const { official_name, book_name } = fields;
-        const { pickered } = state;
-        let [begin_dates, end_dates] = pickered;
-        let start_time = moment(begin_dates).format("YYYY-MM-DD");
-        let end_time = moment(end_dates).format("YYYY-MM-DD");
-        state.fields = Object.assign({ start_time, end_time }, fields);
-        const { data } = await getDeliveryStatList({
-          start_time,
-          end_time,
-          official_name,
-          book_name,
-          page: 1,
-        });
-        state.list = data.list;
-        meta.value = data.meta;
+        state.fields = fields;
+        getList({ page: 1, day_num: state.filterNumber });
       } catch (e) {
         console.log(e);
       } finally {
@@ -105,60 +110,53 @@ const PutData = defineComponent({
 
     const changeNumber = () => {
       getCloums();
-      getDeliveryStatList(
-        Object.assign(state.fields, { page: 1, day_num: state.filterNumber })
-      ).then((res) => {
-        state.list = res.data.list;
-      });
+      getList({ page: 1, day_num: state.filterNumber });
     };
-    const getCloums = () =>{
+    const getCloums = () => {
       getDesignList({ day_num: state.filterNumber }).then((res) => {
-      let columns: any[] = [];
-      let whiteList = [
-        "official_name",
-        "book_name",
-        "register_num",
-        "delivery_platform",
-      ];
-      console.log(res)
-      res.data.map((item: { desc: string; name: string }) => {
-        let lolumnItem: {
-          title: string;
-          dataIndex: string;
-          slots?: any;
-          width?: string | number;
-          fixed?: string;
-        } = {
-          title: item.desc,
-          dataIndex: item.name,
-          width: 120,
-        };
-        /* if (whiteList.includes(item.name)) {
+        let columns: any[] = [];
+        let whiteList = [
+          "official_name",
+          "book_name",
+          "register_num",
+          "delivery_platform",
+        ];
+        res.data.map((item: { desc: string; name: string }) => {
+          let lolumnItem: {
+            title: string;
+            dataIndex: string;
+            slots?: any;
+            width?: string | number;
+            fixed?: string;
+          } = {
+            title: item.desc,
+            dataIndex: item.name,
+            width: 120,
+          };
+          /* if (whiteList.includes(item.name)) {
           lolumnItem.fixed = "left";
         } */
-        columns.push(lolumnItem);
+          columns.push(lolumnItem);
+        });
+        state.columns = columns;
       });
-      state.columns = columns;
-    });
-    }
+    };
     getCloums();
-    getDeliveryStatList(
-      Object.assign(state.fields, { page: 1, day_num: state.filterNumber })
-    ).then((res) => {
-      state.list = res.data.list;
-    });
+
+
+
     const handleTableChange = (pagination: PageOptions) => {
       const { current, pageSize, total } = pagination;
       let data = Object.assign(state.fields, {
         page: current,
         day_num: state.filterNumber,
       });
-      getDeliveryStatList(data).then((res) => {
-        state.list = res.data.list;
-        meta.value = res.data.meta;
-      });
+      getList(data)
     };
-
+  onMounted(()=>{
+    getCloums();
+    getList({ page: 1, day_num: state.filterNumber });
+  });
     return {
       ...toRefs(state),
       onSearch,