冲突处理

package-lock.json

@@ -21,6 +21,7 @@
         "element-plus": "^2.2.26",
         "file-saver": "^2.0.5",
         "html2canvas": "^1.0.0-rc.7",
+        "js-cookie": "^3.0.5",
         "jsencrypt": "^3.2.1",
         "json-bigint": "^1.0.0",
         "jspdf": "^2.3.1",
@@ -3875,6 +3876,14 @@
         "@sideway/pinpoint": "^2.0.0"
       }
     },
+    "node_modules/js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/js-sdsl": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
@@ -9624,6 +9633,11 @@
         "@sideway/pinpoint": "^2.0.0"
       }
     },
+    "js-cookie": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="
+    },
     "js-sdsl": {
       "version": "4.1.4",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",

package.json

@@ -22,6 +22,7 @@
     "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.0.0-rc.7",
+    "js-cookie": "^3.0.5",
     "jsencrypt": "^3.2.1",
     "json-bigint": "^1.0.0",
     "jspdf": "^2.3.1",

src/api/axios.js

@@ -1,94 +1,115 @@
-import axios from 'axios';
-import { ElMessage, ElMessageBox, ElLoading } from 'element-plus';
+import axios from "axios";
+import route from "@/router";
+import { ElMessage, ElMessageBox, ElLoading } from "element-plus";
 import { nextTick } from "vue";
-import {baseURL, socketURL} from './config';
-import JSONBIG from 'json-bigint';
+import { baseURL, socketURL } from "./config";
+import JSONBIG from "json-bigint";
+import { getCookie } from "@/utils/auth"; // getToken from cookie
 // 配置新建一个 axios 实例
 var loading = null;
 const service = axios.create({
-    baseURL: baseURL,
-    timeout: 2000000,
-    headers: { 'Content-Type': 'application/json' },
-    transformResponse: [
-        function (data) {
-            const json = JSONBIG({
-                storeAsString: true
-            });
-            const res = json.parse(data);
-            return res;
-        }
-    ],
-    showLoading: {
-        statu: true,
-        text: '加载中...'
-    }
+  baseURL: baseURL,
+  timeout: 2000000,
+  headers: { "Content-Type": "application/json" },
+  transformResponse: [
+    function (data) {
+      const json = JSONBIG({
+        storeAsString: true,
+      });
+      const res = json.parse(data);
+      return res;
+    },
+  ],
+  showLoading: {
+    statu: true,
+    text: "加载中...",
+  },
 });
 
 // 添加请求拦截器
 service.interceptors.request.use(
-    (config) => {
-        if (config.showLoading.statu) {
-            loading = ElLoading.service({
-                lock: true,
-                text: config.showLoading.text,
-                spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.3)'
-            });
-        }
-        // 在发送请求之前做些什么 token
-        let token = sessionStorage.getItem('token')
-        if (token) {
-            config.headers.common['token'] = token;
-        }
-        return config
-    },
-    (error) => {
-        // 对请求错误做些什么
-        return Promise.reject(error);
+  (config) => {
+    if (config.showLoading.statu) {
+      loading = ElLoading.service({
+        lock: true,
+        text: config.showLoading.text,
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.3)",
+      });
+    }
+    const u = (config.headers || {}).isUser;
+    // 在发送请求之前做些什么 token
+    let token = getCookie("accessToken");
+    let userId = getCookie("userId");
+    if (token) {
+      if (u) {
+        config.headers["Authorization"] = "Bearer " + token;
+      } else {
+        config.headers.common["token"] = token;
+        config.headers.common["userId"] = userId;
+      }
     }
+    return config;
+  },
+  (error) => {
+    // 对请求错误做些什么
+    return Promise.reject(error);
+  }
 );
 
 // 添加响应拦截器
 service.interceptors.response.use(
-    (response) => {
-        // 对响应数据做点什么
-        nextTick(async () => {
-            loading && await loading.close()
-        })
-        const res = response.data;
-        console.warn(res);
-        if (response.status === 401 || response.status === 4001 || response.status == 521) {
-            sessionStorage.clear(); // 清除浏览器全部临时缓存
-            window.location.href = '/'; // 去登录页
-            ElMessage.error(res.msg)
-        } else {
-            if(response.status === 200 && res.code &&  res.code !== 200){
-                ElMessage.error(res.msg)
-            }
-            return response.data;
-        }
-    },
-    (error) => {
-        nextTick(async () => {
-            loading && await loading.close()
-        })
-        // 对响应错误做点什么
-        if (error.message.indexOf('timeout') != -1) {
-            // ElMessage.error('网络超时');
-        } else if (error.message == 'Network Error') {
-            // ElMessage.error('网络连接错误');
-
-        } else {
-            if (error.response.data) ElMessage.error(error.response.statusText);
-            // else ElMessage.error('接口路径找不到');
+  (response) => {
+    // 对响应数据做点什么
+    nextTick(async () => {
+      loading && (await loading.close());
+    });
+    const res = response.data;
+    console.warn(res);
+    if (
+      response.status === 401 ||
+      response.status === 4001 ||
+      response.status == 521
+    ) {
+      sessionStorage.clear(); // 清除浏览器全部临时缓存
+      ElMessageBox.alert(
+        "登录状态已过期，您可以继续留在该页面，或者重新登录",
+        "系统提示",
+        {
+          confirmButtonText: "重新登录",
+          cancelButtonText: "取消",
+          type: "warning",
+          callback: () => {
+            store.dispatch("user/LogOut").then(() => {
+              route.push("/");
+            });
+          },
         }
-        return Promise.reject(error);
+      );
+    } else {
+      if (response.status === 200 && res.code && res.code !== 200) {
+        ElMessage.error(res.msg);
+      }
+      return response.data;
+    }
+  },
+  (error) => {
+    nextTick(async () => {
+      loading && (await loading.close());
+    });
+    // 对响应错误做点什么
+    if (error.message.indexOf("timeout") != -1) {
+      // ElMessage.error('网络超时');
+    } else if (error.message == "Network Error") {
+      // ElMessage.error('网络连接错误');
+    } else {
+      if (error.response.data) ElMessage.error(error.response.statusText);
+      // else ElMessage.error('接口路径找不到');
     }
+    return Promise.reject(error);
+  }
 );
 
 // 导出 axios 实例
 export default service;
-export {
-    baseURL,
-    socketURL
-}
+export { baseURL, socketURL };

src/api/config.js

@@ -1,9 +1,9 @@
 const config = {
-    // baseURL: 'http://10.81.3.155:9002',
-    baseURL: 'http://192.168.2.13:9002',
+    baseURL: 'http://10.81.3.155:9002',
+    // baseURL: 'http://192.168.2.13:9002',
     socketURL: 'ws://10.81.3.155:9002'
 }
 
 export default config;
-export const baseURL = config.baseURL
-export const socketURL = config.socketURL
+export const baseURL = config.baseURL;
+export const socketURL = config.socketURL;

src/components/Header.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="header">
     <!-- 折叠按钮 -->
-    <div class="flex items-center"> 
-      <div class="collapse-btn h-[55px] flex items-center justify-center" @click="collapseChage">
+    <div class="flex items-center">
+      <div
+        class="collapse-btn h-[55px] flex items-center justify-center"
+        @click="collapseChage"
+      >
         <!-- <i v-if="!collapse" class="el-icon-s-fold"></i>
         <i v-else class="el-icon-s-unfold"></i> -->
         <el-icon v-if="!collapse"><Fold /></el-icon>
@@ -12,26 +15,20 @@
     </div>
     <div class="header-right">
       <div class="header-user-con">
-        <div class="user-name">
-          <span class="el-dropdown-link">
-            {{ username }}
-            <!-- <i class="el-icon-caret-bottom"></i> -->
-          </span>
-        </div>
-        <!-- <el-dropdown class="user-name" trigger="click" @command="handleCommand">
+        <el-dropdown class="user-name" trigger="click" @command="handleCommand">
           <span class="el-dropdown-link">
             {{ username }}
             <i class="el-icon-caret-bottom"></i>
           </span>
           <template #dropdown>
             <el-dropdown-menu>
-              <el-dropdown-item command="editpassword"
+              <!-- <el-dropdown-item command="editpassword"
                 >修改密码</el-dropdown-item
-              >
+              > -->
               <el-dropdown-item command="loginout">退出登录</el-dropdown-item>
             </el-dropdown-menu>
           </template>
-        </el-dropdown> -->
+        </el-dropdown>
         <i
           class="el-icon-full-screen"
           style="margin-left: 30px"
@@ -68,12 +65,13 @@
 <script setup>
 import { ref, computed, onMounted, reactive } from "vue";
 import { useRouter } from "vue-router";
-// import { editRequest } from "/@/api/api.js";
+import { logout } from "/@/api/api.js";
 import { ElMessage } from "element-plus";
 import { useStore } from "vuex";
 import { JSEncrypt } from "jsencrypt";
 import BASE from "@tools/basicTool";
 import screenfull from "screenfull";
+import { getCookie } from "@/utils/auth"; // getToken from cookie
 const router = useRouter();
 const store = useStore();
 const dialogVisible = ref(false);
@@ -81,7 +79,9 @@ const refruleForm = ref(null);
 const rules = reactive({
   userName: [{ required: true, message: "请输入账号", trigger: "blur" }],
   chineseName: [{ required: true, message: "请输入中文名称", trigger: "blur" }],
-  newPassWord: [{ required: true, validator: BASE.elCkeck.validatePass, trigger: "blur" }],
+  newPassWord: [
+    { required: true, validator: BASE.elCkeck.validatePass, trigger: "blur" },
+  ],
 });
 const ruleForm = reactive({
   id: sessionStorage.getItem("ms_id"),
@@ -91,7 +91,7 @@ const ruleForm = reactive({
 });
 
 const username = computed(() => {
-  return sessionStorage.getItem("ms_chinesename");
+  return store.getters.username;
 });
 
 const collapse = computed(() => store.state.collapse);
@@ -100,9 +100,15 @@ const collapse = computed(() => store.state.collapse);
 const handleCommand = (command) => {
   if (command == "loginout") {
     sessionStorage.clear();
-    router.push("/login");
+    logout({
+      token: getCookie("accessToken"),
+      userId: getCookie("userId"),
+    }).then((res) => {
+      store.commit("user/REMOVE_TOKEN");
+      router.push("/login");
+    });
   } else if (command == "editpassword") {
-    dialogVisible.value = true;
+    // dialogVisible.value = true;
   }
 };
 // 利用jsencrypt.js进行RSA加密
@@ -115,14 +121,14 @@ const encryptionByPublickey = (formData) => {
 };
 // edit
 const edit = async () => {
-   let requestWrapper = {
+  let requestWrapper = {
     publicKey: sessionStorage.getItem("publicKey"),
     token: sessionStorage.getItem("token"),
     data: encryptionByPublickey(ruleForm),
   };
   const res = await editRequest(requestWrapper);
   dialogVisible.value = false;
-  if (res.success){
+  if (res.success) {
     ElMessage.success(res.msg);
   } else {
     ElMessage.error(res.msg);

src/main.js

@@ -1,89 +1,95 @@
-import {
-    createApp
-} from 'vue'
-import App from './App.vue'
-import router from './router'
-import store from './store'
-import ElementPlus from 'element-plus'
-import 'element-plus/dist/index.css'
-import './assets/css/icon.css'
-import './assets/font/iconfont.css'
-import 'default-passive-events'
-import 'virtual:windi.css'
-import dialogDrag from '/@/assets/js/dialogDrag.js' // 地址就是dialogDrag.js在位置
-import * as ElementPlusIconsVue from '@element-plus/icons-vue'
-import {
-    ElMessage
-} from 'element-plus'
+import { createApp } from "vue";
+import App from "./App.vue";
+import router from "./router";
+import store from "./store";
+import ElementPlus from "element-plus";
+import "element-plus/dist/index.css";
+import "./assets/css/icon.css";
+import "./assets/font/iconfont.css";
+import "default-passive-events";
+import "virtual:windi.css";
+import dialogDrag from "/@/assets/js/dialogDrag.js"; // 地址就是dialogDrag.js在位置
+import * as ElementPlusIconsVue from "@element-plus/icons-vue";
+import { ElMessage } from "element-plus";
 
 // 引入请求工具
 import axios from "@api/axios2";
 
 // 引入基础工具
 import basicTool from "@tools/basicTool";
-
+import "./permission";
 /**
  * 对 Date 的扩展，将 Date 转化为指定格式的字符串
  * @param {String} fmt 传入一个字符串，根据所传字符串的格式返回转换后特定格式的日期。
  * 调用姿势：new Date().formatDate("yyyy-MM-dd hh:mm:ss");
  */
 Date.prototype.formatDate = function (fmt) {
-    let o = {
-        "M+": this.getMonth() + 1, //月份 
-        "d+": this.getDate(), //日 
-        "h+": this.getHours(), //小时 
-        "m+": this.getMinutes(), //分 
-        "s+": this.getSeconds(), //秒 
-        "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
-        "S": this.getMilliseconds() //毫秒 
-    };
-    if (/(y+)/.test(fmt)) {
-        fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    }
-    for (let k in o) {
-        if (new RegExp("(" + k + ")").test(fmt)) {
-            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-        }
-
+  let o = {
+    "M+": this.getMonth() + 1, //月份
+    "d+": this.getDate(), //日
+    "h+": this.getHours(), //小时
+    "m+": this.getMinutes(), //分
+    "s+": this.getSeconds(), //秒
+    "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+    S: this.getMilliseconds(), //毫秒
+  };
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(
+      RegExp.$1,
+      (this.getFullYear() + "").substr(4 - RegExp.$1.length)
+    );
+  }
+  for (let k in o) {
+    if (new RegExp("(" + k + ")").test(fmt)) {
+      fmt = fmt.replace(
+        RegExp.$1,
+        RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+      );
     }
-    return fmt;
-}
+  }
+  return fmt;
+};
 
 const VUE = createApp(App);
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-    VUE.component(key, component)
+  VUE.component(key, component);
 }
 
-const messageToast = () => { //作为eventListener时, 必须使用外部定义函数
-    ElMessage.error('5秒内请勿重复点击')
-}
+const messageToast = () => {
+  //作为eventListener时, 必须使用外部定义函数
+  ElMessage.error("5秒内请勿重复点击");
+};
 /**阻止多次重复点击指令  延时暂定5秒 示例 v-prevdbclick:arg='func' */
 const funListener = (el, binding) => {
-    let time = null
-    el.removeEventListener('click', messageToast)
-    el.addEventListener('click', () => {
-        binding.value()
-        el.addEventListener('click', messageToast, false)
-        time = setTimeout(() => {
-            clearTimeout(time)
-            funListener(el, binding)
-        }, Number(binding.arg) || 5000)
-    }, {
-        once: true
-    })
-}
-VUE.directive('prevdbclick', {
-    mounted(el, binding) {
-        funListener(el, binding)
+  let time = null;
+  el.removeEventListener("click", messageToast);
+  el.addEventListener(
+    "click",
+    () => {
+      binding.value();
+      el.addEventListener("click", messageToast, false);
+      time = setTimeout(() => {
+        clearTimeout(time);
+        funListener(el, binding);
+      }, Number(binding.arg) || 5000);
+    },
+    {
+      once: true,
     }
-})
+  );
+};
+VUE.directive("prevdbclick", {
+  mounted(el, binding) {
+    funListener(el, binding);
+  },
+});
 
 window.__STATICVUE__ = VUE;
 
 window.__STATICVUE__.use(router).use(store).use(dialogDrag).use(ElementPlus, {
-    size: 'small'
+  size: "small",
 });
 window.__STATICVUE__.config.globalProperties.API = axios; //全局注册
 window.__STATICVUE__.config.globalProperties.BASE = basicTool; //全局注册
 
-window.__STATICVUE__.mount('#app');
+window.__STATICVUE__.mount("#app");

src/pages/Login.vue

@@ -9,7 +9,7 @@
       <div class="ms-title">
         <div style="margin-bottom: 20px">发电能力分析平台</div>
         <div style="padding-bottom: 40px; font-size: 30px">
-          ZhiNeng YuJing FenXi PingTai
+          FaDian NengLi FenXi PingTai
         </div>
       </div>
       <div class="ms-login">
@@ -28,7 +28,7 @@
               placeholder="请输入用户名"
             >
               <template #prepend>
-                <el-button icon="el-icon-user"></el-button>
+                <el-button :icon="User"></el-button>
               </template>
             </el-input>
           </el-form-item>
@@ -41,7 +41,7 @@
               @keyup.enter="submitForm()"
             >
               <template #prepend>
-                <el-button icon="el-icon-lock"></el-button>
+                <el-button :icon="Lock"></el-button>
               </template>
             </el-input>
           </el-form-item>
@@ -58,13 +58,13 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, onMounted, defineComponent } from "vue";
 import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import { JSEncrypt } from "jsencrypt";
-import { loginRequest, getPublickey } from "/@/api/api.js";
-import BASE from "@tools/basicTool";
+import { loginRequest, Login, getUserinfo } from "/@/api/api.js";
+import { Lock, User } from "@element-plus/icons-vue";
 const router = useRouter();
 const login = ref(null);
 const store = useStore();
@@ -72,46 +72,29 @@ const userInfo = reactive({
   username: "",
   password: "",
 });
-
+defineComponent(() => {
+  return Search;
+});
 const rules = {
   username: [{ required: true, message: "请输入用户名", trigger: "blur" }],
   password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-  // password: [{ validator: BASE.elCkeck.validatePass, trigger: 'blur' }],
 };
 
-onMounted(async () => {
-  await getkey();
-  store.commit("clearTags");
-  //使用
-  const locationHeBei =await GetQueryString('u')
-  console.warn(locationHeBei);
-  if (locationHeBei) {
-    userInfo.username = 'admin';
-    userInfo.password = 'admin';
-    loginFun();
-  }
-});
-// 截取URL字段属性 
-const GetQueryString = (name) => {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-    var r = window.location.search.substr(1).match(reg);
-    if (r != null) return unescape(r[2]);
-    return null;
-}
-// 获取公钥
-const getkey = async () => {
-  const key = await getPublickey();
-  sessionStorage.setItem("publicKey", key);
-  console.warn(key);
-};
+onMounted(async () => {});
 // 利用jsencrypt.js进行RSA加密
 const encryptionByPublickey = (formData) => {
   let key = sessionStorage.getItem("publicKey");
   var encrypt = new JSEncrypt();
   encrypt.setPublicKey(key);
+
   var result = encrypt.encrypt(JSON.stringify(formData));
   return result;
 };
+
+const toUtf8 = (str) => {
+  return new TextEncoder("utf8").encode(str);
+};
+
 const submitForm = () => {
   login.value.validate((valid) => {
     if (valid) {
@@ -123,28 +106,22 @@ const submitForm = () => {
   });
 };
 const loginFun = async () => {
-
-  let requestWrapper = {
-    publicKey: sessionStorage.getItem("publicKey"),
-    data: encryptionByPublickey(userInfo),
-  };
-  const res = await loginRequest(requestWrapper);
-  console.warn(res);
-  if (res.status == 20000) {
-    ElMessage.success("登录成功");
-    sessionStorage.setItem("ms_username", res.data.userName);
-    sessionStorage.setItem("ms_chinesename", res.data.chineseName);
-    sessionStorage.setItem("ms_id", res.data.id);
-    sessionStorage.setItem("token", res.token);
-    sessionStorage.setItem("identity", res.data.identity);
+  const { data: res, msg, code } = await loginRequest({ ...userInfo });
+  if (code == 0) {
+    store.commit("user/SET_TOKEN", res);
+    Login({ userId: res.userId, token: res.accessToken }).then((res) => {
+      if (res.code == 0&&res.data.code==200) {
+        ElMessage.success("登录成功");
+        router.push("/");
+      }
+    });
   } else {
-    ElMessage.error(res.msg);
+    ElMessage.error(msg);
   }
-  router.push("/");
 };
 </script>
 
-<style  lang="scss"  scoped>
+<style lang="scss" scoped>
 .login-wrap {
   position: relative;
   width: 100%;

src/pages/check/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <div>
+    <!-- <el-upload></el-upload> -->
+  </div>
+</template>
+
+<script>
+import { decrypt } from "@/utils/jsencrypt.js";
+import { loginRequest, Login } from "/@/api/api.js";
+import { ElMessage } from "element-plus";
+import store from "@/store/index.js";
+import router from "@/router/index.js";
+export default {
+  data() {
+    return {
+      userName: "",
+      mark: "",
+      publickey: "",
+    };
+  },
+  created() {
+    this.checkUser();
+  },
+  methods: {
+    //先获取密钥，再去认证username和mark
+    // async getKey() {
+    //   this.publickey = await getPublickey();
+    //   sessionStorage.setItem("publicKey", this.publickey);
+    //   this.checkUser();
+    // },
+
+    async checkUser() {
+      const username = this.$route.query.username;
+      const a = decodeURIComponent(this.$route.query.jiami).replace(/\s/g, "+");
+      const password = decrypt(a);
+      //判断传过来的username和mark是否为空值，如果是，则弹出身份验证不合法
+      if (username == null || password == null) {
+        ElMessage.error("身份验证不合法！");
+      } else {
+        const {
+          data: res,
+          msg,
+          code,
+        } = await loginRequest({ username, password });
+        if (code == 0) {
+          store.commit("user/SET_TOKEN", res);
+
+          Login({ userId: res.userId, token: res.accessToken }).then((res) => {
+            if (res.code == 0&&res.data.code==200) {
+              ElMessage.success("登录成功");
+              router.push("/");
+            }
+          });
+        } else {
+          ElMessage.error(msg);
+        }
+      }
+    },
+  },
+};
+</script>

src/pages/dataAnalysis/angleAnalysis/index.vue

@@ -102,43 +102,76 @@ const funSubmit = async (params) => {
 	if(res.code !== 200){
 		return false
 	}
-	const tsArr = res.data.time
-	let yp1 = [], yp2 = [], yp3 = []
-	res.data.angle.forEach(val => {
-		yp1 = val.yp1
-		yp2 = val.yp2
-		yp3 = val.yp3
-	});
-	xAxisData.value = tsArr
-	seriesData.value = [
-		{
-			name: "叶片一",
-			type: "line",
-			symbol: "line", //设定为实心点
-			symbolSize: 0, //设定实心点的大小
-			smooth: false, //这个是把线变成曲线
-			data: yp1,
-			xAxisIndex: 0,
-		},
-		{
-			name: "叶片二",
-			type: "line",
-			symbol: "line", //设定为实心点
-			symbolSize: 0, //设定实心点的大小
-			smooth: false, //这个是把线变成曲线
-			data: yp2,
-			xAxisIndex: 0,
-		},
-		{
-			name: "叶片三",
-			type: "line",
-			symbol: "line", //设定为实心点
-			symbolSize: 0, //设定实心点的大小
-			smooth: false, //这个是把线变成曲线
-			data: yp3,
-			xAxisIndex: 0,
-		},
-	]
+
+	let exTime = []
+	let yp1 = [], yp2 = []
+	res.data.bw.forEach(it =>{
+		exTime.push(it.time)
+		yp1.push(it.value)
+	})
+	res.data.tj.forEach(it =>{
+		yp2.push(it.value)
+	})
+	xAxisData.value = exTime
+
+
+	//const tsArr = res.data.time
+	//let yp1 = [], yp2 = [], yp3 = []
+	//res.data.angle.forEach(val => {
+	//	yp1 = val.yp1
+	//	yp2 = val.yp2
+	//	yp3 = val.yp3
+	//});
+	//xAxisData.value = tsArr
+//            seriesData.value = [
+//            {
+//                name: "叶片一",
+//                        type: "line",
+//                    symbol: "line", //设定为实心点
+//                    symbolSize: 0, //设定实心点的大小
+//                    smooth: false, //这个是把线变成曲线
+//                    data: yp1,
+//                    xAxisIndex: 0,
+//            },
+//            {
+//                name: "叶片二",
+//                        type: "line",
+//                    symbol: "line", //设定为实心点
+//                    symbolSize: 0, //设定实心点的大小
+//                    smooth: false, //这个是把线变成曲线
+//                    data: yp2,
+//                    xAxisIndex: 0,
+//            },
+//            {
+//                name: "叶片三",
+//                        type: "line",
+//                    symbol: "line", //设定为实心点
+//                    symbolSize: 0, //设定实心点的大小
+//                    smooth: false, //这个是把线变成曲线
+//                    data: yp3,
+//                    xAxisIndex: 0,
+//            },
+//	]
+		seriesData.value = [
+			{
+				name: "并网",
+				type: "line",
+				symbol: "line", //设定为实心点
+				symbolSize: 0, //设定实心点的大小
+				smooth: false, //这个是把线变成曲线
+				data: yp1,
+				xAxisIndex: 0,
+			},
+			{
+				name: "停机",
+				type: "line",
+				symbol: "line", //设定为实心点
+				symbolSize: 0, //设定实心点的大小
+				smooth: false, //这个是把线变成曲线
+				data: yp2,
+				xAxisIndex: 0,
+			}
+		]
 }
 /**created */
 // funGetTree()

src/pages/dataAnalysis/combine/index.vue

@@ -331,7 +331,7 @@ const funChartSelect = async (batch) => {
 					yDataArr.push(dataSetObj[1].source[scatterIndex].k)
 				}
 			}
-			const wtRes = await request.get('/power/fitting/filter', { params: { yk: yDataArr.join(','), wk: wDataArr.join(',') } })
+			const wtRes = await request.get('/power/fitting/filter', { params: { yk: yDataArr.join(','), wk: wDataArr.join(','), only: dataRadom.value } })
 			if (wtRes.code === 200) {
 				let id = 1
 				const tempArr = [] //用于以风机id 聚合dataArr
@@ -464,10 +464,43 @@ const funChartArea = () => {
 		}
 	}
 }
+const handleClick = (val) =>{
+    wtTab.value = val.props.name
+    if (wtTab.value === 'problem') {
+        faultDataFn()
+    } else if (wtTab.value === 'warning') {
+        warnDataFn()
+    }
+}
+
+//故障数据
+const faultDataFn = async() =>{
+    let params = {
+        only: dataRadom.value,
+        table: 'alarmWt'
+    }
+    const faultRes = await request.get('/power/fitting/alarms', { params: params })
+    faultData.value = faultRes.data
+}
+//预警数据
+const warnDataFn = async() =>{
+    let params = {
+        only: dataRadom.value,
+        table: 'alarmCt'
+    }
+    const warnRes = await request.get('/power/fitting/alarms', { params: params })
+    warnData.value = warnRes.data
+}
+
+
 /**dialog 数据 */
 const wtDialog = ref(false)
 const wtData = ref([])
+const faultData = ref([])
+const warnData = ref([])
 const wtTab = ref('table')
+// 随机数
+const dataRadom = ref(null)
 /**tab  */
 const activeTab = ref('1')
 /**created */
@@ -475,6 +508,7 @@ const activeTab = ref('1')
 // funGetProcessTree()
 /**mounted */
 onMounted(() => {
+    dataRadom.value = (new Date().getTime()).toString()
 	tableHeight.value = window.innerHeight - 314 + 'px'
 	excelHeight.value =(window.innerHeight - 270) / 2 + 'px'
 	treeHeight.value = (window.innerHeight - 270) / 2 + 'px'
@@ -501,7 +535,7 @@ onActivated(() => {
 		<search-cop class="mb-[20px]  shadow rounded-[6px] shadow-blue-500" @submit="funSubmit">
 		</search-cop>
 		<el-dialog v-model="wtDialog" draggable title="风机功率点位">
-			<el-tabs v-model="wtTab">
+			<el-tabs v-model="wtTab" @tab-click="handleClick">
 				<el-tab-pane label="数据" name="table">
 					<el-table :data="wtData" row-key="id" :max-height="550">
 						<el-table-column property="wtId" align="center" label="风机" />
@@ -512,11 +546,31 @@ onActivated(() => {
 						<el-table-column property="filter" sortable align="center" label="是否有用点" />
 					</el-table>
 				</el-tab-pane>
-				<el-tab-pane label="故障" name="problem" disabled>
-
+				<el-tab-pane label="故障" name="problem">
+                    <el-table :data="faultData" row-key="id" :max-height="550">
+						<el-table-column property="deviceId" align="center" label="风机" />
+						<el-table-column property="ts" sortable :width="160" align="center" label="时间">
+                            <template v-slot="scope">
+                                {{new Date(scope.row.ts).formatDate("yyyy-MM-dd hh:mm:ss")}}
+                            </template>
+                        </el-table-column>
+						<el-table-column property="characteristic" sortable align="center" label="特性" />
+						<el-table-column property="components" sortable align="center" label="部件" />
+						<el-table-column property="description" sortable align="center" label="描述" />
+					</el-table>
 				</el-tab-pane>
-				<el-tab-pane label="预警" name="warning" disabled>
-
+				<el-tab-pane label="预警" name="warning">
+                    <el-table :data="warnData" row-key="id" :max-height="550">
+						<el-table-column property="deviceId" align="center" label="风机" />
+						<el-table-column property="ts" sortable :width="160" align="center" label="时间" >
+                            <template v-slot="scope">
+                                {{new Date(scope.row.ts).formatDate("yyyy-MM-dd hh:mm:ss")}}
+                            </template>
+                        </el-table-column>
+						<el-table-column property="characteristic" sortable align="center" label="特性" />
+						<el-table-column property="components" sortable align="center" label="部件" />
+						<el-table-column property="description" sortable align="center" label="描述" />
+					</el-table>
 				</el-tab-pane>
 			</el-tabs>
 		</el-dialog>

src/pages/dataAnalysis/hotAnalysis/index.vue

@@ -207,8 +207,8 @@ const funSubmit = async () => {
 	if (tempRes.code === 200) {
 		if (tempRes.data?.length) {
 			for (const chart of tempRes.data) {
-				powerproduction.value = `（额定功率=${chart.power.powerproduction}kW）` 
-				powerproductionNum.value = chart.power.powerproduction
+				powerproduction.value = `（额定功率=${chart.power.powerProduction}kW）` 
+				powerproductionNum.value = chart.power.powerProduction
 				barxAxis.data = Object.keys(chart.res1)
 				barSeries[0].data = Object.values(chart.res1)
 				barSeries[0].markLine.data = [{
@@ -641,7 +641,7 @@ const funDiaSubmit = async () => {
 							isBrush: false,
 							actCop: shallowRef(barChartCop),
 							title: chart.wt,
-							subtext: `平均功率-额定功率（额定功率=${chart.power.powerproduction}kW）`,
+							subtext: `平均功率-额定功率（额定功率=${chart.power.powerProduction}kW）`,
 							xAxis: {
 								...barxAxis,
 								data: Object.keys(chart.res1)
@@ -673,7 +673,7 @@ const funDiaSubmit = async () => {
 							isBrush: false,
 							actCop: shallowRef(lineChartCop),
 							title: chart.wt,
-							subtext: `额定功率温度分析（额定功率=${chart.power.powerproduction}kW）`,
+							subtext: `额定功率温度分析（额定功率=${chart.power.powerProduction}kW）`,
 							xAxis: linexAxis,
 							yAxis: lineyAxis,
 							dataset: lineDataSet,
@@ -698,7 +698,7 @@ const funDiaSubmit = async () => {
 											color: '#F72C5B'
 										},
 										data: [{
-											yAxis: chart.power.powerproduction,
+											yAxis: chart.power.powerProduction,
 										}]
 									}
 								}

src/pages/dataAnalysis/lineAnalysis/index.vue

@@ -128,7 +128,7 @@ const funSubmit = async () => {
 			for(const wtObj of res.data.sjgl){
 				seriesData.value.push(
 					{
-						name: wtObj.obj.windturbine + "\n实际功率",
+						name: wtObj.obj.windturbineId + "\n实际功率",
 						type: "line",
 						symbol: "line", //设定为实心点
 						symbolSize: 0, //设定实心点的大小

src/permission.js

@@ -0,0 +1,29 @@
+import router from "./router";
+import { getCookie } from "@/utils/auth"; // getToken from cookie
+const whiteList = ["/login", "/logout", '/check']; // 不重定向白名单
+import store from "@/store";
+
+router.beforeEach((to, from, next) => {
+    document.title = `${to.meta.title} | 发电能力分析平台`;
+    const token = getCookie("accessToken");
+    //   const role = sessionStorage.getItem("ms_chinesename");
+    if (token) {
+        if (to.path == "/login") {
+            next("/");
+        } else {
+            if (store.getters.roles.length == 0) {
+                store.dispatch("user/GetInfo").then(async () => {
+                    next();
+                });
+            } else {
+                next();
+            }
+        }
+    } else if (whiteList.indexOf(to.path) !== -1) {
+        next();
+    } else {
+        next(`/login?redirect=${to.fullPath}`);
+    }
+});
+
+router.afterEach((to, from, next) => {});

src/router/index.js

@@ -1,258 +1,235 @@
-import { createRouter, createWebHistory, createWebHashHistory } from 'vue-router'
-import Home from '../pages/Home.vue'
-const routes = [{
-    path: '/',
-    redirect: '/dataFilter/prepare',
-},
-{
-    path: '/',
-    name: 'Home',
-    redirect: '/dataFilter/prepare',
+import {
+  createRouter,
+  createWebHistory,
+  createWebHashHistory,
+} from "vue-router";
+import Home from "../pages/Home.vue";
+const routes = [
+  {
+    path: "/",
+    redirect: "/dataFilter/prepare",
+  },
+  {
+    path: "/",
+    name: "Home",
+    redirect: "/dataFilter/prepare",
     component: Home,
     children: [
-        {
-            icon: 'iconfont iconbaojingpeizhi',
-            path: '/dataFilter',
-            name: 'dataFilter',
-            redirect: '/dataFilter/prepare',
+      {
+        icon: "iconfont iconbaojingpeizhi",
+        path: "/dataFilter",
+        name: "dataFilter",
+        redirect: "/dataFilter/prepare",
+        meta: {
+          title: "数据准备",
+        },
+        component: () => import("../pages/routerViewss.vue"),
+        children: [
+          {
+            icon: "el-icon-s-home",
+            path: "/dataFilter/prepare",
+            name: "dataFilterPrepare",
+            meta: {
+              title: "风电数据准备",
+            },
+            component: () => import("../pages/dataFilter/prepare/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataFilter/process",
+            name: "dataFilterProcess",
+            meta: {
+              title: "风电数据处理",
+            },
+            component: () => import("../pages/dataFilter/process/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataFilter/lightPrepare",
+            name: "dataFilterLightPrepare",
             meta: {
-                title: '数据准备',
+              title: "光伏数据准备",
             },
             component: () =>
-                import(
-                    '../pages/routerViewss.vue'
-                ),
-            children: [
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataFilter/prepare',
-                    name: 'dataFilterPrepare',
-                    meta: {
-                        title: '风电数据准备',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataFilter/prepare/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataFilter/process',
-                    name: 'dataFilterProcess',
-                    meta: {
-                        title: '风电数据处理',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataFilter/process/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataFilter/lightPrepare',
-                    name: 'dataFilterLightPrepare',
-                    meta: {
-                        title: '光伏数据准备',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataFilter/lightPrepare/index.vue'
-                        ),
-                },
-            ]
+              import("../pages/dataFilter/lightPrepare/index.vue"),
+          },
+        ],
+      },
+      {
+        icon: "iconfont iconbaojingpeizhi",
+        path: "/dataAnalysis",
+        name: "dataAnalysis",
+        redirect: "/dataAnalysis/combine",
+        meta: {
+          title: "风电分析",
         },
-        {
-            icon: 'iconfont iconbaojingpeizhi',
-            path: '/dataAnalysis',
-            name: 'dataAnalysis',
-            redirect: '/dataAnalysis/combine',
+        component: () => import("../pages/routerViewss.vue"),
+        children: [
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/combine",
+            name: "dataAnalysis",
+            meta: {
+              title: "功率曲线拟合分析",
+            },
+            component: () => import("../pages/dataAnalysis/combine/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/rateAnalysis",
+            name: "dataAnalysisRateAnalysis",
             meta: {
-                title: '风电分析',
+              title: "对风偏差分析",
             },
             component: () =>
-                import(
-                    '../pages/routerViewss.vue'
-                ),
-            children: [
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/combine',
-                    name: 'dataAnalysis',
-                    meta: {
-                        title: '功率曲线拟合分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/combine/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/rateAnalysis',
-                    name: 'dataAnalysisRateAnalysis',
-                    meta: {
-                        title: '对风偏差分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/rateAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/lineAnalysis',
-                    name: 'dataAnalysislineAnalysis',
-                    meta: {
-                        title: '曲线偏差率分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/lineAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/hotAnalysis',
-                    name: 'dataAnalysisthotAnalysis',
-                    meta: {
-                        title: '温度与功率分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/hotAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/windAnalysis',
-                    name: 'dataAnalysisWindAnalysis',
-                    meta: {
-                        title: '损失电量分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/windAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/posAnalysis',
-                    name: 'dataAnalysisPosAnalysis',
-                    meta: {
-                        title: '微观选址分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/posAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/spaceAnalysis',
-                    name: 'dataAnalysisspaceAnalysis',
-                    meta: {
-                        title: '毛容量分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/spaceAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/angleAnalysis',
-                    name: 'dataAnalysisAngleAnalysis',
-                    meta: {
-                        title: '浆距角分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/angleAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/dataAnalysis/agcAnalysis',
-                    name: 'dataAnalysisAgcAnalysis',
-                    meta: {
-                        title: 'AGC曲线偏差分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/dataAnalysis/agcAnalysis/index.vue'
-                        ),
-                },
-            ]
-        },
-        {
-            icon: 'iconfont iconbaojingpeizhi',
-            path: '/lightAnalysis',
-            name: 'lightAnalysis',
-            redirect: '/lightAnalysis/glAnalysis',
+              import("../pages/dataAnalysis/rateAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/lineAnalysis",
+            name: "dataAnalysislineAnalysis",
+            meta: {
+              title: "曲线偏差率分析",
+            },
+            component: () =>
+              import("../pages/dataAnalysis/lineAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/hotAnalysis",
+            name: "dataAnalysisthotAnalysis",
+            meta: {
+              title: "温度与功率分析",
+            },
+            component: () =>
+              import("../pages/dataAnalysis/hotAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/windAnalysis",
+            name: "dataAnalysisWindAnalysis",
+            meta: {
+              title: "损失电量分析",
+            },
+            component: () =>
+              import("../pages/dataAnalysis/windAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/posAnalysis",
+            name: "dataAnalysisPosAnalysis",
+            meta: {
+              title: "微观选址分析",
+            },
+            component: () =>
+              import("../pages/dataAnalysis/posAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/spaceAnalysis",
+            name: "dataAnalysisspaceAnalysis",
+            meta: {
+              title: "毛容量分析",
+            },
+            component: () =>
+              import("../pages/dataAnalysis/spaceAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/angleAnalysis",
+            name: "dataAnalysisAngleAnalysis",
+            meta: {
+              title: "浆距角分析",
+            },
+            component: () =>
+              import("../pages/dataAnalysis/angleAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/dataAnalysis/agcAnalysis",
+            name: "dataAnalysisAgcAnalysis",
             meta: {
-                title: '光伏分析',
+              title: "AGC曲线偏差分析",
             },
             component: () =>
-                import(
-                    '../pages/routerViewss.vue'
-                ),
-            children: [
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/lightAnalysis/glAnalysis',
-                    name: 'glAnalysis',
-                    meta: {
-                        title: '功率曲线分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/lightAnalysis/glAnalysis/index.vue'
-                        ),
-                },
-                {
-                    icon: 'el-icon-s-home',
-                    path: '/lightAnalysis/glHotAnalysis',
-                    name: 'glHotAnalysis',
-                    meta: {
-                        title: '功率光照曲线分析',
-                    },
-                    component: () =>
-                        import(
-                            '../pages/lightAnalysis/glHotAnalysis/index.vue'
-                        ),
-                },
-            ]
+              import("../pages/dataAnalysis/agcAnalysis/index.vue"),
+          },
+        ],
+      },
+      {
+        icon: "iconfont iconbaojingpeizhi",
+        path: "/lightAnalysis",
+        name: "lightAnalysis",
+        redirect: "/lightAnalysis/glAnalysis",
+        meta: {
+          title: "光伏分析",
         },
+        component: () => import("../pages/routerViewss.vue"),
+        children: [
+          {
+            icon: "el-icon-s-home",
+            path: "/lightAnalysis/glAnalysis",
+            name: "glAnalysis",
+            meta: {
+              title: "功率曲线分析",
+            },
+            component: () =>
+              import("../pages/lightAnalysis/glAnalysis/index.vue"),
+          },
+          {
+            icon: "el-icon-s-home",
+            path: "/lightAnalysis/glHotAnalysis",
+            name: "glHotAnalysis",
+            meta: {
+              title: "功率光照曲线分析",
+            },
+            component: () =>
+              import("../pages/lightAnalysis/glHotAnalysis/index.vue"),
+          },
+        ],
+      },
     ],
-},
+  },
 
-// {
-//     path: '/login',
-//     name: 'Login',
-//     meta: {
-//         title: '登录',
-//     },
-//     component: () =>
-//         import(
-//             /* webpackChunkName: "login" */
-//             '../pages/Login.vue'
-//         ),
-// },
-]
+  {
+    path: "/login",
+    name: "Login",
+    meta: {
+      title: "登录",
+    },
+    component: () =>
+      import(
+        /* webpackChunkName: "login" */
+        "../pages/Login.vue"
+      ),
+  },
+  {
+    path: "/check",
+    name: "Check",
+    meta: {
+      title: "单点登录",
+    },
+    component: () =>
+      import(
+        /* webpackChunkName: "login" */
+        "@/pages/check/index.vue"
+      ),
+  },
+];
 
 const router = createRouter({
-    history: createWebHashHistory(''),
-    routes,
-})
+  history: createWebHashHistory(""),
+  routes,
+});
 
 router.beforeEach((to, from, next) => {
-    document.title = `${to.meta.title} | 发电能力分析平台`
-    // const role = sessionStorage.getItem('ms_chinesename')
-    // if (!role && to.path !== '/login') {
-    //     next('/login')
-    // } else {
-        next()
-    // }
-})
+  document.title = `${to.meta.title} | 发电能力分析平台`;
+  // const role = sessionStorage.getItem('ms_chinesename')
+  // if (!role && to.path !== '/login') {
+  //     next('/login')
+  // } else {
+  next();
+  // }
+});
 
-export default router
+export default router;

src/store/getters.js

@@ -0,0 +1,10 @@
+const getters = {
+  roles: (state) => state.user.roles,
+  permissions: (state) => state.user.permissions,
+  authToken: (state) => state.user.authToken, //建立token的快捷访问   user 是因为index.js中导入的时候名称定义为user
+  username: (state) => state.user.username,
+  isStation(state) {
+    return state.stationList.length == 1;
+  },
+};
+export default getters;

src/store/index.js

@@ -1,271 +1,256 @@
-import { createStore } from 'vuex'
-
+import { createStore } from "vuex";
+import user from "@/store/modules/user";
+import getter from "./getters";
 export default createStore({
-    state: {
-        tagsList: [],
-        collapse: true,
-        //stationList
-        stationList: [],
-        stationListAll: [],
-        //实时报警
-        warningList: [],
-        //是否存在实时报警轮询
-        warnInterval: null,
-        //是否启用报警弹窗
-        enableWarn: false,
-        //报警弹窗持续时间
-        warnTime: 0,
+  state: {
+    tagsList: [],
+    collapse: true,
+    //stationList
+    stationList: [],
+    stationListAll: [],
+    //实时报警
+    warningList: [],
+    //是否存在实时报警轮询
+    warnInterval: null,
+    //是否启用报警弹窗
+    enableWarn: false,
+    //报警弹窗持续时间
+    warnTime: 0,
 
-        // setp 步骤条
-        stepArray: [
-            {
-                title: "方案",
-                dec: "方案选择",
-                icon: "el-icon-edit-outline",
-                isPass: false,
-            },
-            {
-                title: "环境",
-                dec: "环境配置",
-                icon: "el-icon-s-promotion",
-                isPass: false,
-            },
-            {
-                title: "数据",
-                dec: "获取数据",
-                icon: "el-icon-upload",
-                isPass: false,
-            },
-            { title: "训练", dec: "训练模型", icon: "el-icon-cpu", isPass: false },
-            {
-                title: "评估",
-                dec: "评估模型",
-                icon: "el-icon-s-opportunity",
-                isPass: false,
-            },
-            {
-                title: "模型",
-                dec: "保存模型",
-                icon: "el-icon-receiving",
-                isPass: false,
-            },
-        ],
+    // setp 步骤条
+    stepArray: [
+      {
+        title: "方案",
+        dec: "方案选择",
+        icon: "el-icon-edit-outline",
+        isPass: false,
+      },
+      {
+        title: "环境",
+        dec: "环境配置",
+        icon: "el-icon-s-promotion",
+        isPass: false,
+      },
+      {
+        title: "数据",
+        dec: "获取数据",
+        icon: "el-icon-upload",
+        isPass: false,
+      },
+      { title: "训练", dec: "训练模型", icon: "el-icon-cpu", isPass: false },
+      {
+        title: "评估",
+        dec: "评估模型",
+        icon: "el-icon-s-opportunity",
+        isPass: false,
+      },
+      {
+        title: "模型",
+        dec: "保存模型",
+        icon: "el-icon-receiving",
+        isPass: false,
+      },
+    ],
 
-        // 当前激活的 step 下标
-        setpIndex: 0,
+    // 当前激活的 step 下标
+    setpIndex: 0,
 
-        // step 1 参数
-        setpOptions1: {
-            id: "", // 方案 ID
-            project: {} // 方案配置
-        },
+    // step 1 参数
+    setpOptions1: {
+      id: "", // 方案 ID
+      project: {}, // 方案配置
+    },
 
-        // step 2 参数
-        setpOptions2: {
-            id: "", // 配置 ID
-            host: "", // GPU 服务器 IP
-            configName: "", // 配置名称
-            diskSize: "", // 磁盘大小
-            gpu: [], // GPU
-            totalMemory: "" // 内存大小
-        },
+    // step 2 参数
+    setpOptions2: {
+      id: "", // 配置 ID
+      host: "", // GPU 服务器 IP
+      configName: "", // 配置名称
+      diskSize: "", // 磁盘大小
+      gpu: [], // GPU
+      totalMemory: "", // 内存大小
+    },
 
-        // step 3 参数
-        setpOptions3: {
-            id: "0", // 模式 ID
-            file: null, // 本地文件
-            sqlServer: "casefault", // 选择的表名称
-            sqlWord: "", // 手动输入的 sql
-            useSourceData: true, // 是否使用原数据
-            forecastRow: "", // 要预测的列
-            inputRow: [], // 要输入的列
-            points: [], // 使用原始数据后要输入的列
-            faults: [], // 使用原始数据后表格数据
-            acc: "", // 最佳模型
-        },
+    // step 3 参数
+    setpOptions3: {
+      id: "0", // 模式 ID
+      file: null, // 本地文件
+      sqlServer: "casefault", // 选择的表名称
+      sqlWord: "", // 手动输入的 sql
+      useSourceData: true, // 是否使用原数据
+      forecastRow: "", // 要预测的列
+      inputRow: [], // 要输入的列
+      points: [], // 使用原始数据后要输入的列
+      faults: [], // 使用原始数据后表格数据
+      acc: "", // 最佳模型
+    },
 
-        // step 4 参数
-        setpOptions4: {
-            trainBtnIcon: "", // 训练按钮 icon
-            trainBtnTitle: "开始训练", // 训练按钮文本
-            trainSurplusIcon: "", // 训练时间 icon
-            trainSurplusTime: null, // 训练时间文本
-            trainBtnDisabled: false, // 训练按钮是否禁用
-            trainStatus: "", // 训练 icon 样式
-            modelname: "", // 模型名称
-        },
+    // step 4 参数
+    setpOptions4: {
+      trainBtnIcon: "", // 训练按钮 icon
+      trainBtnTitle: "开始训练", // 训练按钮文本
+      trainSurplusIcon: "", // 训练时间 icon
+      trainSurplusTime: null, // 训练时间文本
+      trainBtnDisabled: false, // 训练按钮是否禁用
+      trainStatus: "", // 训练 icon 样式
+      modelname: "", // 模型名称
+    },
 
-        // step 5 参数
-        setpOptions5: {
-            exampleData: [], // 示例数据
-            showExampleResult: false, // 显示预测结果
-            result: "", // 预测结果
-        },
+    // step 5 参数
+    setpOptions5: {
+      exampleData: [], // 示例数据
+      showExampleResult: false, // 显示预测结果
+      result: "", // 预测结果
+    },
 
-        // step 6 参数
-        setpOptions6: {
-            data: {}, // 模型
-            changZhan: "", // 场站
-            modelName: "", // 模型名称
-        },
+    // step 6 参数
+    setpOptions6: {
+      data: {}, // 模型
+      changZhan: "", // 场站
+      modelName: "", // 模型名称
+    },
 
-        // 训练控制台信息
-        progressArray: [],
-    },
-    mutations: {
-        delTagsItem(state, data) {
-            state
-                .tagsList
-                .splice(data.index, 1);
-        },
-        setTagsItem(state, data) {
-            state
-                .tagsList
-                .push(data)
-        },
-        clearTags(state) {
-            state.tagsList = []
-        },
-        closeTagsOther(state, data) {
-            state.tagsList = data;
-        },
-        closeCurrentTag(state, data) {
-            for (let i = 0, len = state.tagsList.length; i < len; i++) {
-                const item = state.tagsList[i];
-                if (item.path === data.$route.fullPath) {
-                    if (i < len - 1) {
-                        data
-                            .$router
-                            .push(state.tagsList[i + 1].path);
-                    } else if (i > 0) {
-                        data
-                            .$router
-                            .push(state.tagsList[i - 1].path);
-                    } else {
-                        data
-                            .$router
-                            .push("/");
-                    }
-                    state
-                        .tagsList
-                        .splice(i, 1);
-                    break;
-                }
-            }
-        },
-        // 侧边栏折叠
-        hadndleCollapse(state, data) {
-            state.collapse = data;
-        },
-        // stationList
-        setStationList(state, data) {
-            state.stationList = data;
-        },
-        setStationListAll(state, data) {
-            state.stationListAll = data;
-        },
-        // --------------------------------------------------------------------
-        //实时报警
-        setWarning(state, data) {
-            state.warningList.unshift(data);
-        },
-        //是否存在实时报警轮询
-        setWarnInterval(state, data) {
-            state.warnInterval = data;
-        },
-        //是否启用报警弹窗
-        setEnableWarn(state, data) {
-            state.enableWarn = data;
-        },
-        setWarnTime(state, data) {
-            state.warnTime = data;
-        },
+    // 训练控制台信息
+    progressArray: [],
+  },
+  mutations: {
+    delTagsItem(state, data) {
+      state.tagsList.splice(data.index, 1);
+    },
+    setTagsItem(state, data) {
+      state.tagsList.push(data);
+    },
+    clearTags(state) {
+      state.tagsList = [];
+    },
+    closeTagsOther(state, data) {
+      state.tagsList = data;
+    },
+    closeCurrentTag(state, data) {
+      for (let i = 0, len = state.tagsList.length; i < len; i++) {
+        const item = state.tagsList[i];
+        if (item.path === data.$route.fullPath) {
+          if (i < len - 1) {
+            data.$router.push(state.tagsList[i + 1].path);
+          } else if (i > 0) {
+            data.$router.push(state.tagsList[i - 1].path);
+          } else {
+            data.$router.push("/");
+          }
+          state.tagsList.splice(i, 1);
+          break;
+        }
+      }
+    },
+    // 侧边栏折叠
+    hadndleCollapse(state, data) {
+      state.collapse = data;
+    },
+    // stationList
+    setStationList(state, data) {
+      state.stationList = data;
+    },
+    setStationListAll(state, data) {
+      state.stationListAll = data;
+    },
+    // --------------------------------------------------------------------
+    //实时报警
+    setWarning(state, data) {
+      state.warningList.unshift(data);
+    },
+    //是否存在实时报警轮询
+    setWarnInterval(state, data) {
+      state.warnInterval = data;
+    },
+    //是否启用报警弹窗
+    setEnableWarn(state, data) {
+      state.enableWarn = data;
+    },
+    setWarnTime(state, data) {
+      state.warnTime = data;
+    },
 
-        changeStepArray(state, data) {
-            state.stepArray = data;
-        },
+    changeStepArray(state, data) {
+      state.stepArray = data;
+    },
 
-        changeSetpIndex(state, data) {
-            state.setpIndex = data;
-        },
+    changeSetpIndex(state, data) {
+      state.setpIndex = data;
+    },
 
-        setOpt1(state, data) {
-            state.setpOptions1 = data;
-        },
+    setOpt1(state, data) {
+      state.setpOptions1 = data;
+    },
 
-        setOpt2(state, data) {
-            state.setpOptions2 = data;
-        },
+    setOpt2(state, data) {
+      state.setpOptions2 = data;
+    },
 
-        setOpt3(state, data) {
-            state.setpOptions3 = data;
-        },
+    setOpt3(state, data) {
+      state.setpOptions3 = data;
+    },
 
-        setOpt4(state, data) {
-            state.setpOptions4 = data;
-        },
+    setOpt4(state, data) {
+      state.setpOptions4 = data;
+    },
 
-        setOpt5(state, data) {
-            state.setpOptions5 = data;
-        },
+    setOpt5(state, data) {
+      state.setpOptions5 = data;
+    },
 
-        setOpt6(state, data) {
-            state.setpOptions6 = data;
-        },
+    setOpt6(state, data) {
+      state.setpOptions6 = data;
+    },
 
-        setProgressArray(state, data) {
-            state.progressArray = data;
-        },
-    },
-    actions: {
-        actionsWarning(context, newData) {
-            context.commit("setWarning", newData);
-        },
-        //stationList
-        actionsStationList(context, newData) {
-            context.commit("setStationList", newData);
-        },
-        actionsStationListAll(context, newData) {
-            context.commit("setStationListAll", newData);
-        },
-        //是否存在实时报警轮询
-        actionsWarnInterval(context, newData) {
-            context.commit("setWarnInterval", newData);
-        },
+    setProgressArray(state, data) {
+      state.progressArray = data;
+    },
+  },
+  actions: {
+    actionsWarning(context, newData) {
+      context.commit("setWarning", newData);
+    },
+    //stationList
+    actionsStationList(context, newData) {
+      context.commit("setStationList", newData);
+    },
+    actionsStationListAll(context, newData) {
+      context.commit("setStationListAll", newData);
+    },
+    //是否存在实时报警轮询
+    actionsWarnInterval(context, newData) {
+      context.commit("setWarnInterval", newData);
+    },
 
-        changeStepArray() {
-            context.commit("changeStepArray", newData);
-        },
+    changeStepArray() {
+      context.commit("changeStepArray", newData);
+    },
 
-        changeSetpIndex(context, newData) {
-            context.commit("changeSetpIndex", newData);
-        },
-        setOpt1(context, newData) {
-            context.commit("setOpt1", newData);
-        },
-        setOpt2(context, newData) {
-            context.commit("setOpt2", newData);
-        },
-        setOpt3(context, newData) {
-            context.commit("setOpt3", newData);
-        },
-        setOpt4(context, newData) {
-            context.commit("setOpt4", newData);
-        },
-        setOpt5(context, newData) {
-            context.commit("setOpt5", newData);
-        },
-        setOpt6(context, newData) {
-            context.commit("setOpt6", newData);
-        },
-        setProgressArray(context, newData) {
-            context.commit("setProgressArray", newData);
-        },
-    },
-    modules: {},
-    getters: {
-        isStation(state) {
-            return state.stationList.length == 1
-        }
-    }
-})
+    changeSetpIndex(context, newData) {
+      context.commit("changeSetpIndex", newData);
+    },
+    setOpt1(context, newData) {
+      context.commit("setOpt1", newData);
+    },
+    setOpt2(context, newData) {
+      context.commit("setOpt2", newData);
+    },
+    setOpt3(context, newData) {
+      context.commit("setOpt3", newData);
+    },
+    setOpt4(context, newData) {
+      context.commit("setOpt4", newData);
+    },
+    setOpt5(context, newData) {
+      context.commit("setOpt5", newData);
+    },
+    setOpt6(context, newData) {
+      context.commit("setOpt6", newData);
+    },
+    setProgressArray(context, newData) {
+      context.commit("setProgressArray", newData);
+    },
+  },
+  modules: { user },
+  getters: getter,
+});

src/store/modules/user.js

@@ -0,0 +1,94 @@
+import {
+    getCookie,
+    setToken,
+    setUserId,
+    removeToken,
+    removeUserId,
+    setName,
+    removeName,
+} from "@/utils/auth";
+// import { Message } from "element-plus";
+import { Login, loginRequest, getUserinfo, logout } from "@/api/api";
+const state = {
+    authToken: getCookie("accessToken") || "", //
+    username: getCookie("userName") || "",
+    userId: getCookie("userId") || "",
+    roles: [],
+    permissions: [],
+};
+const mutations = {
+    REMOVE_TOKEN(state) {
+        removeToken();
+        removeUserId();
+        removeName();
+        state.roles = [];
+        state.permissions = [];
+        state.username = "";
+        state.userId = "";
+        state.authToken = "";
+    },
+    SET_TOKEN: (state, data) => {
+        state.authToken = data.accessToken;
+        state.userId = data.userId;
+        setToken(data.accessToken);
+        setUserId(data.userId);
+    },
+    SET_LOGINSTATE: (state, login) => {
+        state.loginState = login;
+        setLoginState(login);
+    },
+    SET_NAME: (state, name) => {
+        state.username = name;
+        setName(name);
+    },
+    SET_ROLES: (state, roles) => {
+        state.roles = roles;
+    },
+    SET_PERMISSIONS: (state, permissions) => {
+        state.permissions = permissions;
+    },
+};
+const actions = {
+    // 获取用户信息
+    GetInfo({ commit, state }) {
+        return new Promise((resolve, reject) => {
+            getUserinfo()
+                .then((res) => {
+                    if (res) {
+                        if (res.data.roles && res.data.roles.length > 0) {
+                            // 验证返回的roles是否是一个非空数组
+                            commit("SET_ROLES", res.data.roles);
+                            commit("SET_NAME", res.data.user.nickname);
+                            commit("SET_PERMISSIONS", res.data.permissions);
+                        } else {
+                            commit("SET_ROLES", ["ROLE_DEFAULT"]);
+                        }
+                        resolve(res.data);
+                    }
+                })
+                .catch((error) => {
+                    reject(error);
+                });
+        });
+    },
+    LogOut({ commit, state }) {
+        return new Promise((resolve, reject) => {
+            logout({ token: state.authToken, userId: state.userId })
+                .then((res) => {
+                    if (res.code == 200) {
+                        commit("REMOVE_TOKEN");
+                        resolve();
+                    }
+                })
+                .catch((error) => {
+                    reject(error);
+                });
+        });
+    },
+};
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+};

src/utils/auth.js

@@ -0,0 +1,103 @@
+import Cookies from "js-cookie";
+import dayjs from "dayjs";
+const timeKey = "hrsaas-timestamp-key";
+// 设置时间戳的存储变量
+const TokenKey = "accessToken";
+const UserIdKey = "userId";
+const Username = "userName";
+
+export function getCookie(name) {
+    return Cookies.get(name);
+}
+
+export function setCookie(name, value) {
+    return Cookies.set(name, value);
+}
+
+// cookie存储Username
+export function setName(name) {
+    return Cookies.set(Username, name);
+}
+// cookie存储token
+export function setToken(token) {
+    return Cookies.set(TokenKey, token);
+}
+// cookie存储UserId
+export function setUserId(userId) {
+    return Cookies.set(UserIdKey, userId);
+}
+
+// cookie删除token
+export function removeToken() {
+    return Cookies.remove(TokenKey);
+}
+// cookie删除UserId
+export function removeUserId() {
+    return Cookies.remove(UserIdKey);
+}
+// cookie删除Username
+export function removeName() {
+    return Cookies.remove(Username);
+}
+
+// 获取时间戳
+export function getTimeStamp() {
+    return Cookies.get(timeKey);
+}
+// 设置时间戳
+export function setTimeStamp() {
+    return Cookies.set(timeKey, Date.now());
+}
+
+// 时间格式化
+export function parseTime() {
+    var myDate = new Date();
+    const formatObj = {
+        year: myDate.getFullYear(),
+        month: myDate.getMonth() + 1 >= 10 ?
+            myDate.getMonth() + 1 :
+            "0" + (myDate.getMonth() + 1),
+        day: myDate.getDate() >= 10 ? myDate.getDate() : "0" + myDate.getDate(),
+    };
+    return formatObj.year + "-" + formatObj.month + "-" + formatObj.day;
+}
+//获取1天前时间
+export function getStampTime() {
+    let stamp1 = new Date(new Date().setHours(0, 0, 0, 0));
+    stamp1 = dayjs(stamp1).format("YYYY-MM-DD HH:mm:ss");
+    let stamp2 = new Date(new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000);
+    stamp2 = dayjs(stamp2).format("YYYY-MM-DD HH:mm:ss");
+    return {
+        startTime: stamp1,
+        endTime: stamp2,
+    };
+}
+
+export function transTreeData(arr, idStr, pidStr, chindrenStr) {
+    let r = [],
+        hash = {},
+        id = idStr,
+        pid = pidStr,
+        children = chindrenStr,
+        len = arr.length;
+    for (let i = 0; i < len; i++) {
+        hash[arr[i][id]] = arr[i];
+    }
+    for (let j = 0; j < len; j++) {
+        let aVal = arr[j],
+            hashVP = hash[aVal[pid]];
+        if (hashVP) {
+            !hashVP[children] && (hashVP[children] = []);
+            hashVP[children].push(aVal);
+        } else {
+            r.push(aVal);
+        }
+    }
+    return r;
+}
+export function checkIn(item, arr) {
+    const result = arr.find((value) => {
+        return value.name == item.meta.title;
+    });
+    return result;
+}

src/utils/jsencrypt.js

@@ -0,0 +1,29 @@
+import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
+
+// 密钥对生成 http://web.chacuo.net/netrsakeypair
+
+const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
+    'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+
+const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
+    '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
+    'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
+    'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
+    'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
+    'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
+    'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
+    'UP8iWi1Qw0Y='
+
+// 加密
+export function encrypt(txt) {
+    const encryptor = new JSEncrypt()
+    encryptor.setPublicKey(publicKey) // 设置公钥
+    return encryptor.encrypt(txt) // 对数据进行加密
+}
+
+// 解密
+export function decrypt(txt) {
+    const encryptor = new JSEncrypt()
+    encryptor.setPrivateKey(privateKey) // 设置私钥
+    return encryptor.decrypt(txt) // 对数据进行解密
+}