架子已经搭好

src/utils/api.js

@@ -4,7 +4,7 @@ import axios from './http';
 // 登录
 export function Login(data) {
   return axios({
-    url: '/my/login',
+    url: '/admin/my/login',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function Login(data) {
 // 根据用户id 拿到默认的 颜色 和 导航栏
 export function findOne(data) {
   return axios({
-    url: '/account/findOne',
+    url: '/admin/account/findOne',
     method: 'get',
     params: data
   })
@@ -21,7 +21,7 @@ export function findOne(data) {
 // 根据id 修改 默认样式 导航
 export function findUpdate(data) {
   return axios({
-    url: '/account/update',
+    url: '/admin/account/update',
     method: 'post',
     data: data
   })
@@ -31,7 +31,7 @@ export function findUpdate(data) {
 // 获取菜单用户列表
 export function getUserMenu(data) {
   return axios({
-    url: '/auth/getMyMenu',
+    url: '/admin/auth/getMyMenu',
     method: 'post',
     params: data
   })
@@ -40,7 +40,7 @@ export function getUserMenu(data) {
 // 拿到菜单用户列表
 export function getUserMenuAndButon(data) {
   return axios({
-    url: '/auth/getMyMenuAndButton',
+    url: '/admin/auth/getMyMenuAndButton',
     method: 'post',
     params: data,
   })
@@ -49,7 +49,7 @@ export function getUserMenuAndButon(data) {
 // 拿到按钮权限
 export function getMyButton(data) {
   return axios({
-    url: '/auth/getMyButton',
+    url: '/admin/auth/getMyButton',
     method: 'get',
     params: data
   })
@@ -58,7 +58,7 @@ export function getMyButton(data) {
 // 获取纯菜单(不带按钮)
 export function getMenuList() {
   return axios({
-    url: '/menu/list1',
+    url: '/admin/menu/list1',
     method: 'post',
   })
 }
@@ -66,7 +66,7 @@ export function getMenuList() {
 // 获取菜单列表
 export function getMenu() {
   return axios({
-    url: '/menu/list',
+    url: '/admin/menu/list',
     method: 'post'
   })
 }
@@ -74,7 +74,7 @@ export function getMenu() {
 // 菜单添加
 export function addMenu(data) {
   return axios({
-    url: '/menu/add',
+    url: '/admin/menu/add',
     method: 'post',
     data: data
   })
@@ -83,7 +83,7 @@ export function addMenu(data) {
 // 菜单编辑
 export function editMenu(data) {
   return axios({
-    url: '/menu/edit',
+    url: '/admin/menu/edit',
     method: 'post',
     data: data
   })
@@ -92,7 +92,7 @@ export function editMenu(data) {
 // 菜单删除
 export function delMenu(data) {
   return axios({
-    url: '/menu/remove',
+    url: '/admin/menu/remove',
     method: 'post',
     params: data
   })
@@ -101,7 +101,7 @@ export function delMenu(data) {
 // 权限列表
 export function getAuth(data) {
   return axios({
-    url: '/group/list',
+    url: '/admin/group/list',
     method: 'post',
     data: data
   })
@@ -110,7 +110,7 @@ export function getAuth(data) {
 // 权限列表删除
 export function delAuth(data) {
   return axios({
-    url: '/group/remove',
+    url: '/admin/group/remove',
     method: 'post',
     params: data
   })
@@ -119,7 +119,7 @@ export function delAuth(data) {
 // 新增权限组
 export function addAuth(data) {
   return axios({
-    url: '/group/add',
+    url: '/admin/group/add',
     method: 'post',
     data: data
   })
@@ -128,7 +128,7 @@ export function addAuth(data) {
 // 编辑权限组
 export function editAuth(data) {
   return axios({
-    url: '/group/edit',
+    url: '/admin/group/edit',
     method: 'post',
     data: data
   })
@@ -137,7 +137,7 @@ export function editAuth(data) {
 // 权限分配列表(上次保存的菜单)
 export function getMenuByGroup(data) {
   return axios({
-    url: '/auth/getMenuByGroup',
+    url: '/admin/auth/getMenuByGroup',
     method: 'get',
     params: data
   })
@@ -146,7 +146,7 @@ export function getMenuByGroup(data) {
 // 权限分配保存
 export function saveGroupMenu(data) {
   return axios({
-    url: '/auth/saveGroupMenu',
+    url: '/admin/auth/saveGroupMenu',
     method: 'post',
     data: data
   })
@@ -155,7 +155,7 @@ export function saveGroupMenu(data) {
 // 用户分配(上次保存的用户id)
 export function getAcountByGroup(data) {
   return axios({
-    url: '/auth/getAcountByGroup',
+    url: '/admin/auth/getAcountByGroup',
     method: 'get',
     params: data
   })
@@ -164,7 +164,7 @@ export function getAcountByGroup(data) {
 // 用户分配保存
 export function saveAccountGroup(data) {
   return axios({
-    url: '/auth/saveAccountGroup',
+    url: '/admin/auth/saveAccountGroup',
     method: 'post',
     data: data
   })
@@ -173,7 +173,7 @@ export function saveAccountGroup(data) {
 // 获取用户列表
 export function getUserList(data) {
   return axios({
-    url: '/user/list',
+    url: '/admin/user/list',
     method: 'post',
     data: data
   })
@@ -182,7 +182,7 @@ export function getUserList(data) {
 // 用户添加
 export function addUser(data) {
   return axios({
-    url: '/user/add',
+    url: '/admin/user/add',
     method: 'post',
     data: data
   })
@@ -191,7 +191,7 @@ export function addUser(data) {
 // 用户编辑
 export function editUser(data) {
   return axios({
-    url: '/user/edit',
+    url: '/admin/user/edit',
     method: 'post',
     data: data
   })
@@ -200,7 +200,7 @@ export function editUser(data) {
 // 是否启用账号
 export function isUser(data) {
   return axios({
-    url: '/account/setAccountStatus',
+    url: '/admin/account/setAccountStatus',
     method: 'post',
     params: data
   })
@@ -209,7 +209,7 @@ export function isUser(data) {
 // 用户删除
 export function delUser(data) {
   return axios({
-    url: '/user/remove',
+    url: '/admin/user/remove',
     method: 'get',
     params: data
   })

src/utils/http.js

@@ -15,7 +15,7 @@ let removePending = (ever) => {
 // 创建axios实例
 var instance = axios.create({
   timeout: 1000 * 12,
-  baseURL: 'http://192.168.1.165:8082'
+  baseURL: 'http://192.168.1.165:8010'
 })
 
 // 请求拦截器

src/views/Login/Login.vue

@@ -32,7 +32,7 @@
             </el-input>
           </el-col>
           <el-col :span="9">
-            <img id="kaptchaImage" src="http://192.168.1.165:8082/my/send" @click="refset" alt="">
+            <img id="kaptchaImage" src="http://192.168.1.165:8010/admin/my/send" @click="refset" alt="">
           </el-col>
         </el-row>
         <div style="height: 20px"></div>
@@ -81,7 +81,7 @@ export default {
     // 刷新
     refset() {
       let img = document.getElementById('kaptchaImage');
-      img.setAttribute('src', 'http://192.168.1.165:8082/my/send?'+ Math.floor(Math.random() * 100));
+      img.setAttribute('src', 'http://192.168.1.165:8010/admin/my/send?'+ Math.floor(Math.random() * 100));
     }
   }
 }

src/views/dashboard/chart/ChartPig.vue

@@ -0,0 +1,118 @@
+<template>
+  <div id="ChartPig" style="width: 100%; height: 100%"></div>
+</template>
+
+<script>
+export default {
+  name: "ChartPig",
+  data() {
+    return {
+      myChart: null
+    }
+  },
+  methods: {
+    init() {
+      let dataAxis = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '测试月'];
+      let start = dataAxis.length - 12;
+      let end = dataAxis.length - 1;
+      let options = {
+        tooltip: {
+          trigger: 'axis',
+        },
+        color: ['#3BA272'],
+        dataZoom: [{
+          type: 'inside',
+          startValue: start,
+          endValue: end,
+          show: false
+          // zoomOnMouseWheel: false,
+          // zoomLock: true,
+        }],
+        // dataZoom: [
+        //
+        //   {
+        //     type: 'slider',
+        //     startValue: start,
+        //     endValue:end,
+        //     zoomOnMouseWheel: false,
+        //     zoomLock: true,
+        //   },
+        //   {
+        //     type: 'inside'
+        //   },
+        // ],
+        xAxis: [
+          {
+            type: 'category',
+            data: dataAxis,
+            axisPointer: {
+              type: 'shadow'
+            },
+            axisLine: {
+              show: false,
+              lineStyle: {
+                color: '#6e7079',
+              }
+            },
+            axisTick:{
+              show:false
+            },
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            name: '水量统计情况',
+            axisLabel: {
+              formatter: '{value} KW·h'
+            },
+            axisLine: {
+              show: false,
+              lineStyle: {
+                color: '#6e7079',
+              }
+            },
+            axisTick:{
+              show:false
+            },
+          }
+        ],
+        series: [
+          {
+            name: '水量',
+            type: 'line',
+            // stack: 'Total',
+            smooth: true,
+            areaStyle: {},
+            emphasis: {
+              focus: 'series'
+            },
+            itemStyle : {
+              color:'#3BA272',
+              borderColor:"#3BA272",
+              normal: {
+                label : {
+                  show: true,
+                  textStyle: {
+                    fontSize: 14
+                  }
+                }
+              }
+            },
+            data: [120, 132, 101, 134, 90, 230, 210, 210, 245, 203, 124, 214, 210]
+          }
+        ]
+      }
+      this.myChart.setOption(options)
+    }
+  },
+  mounted() {
+    this.myChart = this.$echarts.init(document.getElementById('ChartPig'))
+    this.init()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/dashboard/dashboard.vue

@@ -307,6 +307,7 @@
           </div>
         </div>
         <div style="width: 85%; height: 400px">
+          <chart-pig></chart-pig>
         </div>
       </div>
     </div>
@@ -318,12 +319,14 @@ import { mapState } from 'vuex';
 import ChartWsd from "./chart/ChartWsd";
 import ChartDl from'./chart/ChartDl';
 import ChartWater from "./chart/ChartWater";
+import ChartPig from "./chart/ChartPig";
 export default {
   name: "dashboard",
   components: {
     ChartWsd,
     ChartDl,
-    ChartWater
+    ChartWater,
+    ChartPig
   },
   data() {
     return {