| build/check-versions.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| package-lock.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/left/leftmenu.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/router/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
build/check-versions.js
@@ -16,13 +16,13 @@ } ] if (shell.which('npm')) { versionRequirements.push({ name: 'npm', currentVersion: exec('npm --version'), versionRequirement: packageConfig.engines.npm }) } // if (shell.which('npm')) { // versionRequirements.push({ // name: 'npm', // currentVersion: exec('npm --version'), // versionRequirement: packageConfig.engines.npm // }) // } module.exports = function () { const warnings = [] package-lock.json
ÎļþÌ«´ó src/components/left/leftmenu.vue
@@ -11,8 +11,14 @@ >Ã</span > <img class="openLeftMenu" v-else src="@/assets/img/left/souselist4.png" /> <div class="layerTreeContainer" v-show="isShowLeftPanel"> <el-input placeholder="å¾å±å称" v-model="filterText" size="mini" > </el-input> <div class="switchbox"> <el-radio-group v-model="radio" @change="getright"> <el-radio :label="1">ç»ç»æºæ</el-radio> @@ -37,6 +43,7 @@ :render-content="renderContent" :default-expanded-keys="defaultExpanded" @check="check" :filter-node-method="filterNode" ></el-tree> </div> </div> @@ -445,6 +452,7 @@ name: "leftmenu", data() { return { filterText: "", isShowLeftPanel: false, activeName: "first", alldisabled: [], @@ -602,6 +610,10 @@ console.log("è·ååºæ¯é 置失败ï¼"); } ); }, filterNode(value, treeData) { if (!value) return true; return treeData.name.indexOf(value) !== -1; }, setTreeDataChange(res) { if (this.treeChangeFlag == res) return; @@ -2972,6 +2984,11 @@ } }, }, watch: { filterText(val) { this.$refs.tree.filter(val); }, }, }; </script> <style scoped> @@ -3002,7 +3019,9 @@ transition: 1s; z-index: 9999; } .switchbox{ margin-top: 5px; } .closeLeftMenu:hover { cursor: pointer; transform: rotateZ(90deg); @@ -3038,7 +3057,6 @@ .leftmenu:hover { background-image: url("~@/assets/img/new/treeClose-y.png"); } .leftmenu { background-image: url("~@/assets/img/new/treeClose.png"); @@ -3128,7 +3146,6 @@ border-radius: 0; background: rgba(218, 218, 218, 0.1); } .el-tree .TreeNodeClass { width: 100%; src/components/login.vue
@@ -139,54 +139,54 @@ }, // è´¦å·å¯ç ç»å½ submitForm(formName) { // this.$router.push("/index"); this.$refs[formName].validate((valid) => { if (valid) { const loading = this.$loading({ lock: true, text: "Loading", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", }); this.$router.push("/index"); // this.$refs[formName].validate((valid) => { // if (valid) { // const loading = this.$loading({ // lock: true, // text: "Loading", // spinner: "el-icon-loading", // background: "rgba(0, 0, 0, 0.7)", // }); login({ username: this.loginForm.loginname, password: this.loginForm.password, }) .then((res) => { loading.close(); if (res.code !== 200) { this.$message.error(res.msg); } else { let tokenData = res.token; let times = new Date().getTime(); window.localStorage.setItem("TokenTime", times); window.localStorage.setItem("TokenKey", tokenData); this.$router.push("/index"); } }) .catch((error) => { //ç½ç»è¶ æ¶å¼å¸¸å¤ç loading.close(); if ( error.code === "ECONNABORTED" || error.message === "Network Error" || error.message.includes("timeout") ) { this.$message.error("请æ±è¶ æ¶ï¼è¯·ç¨åéè¯"); } return Promise.resolve(error.response); // reject(error); }); // login({ // username: this.loginForm.loginname, // password: this.loginForm.password, // }) // .then((res) => { // loading.close(); // if (res.code !== 200) { // this.$message.error(res.msg); // } else { // let tokenData = res.token; // let times = new Date().getTime(); // window.localStorage.setItem("TokenTime", times); // window.localStorage.setItem("TokenKey", tokenData); // this.$router.push("/index"); // } // }) // .catch((error) => { // //ç½ç»è¶ æ¶å¼å¸¸å¤ç // loading.close(); // if ( // error.code === "ECONNABORTED" || // error.message === "Network Error" || // error.message.includes("timeout") // ) { // this.$message.error("请æ±è¶ æ¶ï¼è¯·ç¨åéè¯"); // } // return Promise.resolve(error.response); // // reject(error); // }); // //å¦æç»å½å¤±è´¥ï¼éè¦å·æ°éªè¯ç ç // this.$refs.refresh.createdCode(); // this.validCode = ""; //æ¸ ç©ºéªè¯ç è¾å ¥æ¡çå 容 } else { // console.log("error submit!!"); return false; } }); // // //å¦æç»å½å¤±è´¥ï¼éè¦å·æ°éªè¯ç ç // // this.$refs.refresh.createdCode(); // // this.validCode = ""; //æ¸ ç©ºéªè¯ç è¾å ¥æ¡çå 容 // } else { // // console.log("error submit!!"); // return false; // } // }); }, // CAå å¯ç»å½ passCAFree() { src/router/index.js
@@ -30,35 +30,34 @@ ]; const router = new Router({ mode: "history", // base: '/YZXNCS',//æ£å¼ç æå æ¶è§£å¼ // base: '/SW',//æµè¯ç æå æ¶è§£å¼ // base: '/YZXNCS',//æ£å¼ç æå æ¶è§£å¼ routes, }); router.beforeEach((to, from, next) => { // next(); next(); // å»ç»å½é¡µï¼ç´æ¥è·³è½¬ if (to.path === "/login") { next(); } else { //å»indexï¼å¤ætoken let token = localStorage.getItem("TokenKey"); if (token === null || token === "") { // 没ætoken,å»ç»é页 next("/login"); } else { // ætoken,å¤æè¶ æ¶ let TokenTime = window.localStorage.getItem("TokenTime"); let nowTime = new Date().getTime() if (nowTime - TokenTime > 60 * 60 * 1000) { // è¶ è¿60åéï¼å»ç»é页 next("/login"); localStorage.removeItem("TokenKey"); localStorage.removeItem("TokenTime"); } else { // å»indexï¼ætokenï¼æ²¡è¿æï¼è¿å ¥ç³»ç» next(); } } } // if (to.path === "/login") { // next(); // } else { // //å»indexï¼å¤ætoken // let token = localStorage.getItem("TokenKey"); // if (token === null || token === "") { // 没ætoken,å»ç»é页 // next("/login"); // } else { // // ætoken,å¤æè¶ æ¶ // let TokenTime = window.localStorage.getItem("TokenTime"); // let nowTime = new Date().getTime() // if (nowTime - TokenTime > 60 * 60 * 1000) { // è¶ è¿60åéï¼å»ç»é页 // next("/login"); // localStorage.removeItem("TokenKey"); // localStorage.removeItem("TokenTime"); // } else { // // å»indexï¼ætokenï¼æ²¡è¿æï¼è¿å ¥ç³»ç» // next(); // } // } // } }) export default router;
