Commit 59ac0963 by nlp97

fix 编译错误

parent ee93039e
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
"@vue/cli-service": "~4.4.0", "@vue/cli-service": "~4.4.0",
"axios": "^0.19.2", "axios": "^0.19.2",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"echarts": "^5.3.2",
"eslint": "^6.7.2", "eslint": "^6.7.2",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^6.2.2",
"sass": "^1.18.0", "sass": "^1.18.0",
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ninglupeng * @Author: ninglupeng
* @Date: 2022-06-07 00:31:25 * @Date: 2022-06-07 00:31:25
* @LastEditors: ninglupeng * @LastEditors: ninglupeng
* @LastEditTime: 2022-06-07 10:24:33 * @LastEditTime: 2022-06-07 14:16:26
* @Description: * @Description:
*/ */
import Vue from "vue"; import Vue from "vue";
...@@ -12,7 +12,6 @@ import { getItem, clear } from "@/utils/auth"; ...@@ -12,7 +12,6 @@ import { getItem, clear } from "@/utils/auth";
import outseeQualityControl from "@/views/outseeQualityControl.vue"; import outseeQualityControl from "@/views/outseeQualityControl.vue";
import outpatientDetails from "@/views/outpatientDetails.vue"; import outpatientDetails from "@/views/outpatientDetails.vue";
import outHistorygrouping from "@/views/outHistorygrouping.vue"; import outHistorygrouping from "@/views/outHistorygrouping.vue";
import login from "@/views/login.vue";
Vue.use(Router); Vue.use(Router);
...@@ -21,11 +20,7 @@ const router = new Router({ ...@@ -21,11 +20,7 @@ const router = new Router({
path: "*", path: "*",
component: (resolve) => require(["@/components/404.vue"], resolve), component: (resolve) => require(["@/components/404.vue"], resolve),
}, },
// {
// path: "/login",
// name: "login",
// component: login,
// },
// 查看质控 // 查看质控
{ {
path: "/outseeQualityControl", path: "/outseeQualityControl",
...@@ -44,91 +39,12 @@ const router = new Router({ ...@@ -44,91 +39,12 @@ const router = new Router({
name: "outHistorygrouping", name: "outHistorygrouping",
component: outHistorygrouping, component: outHistorygrouping,
} }
// {
// path: "/",
// name: "home",
// component: HelloWorld,
// },
// {
// path: "/",
// name: "home",
// component: HelloWorld,
// },
], ],
}); });
//路由跳转前判断(登录权限) //路由跳转前判断(登录权限)
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
next(); next();
//console.log(to, from, next);
// const token = getItem("svToken"); //获取用户id
// console.log(token);
// if (token) {
// //有登录权限
// if (to.path == "/login") {
// next("/");
// } else {
// //console.log(to);
// next();
// }
// } else {
// //没有登录权限
// if (to.path == "/login") {
// next();
// } else {
// //不然就跳转到登录;
// next("/login");
// }
// }
}); });
// router.beforeEach(async(to, from, next) => {
// const hasToken = getToken()
// if (hasToken) {
// if (to.path === '/login') {
// next({ path: '/' })
// } else {
// const hasGetUserInfo = store.getters.token
// if (hasGetUserInfo) {
// next()
// } else {
// try {
// // get user info
// await store.dispatch('user/getInfo')
// next()
// } catch (error) {
// await store.dispatch('user/resetToken')
// next(`/login?redirect=${encodeURIComponent(to.fullPath)}`)
// }
// }
// }
// } else {
// if (to.matched.some(rocode => rocode.meta.requireAuth)) {
// next(`/login?redirect=${encodeURIComponent(to.fullPath)}`)
// } else {
// next()
// }
// }
// })
export default router; export default router;
\ No newline at end of file
...@@ -46,7 +46,7 @@ export function categoryChart(data, tcolor) { ...@@ -46,7 +46,7 @@ export function categoryChart(data, tcolor) {
fontFamily: 'Arial', fontFamily: 'Arial',
foontWeight: '600', foontWeight: '600',
}, },
}, ], },],
polar: { polar: {
radius: ['100%', '60%'], radius: ['100%', '60%'],
center: ['50%', '50%'], center: ['50%', '50%'],
...@@ -76,10 +76,10 @@ export function categoryChart(data, tcolor) { ...@@ -76,10 +76,10 @@ export function categoryChart(data, tcolor) {
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{ color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0, offset: 0,
color: tcolor, //填色颜色 color: tcolor, //填色颜色
}, ]), },]),
}, },
}, },
}, ], },],
}; };
return option; return option;
...@@ -140,10 +140,10 @@ export function categoryChart11(text, data, tcolor) { ...@@ -140,10 +140,10 @@ export function categoryChart11(text, data, tcolor) {
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{ color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0, offset: 0,
color: tcolor, //填色颜色 color: tcolor, //填色颜色
}, ]), },]),
}, },
}, },
}, ], },],
}; };
return option; return option;
......
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