Commit 07d061a4 by 王锐

优化

parent f2943a8e
...@@ -14,5 +14,8 @@ ...@@ -14,5 +14,8 @@
"presets": ["env", "stage-2"], "presets": ["env", "stage-2"],
"plugins": ["istanbul"] "plugins": ["istanbul"]
} }
} },
"ignore": [
"./src/assets/js/*.js"
]
} }
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<!-- </transition> --> <!-- </transition> -->
<loading v-show="bLoading"></loading> <loading v-show="bLoading"></loading>
<!-- <transition name="fade" mode="out-in"> --> <!-- <transition name="fade" mode="out-in"> -->
<router-view v-if="!$route.meta.keepAlive"></router-view> <router-view v-if="!$route.meta.keepAlive"></router-view>
<!-- </transition> --> <!-- </transition> -->
<footera v-show="this.$root.$data.bfoot"></footera> <footera v-show="this.$root.$data.bfoot"></footera>
......
let baseUrl = 'http://k5.jst-gov.com'; import { getStore } from "../components/common/mixin";
getStore('baseurl')
let baseUrl = getStore('baseurl')
export { export {
baseUrl baseUrl
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
import $ from "jquery" import $ from "jquery"
import mui from './assets/js/mui.js' import mui from './assets/js/mui.min.js'
Vue.prototype.$mui = mui; Vue.prototype.$mui = mui;
import "Directives"; import "Directives";
import fastclick from 'fastclick'; import fastclick from 'fastclick';
......
...@@ -44,6 +44,7 @@ export default [{ ...@@ -44,6 +44,7 @@ export default [{
component: resolve => require(['Views/home/complex/checkstandard'], resolve), component: resolve => require(['Views/home/complex/checkstandard'], resolve),
meta:{ meta:{
requireAuth: true, requireAuth: true,
keepAlive: true
} }
}, },
{ {
...@@ -84,6 +85,7 @@ export default [{ ...@@ -84,6 +85,7 @@ export default [{
component: resolve => require(['Views/home/complex/report'], resolve), component: resolve => require(['Views/home/complex/report'], resolve),
meta:{ meta:{
requireAuth: true, requireAuth: true,
keepAlive: true
} }
}, },
{ {
...@@ -100,6 +102,7 @@ export default [{ ...@@ -100,6 +102,7 @@ export default [{
component: resolve => require(['Views/home/complex/contract'], resolve), component: resolve => require(['Views/home/complex/contract'], resolve),
meta:{ meta:{
requireAuth: true, requireAuth: true,
keepAlive: true
} }
}, },
{ {
......
...@@ -25,8 +25,18 @@ export default { ...@@ -25,8 +25,18 @@ export default {
methods: { methods: {
submitHandler(value) { submitHandler(value) {
this.$dialog.toast({ mes: `搜索:${value}` }); this.$dialog.toast({ mes: `搜索:${value}` });
},
getData(){
var vm=this
const url="/Restful/Jst.Standards.Entities.Standard/Query"
vm.$ajax.get(url).then(function (res) {
console.log(res)
}).catch()
} }
} },
mounted() {
this.getData()
},
}; };
</script> </script>
<style> <style>
......
...@@ -97,6 +97,7 @@ export default { ...@@ -97,6 +97,7 @@ export default {
}, },
created() { created() {
setStore("baseurl", "http://k5.jst-gov.com");
if (getStore("userinfo")) { if (getStore("userinfo")) {
this.username = JSON.parse(getStore("userinfo")).UserName; this.username = JSON.parse(getStore("userinfo")).UserName;
...@@ -171,14 +172,15 @@ export default { ...@@ -171,14 +172,15 @@ export default {
timeout: 1000, timeout: 1000,
icon: "success", icon: "success",
callback: () => { callback: () => {
console.log(resp.data.DisplayName, resp.data.UserName);
var userinfo = { var userinfo = {
DisplayName: resp.data.DisplayName, DisplayName: resp.data.DisplayName,
UserName: resp.data.UserName UserName: resp.data.UserName
}; };
setStore("userinfo", JSON.stringify(userinfo)); setStore("userinfo", JSON.stringify(userinfo));
vm.$store.dispatch("UPDATE_USER", true); vm.$store.dispatch("UPDATE_USER", true);
vm.$store.dispatch("SET_TOKEN", 1); //1登陆 0 未登录 vm.$store.dispatch("SET_TOKEN", 1); //1 登陆 0 未登录
vm.$router.replace({ vm.$router.replace({
path: store.state.loginurl path: store.state.loginurl
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment