添加tags

src/components/AuthButton/index.vue

@@ -25,8 +25,6 @@ export default {
       //根据服务类型显示按钮类型 1=查询 2=新增 3=编辑 4=删除
       const type = servicetype != '4' ? 'primary' : 'danger'
 
-
-
       //根据服务类型显示按钮类型设置按钮方法 1=查询 2=新增 3=编辑 4=删除 ...其他
       let func = null
       if (servicetype == 1) {
@@ -40,17 +38,16 @@ export default {
       } else if (servicetype == 5) {
         func = (row, auth) => context.parent.handleOther(row, auth)
       }
-
       //根据显示方式显示按钮类型 1=名称 2=图标 3=名称+图标
       const isDisplay = auth.isdisplay
       let button = null
-      if(eval(isDisplay)){
+      if (eval(isDisplay)) {
         if (pageicon) {
-        button = <el-button size="small" icon={pageicon} onClick={() => func(row, auth)} type={type}></el-button>
+          button = <el-button size="small" icon={pageicon} onClick={() => func(row, auth)} type={type}></el-button>
         } else {
           button = <el-button size="small" onClick={() => func(row, auth)} type={type}>{pagename}</el-button>
         }
-         vnodes.push(button)
+        vnodes.push(button)
       }
     } else {
       vnodes.push(<span></span>)

src/layout/components/AppMain.vue

@@ -10,10 +10,13 @@
   <section class="app-main">
     <div class="app-main-content">
       <transition name="fade-transform" mode="out-in">
-        <keep-alive v-if="$route.meta && $route.meta.keepAlive" :max="6">
+        <!-- <keep-alive v-if="$route.meta && $route.meta.keepAlive" :max="6">
+          <router-view :key="key" />
+        </keep-alive>
+        <router-view v-else :key="key" /> -->
+        <keep-alive :include="cachedViews">
           <router-view :key="key" />
         </keep-alive>
-        <router-view v-else :key="key" />
       </transition>
     </div>
   </section>
@@ -23,6 +26,9 @@
 export default {
   name: 'AppMain',
   computed: {
+    cachedViews () {
+      return this.$store.state.tagsView.cachedViews
+    },
     key () {
       return Object.keys(this.$route.query).reduce((string, currentKey, index) => {
         if (currentKey !== 'fastFilter') {

src/layout/components/Navbar.vue

@@ -23,25 +23,15 @@
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <!-- <el-button class="btn-help" plain @click="downFile">帮助</el-button> -->
-        <!-- <div class="seting">
-          <span @click="toSystem" class="img-icon"></span>
-        </div> -->
-        <!-- <div class="lock">
-          <span @click="dialogPwd" class="img-icon"></span>
-        </div>
-        <div class="exit">
-          <span @click="exitDialog" class="img-icon"></span>
-        </div> -->
       </div>
     </div>
     <div class="navbar_lower" id="navbar_lowers">
-      <el-breadcrumb separator-class="el-icon-arrow-right">
+      <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
         <el-breadcrumb-item v-for="(item, index) in breadList" :key="index" :to="index < breadList.length -1 ? item.path : undefined">
           <span>{{ item.meta.title }}</span>
         </el-breadcrumb-item>
-      </el-breadcrumb>
-      <!-- <tags-view /> -->
+      </el-breadcrumb> -->
+      <tags-view />
     </div>
   </div>
 </template>
@@ -53,7 +43,7 @@ import Hamburger from '@/components/Hamburger'
 // import { Format } from "../../config/util";
 import { timeInZone } from '@/utils/table'
 import { userHealth } from "@/api/login";
-// import TagsView from "./TagsView";
+import TagsView from "./TagsView";
 
 export default {
   props: ['logstart'],
@@ -70,8 +60,8 @@ export default {
   },
   components: {
     Breadcrumb,
-    Hamburger
-    // TagsView,
+    Hamburger,
+    TagsView,
   },
   watch: {
     $route (val) {
@@ -420,11 +410,10 @@ export default {
     width: 100%;
     height: 32px;
     display: flex;
-    background: #e7ebfc;
+    background: #f0f6ff;
     justify-content: space-between;
     align-items: center;
-    padding-left: 230px;
-    padding-right: 24px;
+    padding-left: 240px;
     ::v-deep .el-breadcrumb {
       font-size: 18px;
       font-family: Microsoft YaHei;

src/layout/components/TagsView/index.vue

@@ -1,34 +1,12 @@
 <template>
   <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane
-      ref="scrollPane"
-      class="tags-view-wrapper"
-      @scroll="handleScroll"
-    >
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tag"
-        :key="tag.path"
-        :class="isActive(tag) ? 'active' : ''"
-        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
-        tag="span"
-        class="tags-view-item"
-        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
-        @contextmenu.prevent.native="openMenu(tag, $event)"
-      >
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+      <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''" :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''" @contextmenu.prevent.native="openMenu(tag, $event)">
         {{ tag.title }}
-        <span
-          v-if="!isAffix(tag)"
-          class="el-icon-close"
-          @click.prevent.stop="closeSelectedTag(tag)"
-        />
+        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
     </scroll-pane>
-    <ul
-      v-show="visible"
-      :style="{ left: left + 'px', top: top + 'px' }"
-      class="contextmenu"
-    >
+    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
         Close
@@ -45,7 +23,7 @@ import path from "path";
 
 export default {
   components: { ScrollPane },
-  data() {
+  data () {
     return {
       visible: false,
       top: 0,
@@ -55,7 +33,7 @@ export default {
     };
   },
   computed: {
-    visitedViews() {
+    visitedViews () {
       return this.$store.state.tagsView.visitedViews;
     },
     // routes() {
@@ -63,11 +41,11 @@ export default {
     // }
   },
   watch: {
-    $route() {
+    $route () {
       this.addTags();
       this.moveToCurrentTag();
     },
-    visible(value) {
+    visible (value) {
       if (value) {
         document.body.addEventListener("click", this.closeMenu);
       } else {
@@ -75,13 +53,13 @@ export default {
       }
     },
   },
-  mounted() {
+  mounted () {
     this.initTags();
     this.addTags();
     this.beforeUnload();
   },
   methods: {
-    beforeUnload() {
+    beforeUnload () {
       window.addEventListener("beforeunload", () => {
         let tabViews = this.visitedViews.map((item) => {
           return {
@@ -102,13 +80,13 @@ export default {
         this.$store.state.tagsView.visitedViews = oldViews;
       }
     },
-    isActive(route) {
+    isActive (route) {
       return route.path === this.$route.path;
     },
-    isAffix(tag) {
+    isAffix (tag) {
       return tag.meta && tag.meta.affix;
     },
-    filterAffixTags(routes, basePath = "/") {
+    filterAffixTags (routes, basePath = "/") {
       let tags = [];
       if (this.routes) {
         routes.forEach((route) => {
@@ -131,7 +109,7 @@ export default {
       }
       return tags;
     },
-    initTags() {
+    initTags () {
       const affixTags = (this.affixTags = this.filterAffixTags(this.routes));
       for (const tag of affixTags) {
         // Must have tag name
@@ -140,14 +118,14 @@ export default {
         }
       }
     },
-    addTags() {
+    addTags () {
       const { name } = this.$route;
       if (name) {
         this.$store.dispatch("tagsView/addView", this.$route);
       }
       return false;
     },
-    moveToCurrentTag() {
+    moveToCurrentTag () {
       const tags = this.$refs.tag;
       this.$nextTick(() => {
         for (const tag of tags) {
@@ -162,7 +140,7 @@ export default {
         }
       });
     },
-    refreshSelectedTag(view) {
+    refreshSelectedTag (view) {
       this.$store.dispatch("tagsView/delCachedView", view).then(() => {
         const { fullPath } = view;
         this.$nextTick(() => {
@@ -172,7 +150,7 @@ export default {
         });
       });
     },
-    closeSelectedTag(view) {
+    closeSelectedTag (view) {
       this.$store
         .dispatch("tagsView/delView", view)
         .then(({ visitedViews }) => {
@@ -181,7 +159,7 @@ export default {
           }
         });
     },
-    closeOthersTags() {
+    closeOthersTags () {
       this.$router.push(this.selectedTag);
       this.$store
         .dispatch("tagsView/delOthersViews", this.selectedTag)
@@ -189,7 +167,7 @@ export default {
           this.moveToCurrentTag();
         });
     },
-    closeAllTags(view) {
+    closeAllTags (view) {
       this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => {
         if (this.affixTags.some((tag) => tag.path === view.path)) {
           return;
@@ -197,7 +175,7 @@ export default {
         this.toLastView(visitedViews, view);
       });
     },
-    toLastView(visitedViews, view) {
+    toLastView (visitedViews, view) {
       const latestView = visitedViews.slice(-1)[0];
       if (latestView) {
         this.$router.push(latestView.fullPath);
@@ -212,7 +190,7 @@ export default {
         }
       }
     },
-    openMenu(tag, e) {
+    openMenu (tag, e) {
       const menuMinWidth = 105;
       const offsetLeft = this.$el.getBoundingClientRect().left; // container margin left
       const offsetWidth = this.$el.offsetWidth; // container width
@@ -229,10 +207,10 @@ export default {
       this.visible = true;
       this.selectedTag = tag;
     },
-    closeMenu() {
+    closeMenu () {
       this.visible = false;
     },
-    handleScroll() {
+    handleScroll () {
       this.closeMenu();
     },
   },
@@ -243,7 +221,8 @@ export default {
 .tags-view-container {
   height: 100%;
   width: 100%;
-  background: #fff;
+  background: #f0f6ff;
+  padding: 0 15px;
   .tags-view-wrapper {
     width: calc(100%);
     ::v-deep .el-scrollbar__wrap {

src/layout/components/index.js

@@ -1,3 +1,4 @@
 export { default as Navbar } from './Navbar'
 export { default as Sidebar } from './Sidebar'
 export { default as AppMain } from './AppMain'
+export { default as TagsView } from './TagsView'

src/layout/mixin/commonChartsBar.js

@@ -1,80 +0,0 @@
-/*
- * @Author: zk
- * @Date: 2021-09-16 16:20:11
- * @LastEditTime: 2021-10-15 12:00:29
- * @LastEditors: Please set LastEditors
- * @Description: 柱状图初始数据
- * @FilePath: \vue-admin-template-master\src\layout\mixin\commonChartsLine.js
- */
-export default {
-  data () {
-    return {
-      options: {
-        color: ['#7569BE'],
-        xAxis: {
-          type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-        },
-        title: {
-          textStyle: {
-            color: '#303133',
-            fontSize: 24
-          }
-        },
-        yAxis: {
-          type: 'value',
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: '#698dc3'
-            }
-          },
-          splitLine: {
-            lineStyle: {
-              type: 'solid',
-              color: '#DCDFE6'
-            }
-          },
-          axisLabel: {
-            color: '#000'
-          }
-        },
-        xAxis: {
-          type: 'category',
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: false,
-            lineStyle: {
-              color: '#698dc3'
-            }
-          },
-          splitLine: {
-            lineStyle: {
-              type: 'solid',
-              color: '#000'
-            }
-          },
-          axisLabel: {
-            color: '#000'
-          }
-        },
-        grid: {
-          top: '66px',
-          bottom: '33px',
-          left: '5%',
-          right: 0
-        },
-        series: [{
-          data: [],
-          type: 'bar',
-          barWidth: 56
-        }]
-      }
-    }
-  }
-}

src/layout/mixin/commonChartsChinaMap.js

@@ -1,271 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-09-23 11:12:40
- * @LastEditTime: 2021-09-23 13:43:32
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \bigDataScreen\src\components\mixin\commonChartsChinaMap.js
- */
-import '../../utils/china'
-var geoCoordMap = {
-  '上海': [121.4648, 31.2891],
-  '东莞': [113.8953, 22.901],
-  '东营': [118.7073, 37.5513],
-  '中山': [113.4229, 22.478],
-  '临汾': [111.4783, 36.1615],
-  '临沂': [118.3118, 35.2936],
-  '丹东': [124.541, 40.4242],
-  '丽水': [119.5642, 28.1854],
-  '乌鲁木齐': [87.9236, 43.5883],
-  '佛山': [112.8955, 23.1097],
-  '保定': [115.0488, 39.0948],
-  '兰州': [103.5901, 36.3043],
-  '包头': [110.3467, 41.4899],
-  '北京': [116.4551, 40.2539],
-  '北海': [109.314, 21.6211],
-  '南京': [118.8062, 31.9208],
-  '南宁': [108.479, 23.1152],
-  '南昌': [116.0046, 28.6633],
-  '南通': [121.1023, 32.1625],
-  '厦门': [118.1689, 24.6478],
-  '台州': [121.1353, 28.6688],
-  '合肥': [117.29, 32.0581],
-  '呼和浩特': [111.4124, 40.4901],
-  '咸阳': [108.4131, 34.8706],
-  '哈尔滨': [127.9688, 45.368],
-  '唐山': [118.4766, 39.6826],
-  '嘉兴': [120.9155, 30.6354],
-  '大同': [113.7854, 39.8035],
-  '大连': [122.2229, 39.4409],
-  '天津': [117.4219, 39.4189],
-  '太原': [112.3352, 37.9413],
-  '威海': [121.9482, 37.1393],
-  '宁波': [121.5967, 29.6466],
-  '宝鸡': [107.1826, 34.3433],
-  '宿迁': [118.5535, 33.7775],
-  '常州': [119.4543, 31.5582],
-  '广州': [113.5107, 23.2196],
-  '廊坊': [116.521, 39.0509],
-  '延安': [109.1052, 36.4252],
-  '张家口': [115.1477, 40.8527],
-  '徐州': [117.5208, 34.3268],
-  '德州': [116.6858, 37.2107],
-  '惠州': [114.6204, 23.1647],
-  '成都': [103.9526, 30.7617],
-  '扬州': [119.4653, 32.8162],
-  '承德': [117.5757, 41.4075],
-  '拉萨': [91.1865, 30.1465],
-  '无锡': [120.3442, 31.5527],
-  '日照': [119.2786, 35.5023],
-  '昆明': [102.9199, 25.4663],
-  '杭州': [119.5313, 29.8773],
-  '枣庄': [117.323, 34.8926],
-  '柳州': [109.3799, 24.9774],
-  '株洲': [113.5327, 27.0319],
-  '武汉': [114.3896, 30.6628],
-  '汕头': [117.1692, 23.3405],
-  '江门': [112.6318, 22.1484],
-  '沈阳': [123.1238, 42.1216],
-  '沧州': [116.8286, 38.2104],
-  '河源': [114.917, 23.9722],
-  '泉州': [118.3228, 25.1147],
-  '泰安': [117.0264, 36.0516],
-  '泰州': [120.0586, 32.5525],
-  '济南': [117.1582, 36.8701],
-  '济宁': [116.8286, 35.3375],
-  '海口': [110.3893, 19.8516],
-  '淄博': [118.0371, 36.6064],
-  '淮安': [118.927, 33.4039],
-  '深圳': [114.5435, 22.5439],
-  '清远': [112.9175, 24.3292],
-  '温州': [120.498, 27.8119],
-  '渭南': [109.7864, 35.0299],
-  '湖州': [119.8608, 30.7782],
-  '湘潭': [112.5439, 27.7075],
-  '滨州': [117.8174, 37.4963],
-  '潍坊': [119.0918, 36.524],
-  '烟台': [120.7397, 37.5128],
-  '玉溪': [101.9312, 23.8898],
-  '珠海': [113.7305, 22.1155],
-  '盐城': [120.2234, 33.5577],
-  '盘锦': [121.9482, 41.0449],
-  '石家庄': [114.4995, 38.1006],
-  '福州': [119.4543, 25.9222],
-  '秦皇岛': [119.2126, 40.0232],
-  '绍兴': [120.564, 29.7565],
-  '聊城': [115.9167, 36.4032],
-  '肇庆': [112.1265, 23.5822],
-  '舟山': [122.2559, 30.2234],
-  '苏州': [120.6519, 31.3989],
-  '莱芜': [117.6526, 36.2714],
-  '菏泽': [115.6201, 35.2057],
-  '营口': [122.4316, 40.4297],
-  '葫芦岛': [120.1575, 40.578],
-  '衡水': [115.8838, 37.7161],
-  '衢州': [118.6853, 28.8666],
-  '西宁': [101.4038, 36.8207],
-  '西安': [109.1162, 34.2004],
-  '贵阳': [106.6992, 26.7682],
-  '连云港': [119.1248, 34.552],
-  '邢台': [114.8071, 37.2821],
-  '邯郸': [114.4775, 36.535],
-  '郑州': [113.4668, 34.6234],
-  '鄂尔多斯': [108.9734, 39.2487],
-  '重庆': [107.7539, 30.1904],
-  '金华': [120.0037, 29.1028],
-  '铜川': [109.0393, 35.1947],
-  '银川': [106.3586, 38.1775],
-  '镇江': [119.4763, 31.9702],
-  '长春': [125.8154, 44.2584],
-  '长沙': [113.0823, 28.2568],
-  '长治': [112.8625, 36.4746],
-  '阳泉': [113.4778, 38.0951],
-  '青岛': [120.4651, 36.3373],
-  '韶关': [113.7964, 24.7028]
-};
-
-var BJData = [
-  [{ name: '北京' }, { name: '上海', value: 95 }],
-  [{ name: '北京' }, { name: '广州', value: 90 }],
-  [{ name: '北京' }, { name: '大连', value: 80 }],
-  [{ name: '北京' }, { name: '南宁', value: 70 }],
-  [{ name: '北京' }, { name: '南昌', value: 60 }],
-  [{ name: '北京' }, { name: '拉萨', value: 50 }],
-  [{ name: '北京' }, { name: '长春', value: 40 }],
-  [{ name: '北京' }, { name: '包头', value: 30 }],
-  [{ name: '北京' }, { name: '重庆', value: 20 }],
-  [{ name: '北京' }, { name: '常州', value: 10 }]
-];
-
-var SHData = [
-  [{ name: '上海' }, { name: '包头', value: 95 }],
-  [{ name: '上海' }, { name: '昆明', value: 90 }],
-  [{ name: '上海' }, { name: '广州', value: 80 }],
-  [{ name: '上海' }, { name: '郑州', value: 70 }],
-  [{ name: '上海' }, { name: '长春', value: 60 }],
-  [{ name: '上海' }, { name: '重庆', value: 50 }],
-  [{ name: '上海' }, { name: '长沙', value: 40 }],
-  [{ name: '上海' }, { name: '北京', value: 30 }],
-  [{ name: '上海' }, { name: '丹东', value: 20 }],
-  [{ name: '上海' }, { name: '大连', value: 10 }]
-];
-
-var GZData = [
-  [{ name: '广州' }, { name: '福州', value: 95 }],
-  [{ name: '广州' }, { name: '太原', value: 90 }],
-  [{ name: '广州' }, { name: '长春', value: 80 }],
-  [{ name: '广州' }, { name: '重庆', value: 70 }],
-  [{ name: '广州' }, { name: '西安', value: 60 }],
-  [{ name: '广州' }, { name: '成都', value: 50 }],
-  [{ name: '广州' }, { name: '常州', value: 40 }],
-  [{ name: '广州' }, { name: '北京', value: 30 }],
-  [{ name: '广州' }, { name: '北海', value: 20 }],
-  [{ name: '广州' }, { name: '海口', value: 10 }]
-];
-
-var planePath = 'path://M1705.06,1318.313v-89.254l-319.9-221.799l0.073-208.063c0.521-84.662-26.629-121.796-63.961-121.491c-37.332-0.305-64.482,36.829-63.961,121.491l0.073,208.063l-319.9,221.799v89.254l330.343-157.288l12.238,241.308l-134.449,92.931l0.531,42.034l175.125-42.917l175.125,42.917l0.531-42.034l-134.449-92.931l12.238-241.308L1705.06,1318.313z';
-
-var convertData = function (data) {
-  var res = [];
-  for (var i = 0; i < data.length; i++) {
-    var dataItem = data[i];
-    var fromCoord = geoCoordMap[dataItem[0].name];
-    var toCoord = geoCoordMap[dataItem[1].name];
-    if (fromCoord && toCoord) {
-      res.push({
-        fromName: dataItem[0].name,
-        toName: dataItem[1].name,
-        coords: [fromCoord, toCoord],
-        value: dataItem[1].value
-      });
-    }
-  }
-  return res;
-};
-
-var color = ['#a6c84c', '#ffa022', '#46bee9'];
-var series = [];
-[['北京', BJData], ['上海', SHData], ['广州', GZData]].forEach(function (item, i) {
-  //
-  series.push({
-    name: item[0] + ' Top10',
-    type: 'lines',
-    zlevel: 1,
-    effect: {
-      show: true,
-      period: 6,
-      trailLength: 0.7,
-      color: '#fff',
-      symbolSize: 3
-    },
-    lineStyle: {
-      normal: {
-        color: color[i],
-        width: 0,
-        curveness: 0.2
-      }
-    },
-    data: convertData(item[1])
-  },
-    {
-      name: item[0] + ' Top10',
-      type: 'lines',
-      zlevel: 2,
-      symbol: ['none', 'arrow'],
-      symbolSize: 10,
-      effect: {
-        show: true,
-        period: 6,
-        trailLength: 0,
-        symbol: planePath,
-        symbolSize: 15
-      },
-      lineStyle: {
-        normal: {
-          color: color[i],
-          width: 1,
-          opacity: 0.6,
-          curveness: 0.2
-        }
-      },
-      data: convertData(item[1])
-    },
-    {
-      name: item[0] + ' Top10',
-      type: 'effectScatter',
-      coordinateSystem: 'geo',
-      zlevel: 2,
-      rippleEffect: {
-        brushType: 'stroke'
-      },
-      label: {
-        normal: {
-          show: true,
-          position: 'right',
-          formatter: '{b}'
-        }
-      },
-      symbolSize: function (val) {
-        return val[2] / 8;
-      },
-      itemStyle: {
-        normal: {
-          color: color[i]
-        }
-      },
-      data: item[1].map(function (dataItem) {
-        return {
-          name: dataItem[1].name,
-          value: geoCoordMap[dataItem[1].name].concat([dataItem[1].value])
-        };
-      })
-    });
-});
-export default {
-  data () {
-    return {
-      options: {}
-    }
-  }
-}
-

src/layout/mixin/commonChartsLine.js

@@ -1,50 +0,0 @@
-/*
- * @Author: zk
- * @Date: 2021-09-16 16:20:11
- * @LastEditTime: 2021-10-18 09:14:26
- * @LastEditors: Please set LastEditors
- * @Description: 折线图初始数据
- * @FilePath: \vue-admin-template-master\src\layout\mixin\commonChartsLine.js
- */
-export default {
-  data () {
-    return {
-      options: {
-        title: {
-          text: '',
-          textStyle: {
-            color: '#303133',
-            fontSize: 24
-          }
-        },
-        tooltip: {
-          trigger: 'axis'
-        },
-        legend: {
-          show: false
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
-        xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          data: [],
-          axisLabel: {
-            color: '#000'
-          }
-        },
-        yAxis: {
-          type: 'value',
-          axisLabel: {
-            color: '#000'
-          }
-        },
-        series: []
-      }
-    }
-  }
-}

src/layout/mixin/commonChartsPie.js

@@ -1,53 +0,0 @@
-/*
- * @Author: zk
- * @Date: 2021-09-16 16:20:11
- * @LastEditTime: 2021-10-15 14:39:22
- * @LastEditors: Please set LastEditors
- * @Description: 饼图初始数据
- * @FilePath: \vue-admin-template-master\src\layout\mixin\commonChartsPie.js
- */
-export default {
-  data () {
-    return {
-      options: {
-        tooltip: {
-          trigger: 'item'
-        },
-        legend: {
-          top: '5%',
-          left: 'center',
-          show: false
-        },
-        title: {
-          textStyle: {
-            color: '#303133',
-            fontSize: 24
-          }
-        },
-        series: [
-          {
-            name: '访问来源',
-            type: 'pie',
-            radius: ['40%', '70%'],
-            avoidLabelOverlap: false,
-            label: {
-              show: false,
-              position: 'center'
-            },
-            emphasis: {
-              label: {
-                show: false,
-                fontSize: '40',
-                fontWeight: 'bold'
-              }
-            },
-            labelLine: {
-              show: false
-            },
-            data: []
-          }
-        ]
-      }
-    }
-  }
-}

src/layout/mixin/commonChartsPro.js

@@ -1,101 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-10-19 13:58:31
- * @LastEditTime: 2021-10-19 14:27:49
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \Foshan4A\src\layout\mixin\commonChartsPro.js
- */
-export default {
-  data () {
-    return {
-      options: {
-        angleAxis: {
-          max: 100, // 满分
-          clockwise: false, // 逆时针
-          // 隐藏刻度线
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            show: false
-          },
-          splitLine: {
-            show: false
-          }
-        },
-        radiusAxis: {
-          type: 'category',
-          // 隐藏刻度线
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            show: false
-          },
-          splitLine: {
-            show: false
-          }
-        },
-        polar: {
-          center: ['50%', '50%'],
-          radius: '175%' //图形大小
-        },
-        series: [{
-          type: 'bar',
-          data: [{
-            name: '作文得分',
-            value: 75,
-            itemStyle: {
-              normal: {
-                color: 'red',
-                // colorStops: [
-                //     {
-                //       offset: 0, color: 'rgba(137,185,253,0.59)' // 0% 处的颜色
-                //     },
-                //     {
-                //       offset: 0.25, color: 'rgba(137,185,253,0.39)' // 50% 处的颜色
-                //     },
-                //     {
-                //       offset: 0.75, color: 'rgba(137,185,253,0.1)' // 50% 处的颜色
-                //     },
-                //     {
-                //       offset: 1, color: 'rgba(137,185,253,0.07)' // 100% 处的颜色
-                //     }
-                // ],
-              }
-            },
-          }],
-          coordinateSystem: 'polar',
-          roundCap: true,
-          barWidth: 14,
-          barGap: '-100%', // 两环重叠
-          z: 2,
-        }, { // 灰色环
-          type: 'bar',
-          silent: true,
-          data: [{
-            value: 100,
-            itemStyle: {
-              color: '#F5F7FA',
-              shadowColor: '#F5F7FA',
-              shadowBlur: 5,
-              shadowOffsetY: 2
-            }
-          }],
-          coordinateSystem: 'polar',
-          roundCap: true,
-          barWidth: 14,
-          barGap: '-100%', // 两环重叠
-          z: 1
-        }]
-      }
-    }
-  }
-}

src/layout/mixin/commonProgress.js

@@ -1,87 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-10-18 10:48:30
- * @LastEditTime: 2021-10-18 13:55:54
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \Foshan4A\src\layout\mixin\commonProgress.js
- */
-export default {
-  data () {
-    return {
-      options: {
-        angleAxis: {
-          axisLine: {
-            show: false,
-          },
-          axisLabel: {
-            show: false,
-          },
-          splitLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          min: 0,
-          max: 132,
-          startAngle: 225,
-        },
-        radiusAxis: {
-          type: 'category',
-          axisLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
-          },
-          axisLabel: {
-            show: false,
-          },
-          data: ['a', 'b', 'c'],
-          z: 10,
-        },
-        polar: {
-          radius: '90%', //调半径
-        },
-        title: {
-          text: '总计',
-          subtext: '1745',
-          left: '45%',
-          textAlign: 'center',
-          top: '35%',
-          subtextStyle: {
-            color: '#303133',
-            fontSize: 32,
-            fontWeight: 'bold'
-          }
-        },
-        series: [
-          {
-            type: 'bar',
-            data: [, , (10 / 100) * 100],
-            z: 1,
-            coordinateSystem: 'polar',
-            barMaxWidth: 24,
-            // name: "警告事件",
-            roundCap: true,
-            color: '#E752A3',
-            barGap: '-100%',
-          },
-          {
-            type: 'bar',
-            data: [, , 100],
-            z: 0,
-            silent: true,
-            coordinateSystem: 'polar',
-            barMaxWidth: 24,
-            name: 'C',
-            roundCap: true,
-            color: '#8969BE',
-            barGap: '-100%',
-          },
-        ]
-      }
-    }
-  }
-}

src/layout/mixin/getPublicData.js

@@ -1,71 +0,0 @@
-import { Query, newData, modifyData, moveData } from "@/api/webApi"
-export default {
-  data () {
-    return {
-      title: '',
-      queryId: '',
-      pageIndex: 1,
-      pageSize: 9999,
-      dataContent: {}
-    }
-  },
-  created () {
-    const { title, qid } = this.$route.meta
-    this.title = title
-    this.queryId = qid
-  },
-  methods: {
-    //查询
-    async getQuery (id, type = false, dataContent = {}, pageSize) {
-      try {
-        // this.loading = true;
-        const { code, columnset, returnData } = await Query({
-          serviceId: id,
-          page: this.pageIndex,
-          pageSize: pageSize ?? this.pageSize,
-          dataContent,
-        })
-        if (code == 0) {
-          if (type) {
-            return columnset
-          } else {
-            return returnData
-          }
-        } else {
-          return []
-        }
-      } catch (error) {
-        return []
-      }
-    },
-    //增/删/改
-    async generalDataReception (id, data, event, type) {
-      try {
-        const params = {
-          serviceId: id,
-          dataContent: data,
-          event: `${event}`,
-        };
-        const { code, returnData } =
-          event == 1
-            ? await newData(params)
-            : event == 2
-              ? await modifyData(params)
-              : await moveData(params);
-        if (code == 0) {
-          this.$message.success("操作成功");
-          if (type) {
-            return returnData
-          } else {
-            return 1
-          }
-        } else {
-          this.$message.error("操作失败");
-          return 0
-        }
-      } catch (error) {
-        return 0
-      }
-    },
-  }
-}

src/layout/mixin/publicFunc.js

@@ -1,231 +0,0 @@
-import { Query, newData, modifyData, moveData } from "@/api/webApi"
-import { getAuthData } from "@/utils/validate";
-export default {
-  data () {
-    return {
-      AauthId: null,
-      AqueryId: null,
-      AauthTable: [],
-      TauthId: null,
-      TqueryId: null,
-      AqueryParams: null
-    }
-  },
-  created () {
-    const { auth_id } = this.$route.meta
-    if (auth_id) {
-      const { arrs } = getAuthData(auth_id)
-      const table = arrs.filter(item => item.auth_type == 4)
-      const table2 = arrs.filter(item => item.auth_type == 5)
-      if (table2 && table2.length) {
-        const obj = table2[0]
-        this.AqueryParams = obj
-        this.TqueryId = obj.queryTemplateID
-        this.TauthId = obj.auth_id
-      }
-      if (table && table.length) {
-        if (table.length == 1) {
-          const obj = table[0]
-          this.AqueryParams = obj
-          this.AqueryId = obj.queryTemplateID
-          this.AauthId = obj.auth_id
-        } else {
-          this.AauthTable = table
-        }
-      } else {
-        this.AauthId = auth_id
-        this.AqueryId = auth_id
-      }
-    }
-  },
-  methods: {
-    formatQuery (arrs, key = '') {
-      const params = []
-      if (key) {
-        const flag = Array.isArray(arrs)
-        if (flag) {
-          for (let i = 0; i < arrs.length; i++) {
-            const obj = {
-              "left": "(",
-              "column": `${key[i]}`,
-              "comparator": "=",
-              "value": `${arrs[i][key[i]]}`,
-              "right": ")",
-              "connector": "and"
-            }
-            params.push(obj)
-          }
-        } else {
-          params.push({
-            "left": "(",
-            "column": `${key}`,
-            "comparator": "=",
-            "value": `${arrs[key]}`,
-            "right": ")",
-            "connector": "and"
-          })
-        }
-      } else {
-        params.push({
-          "left": "(",
-          "column": ``,
-          "comparator": "=",
-          "value": ``,
-          "right": ")",
-          "connector": "and"
-        })
-      }
-      return params
-    },
-    formatChange (data, event, key) {
-      const datas = []
-      const flag = Array.isArray(data)
-      if (flag) {
-        for (let i = 0; i < data.length; i++) {
-          let obj = {}
-          if (event == 1) {
-            obj.Value = data[i]
-          } else if (event == 2) {
-            obj.Value = data[i]
-            obj.filter = {}
-            if (Array.isArray(key)) {
-              const keys = []
-              const vals = []
-              obj.filter = []
-              for (let j = 0; j < key.length; j++) {
-                const dep = key[i]
-                keys.push(Object.keys(dep))
-                vals.push(Object.values(dep))
-              }
-              const nobj = {
-                "left": "(",
-                "column": `${keys[i]}`,
-                "comparator": "=",
-                "value": `${vals[i]}`,
-                "right": ")",
-                "connector": "and"
-              }
-              obj.filter.push(nobj)
-              if (obj.Value.hasOwnProperty(keys[i])) {
-                delete obj.Value[keys[i]]
-              }
-            } else {
-              obj.filter[key] = data[i][key]
-              if (obj.Value[key]) {
-                delete obj.Value[key]
-              }
-            }
-          } else {
-            obj = data[i]
-          }
-          datas.push(obj)
-        }
-      } else {
-        let obj = {}
-        if (event == 1) {
-          obj.Value = data
-        } else if (event == 2) {
-          obj.Value = data
-          obj.filter = [{
-            "left": "(",
-            "column": `${key}`,
-            "comparator": "=",
-            "value": `${data[key]}`,
-            "right": ")",
-            "connector": "and"
-          }]
-          if (obj.Value[key]) {
-            delete obj.Value[key]
-          }
-        } else {
-          obj = data
-        }
-        datas.push(obj)
-      }
-      return datas
-    },
-    //查询
-    async getQueryList (id, dataContent = {}, pageIndex = 1, pageSize = 999) {
-      try {
-        const { code, rowcount, returnData } = await Query({
-          serviceId: id,
-          page: pageIndex,
-          pageSize: pageSize,
-          dataContent: dataContent,
-          event: '0',
-          // authId: this.AauthId
-        })
-        return { code, rowcount, returnData }
-      } catch (error) {
-        return []
-      }
-    },
-    //权限查询
-    async getQueryListAuth (id, dataContent = {}, pageIndex = 1, pageSize = 999, authId) {
-      try {
-        const { code, rowcount, returnData } = await Query({
-          serviceId: id,
-          page: pageIndex,
-          pageSize: pageSize,
-          dataContent: dataContent,
-          event: '0',
-          authId: authId ?? this.AauthId
-        })
-        return { code, rowcount, returnData }
-      } catch (error) {
-        return []
-      }
-    },
-    //高级查询
-    async getQueryGj (id, dataContent = {}, key, pageSize) {
-      try {
-        const { code, columnset, returnData } = await Query({
-          serviceId: id,
-          page: this.pageIndex,
-          pageSize: pageSize ?? this.pageSize,
-          dataContent: this.formatQuery(dataContent, key),
-          event: '0',
-          // authId: this.AauthId
-        })
-        if (code == 0) {
-          return returnData
-        } else {
-          return []
-        }
-      } catch (error) {
-        return []
-      }
-    },
-    //增/删/改
-    async getChangeList (id, data, event, key) {
-      try {
-        const params = {
-          serviceId: id,
-          dataContent: this.formatChange(data, event, key),
-          event: `${event}`,
-          // authId: this.AauthId
-        };
-        const { code, message } =
-          event == 1
-            ? await newData(params)
-            : event == 2
-              ? await modifyData(params)
-              : await moveData(params);
-        return { code, message }
-      } catch (error) {
-        console.log(error)
-        return {
-          code: -1,
-          message: error
-        }
-      }
-    },
-    tipMsg (code, msg) {
-      if (code == 0 || code != -1) {
-        this.$message.success(msg ?? '操作成功')
-      } else {
-        this.$message.error(msg ?? '操作失败')
-      }
-    }
-  }
-}

src/layout/mixin/publicIcons.js

@@ -1,44 +0,0 @@
-const icons = [
-  {
-    name: 'el-icon-picture',
-    value: 'el-icon-picture'
-  },
-  {
-    name: 'el-icon-upload',
-    value: 'el-icon-upload'
-  },
-  {
-    name: 'el-icon-user-solid',
-    value: 'el-icon-user-solid'
-  },
-  {
-    name: 'el-icon-star-on',
-    value: 'el-icon-star-on'
-  },
-  {
-    name: 'el-icon-question',
-    value: 'el-icon-question'
-  },
-  {
-    name: 'el-icon-camera-solid',
-    value: 'el-icon-camera-solid'
-  },
-  {
-    name: 'el-icon-message-solid',
-    value: 'el-icon-message-solid'
-  },
-  {
-    name: 'el-icon-s-platform',
-    value: 'el-icon-s-platform'
-  },
-  {
-    name: 'el-icon-s-custom',
-    value: 'el-icon-s-custom'
-  },
-  {
-    name: 'el-icon-s-data',
-    value: 'el-icon-s-data'
-  }
-]
-
-export default icons

src/router/index.js

@@ -62,6 +62,7 @@ export const constantRoutes = [
       {
         path: '',
         name: 'HomePage',
+        meta: { title: '首页', },
         component: () => import('@/views/HomePage/index.vue'),
       },
     ],