Commit 7a630bd7 authored by Wallen姚文辉's avatar Wallen姚文辉

修改卡死问题

parent b149902e
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>yinhe_test</title><script defer="defer" src="/js/chunk-vendors.233aa2e8.js"></script><script defer="defer" src="/js/app.35b2e202.js"></script><link href="/css/chunk-vendors.187ae3e6.css" rel="stylesheet"><link href="/css/app.cdb29323.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but yinhe_test doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>yinhe_test</title><script defer="defer" src="/js/chunk-vendors.233aa2e8.js"></script><script defer="defer" src="/js/app.0f37d773.js"></script><link href="/css/chunk-vendors.187ae3e6.css" rel="stylesheet"><link href="/css/app.3954dbdf.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but yinhe_test doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -107,7 +107,8 @@ router.beforeEach(async (to, from, next) => {
const menu = userinfo.menu
if (findMenu(menu, to.name) && !router.hasRoute(to.name)) {
a(menu)
console.info(router.getRoutes())
// console.info(router.getRoutes())
console.info(to)
return next(to)
}
return next()
......@@ -126,7 +127,7 @@ function request(method, url, data, apply, successFun = () => { }, failFun = ()
try {
if (error.response.data.code == 401) {
apply.$Message.error(error.response.data.message);
router.push('login')
router.push({ name: 'login' })
} else {
apply && apply.$Message.error(error.response.data.message);
failFun(error.response.data)
......
......@@ -7,7 +7,7 @@ import UserInfo from '@/views/systemview/UserInfo.vue'
const routes = [
{ path: '/', redirect: '/home' },
{ path: '/', redirect: '/home' },
{
path: '/:pathMatch(.*)*',
component: () => import('@/views/error/index.vue'),
......@@ -23,8 +23,8 @@ const routes = [
component: UserInfo,
},]
}, {
name: 'login',
path: '/login',
name: '/login',
component: Login,
}
]
......
<template>
<div class="box" ref="vantaRef" style="width: 100%; height: 100vh">
<Row>
<Col span="24" :lg="{span:8,offset:8}">
<Col span="24" :lg="{ span: 8, offset: 8 }">
<div class="card">
<div class="login">
<Login @on-submit="handleSubmit">
......@@ -36,9 +36,9 @@ export default {
this.$store.commit("settoken", data.data.token);
this.$store.commit("setid", data.data.id);
localStorage.setItem("token", data.data.token);
localStorage.setItem("name", data.data.name);
localStorage.setItem("password", data.data.password);
this.$request('get', 'user/userdetail', null, this, (data) => {localStorage.setItem('userinfo',JSON.stringify(data.data));})
localStorage.setItem("name", name);
localStorage.setItem("password", password);
this.$request('get', 'user/userdetail', null, this, (data) => { localStorage.setItem('userinfo', JSON.stringify(data.data)); })
this.$router.push("/home");
})
}
......@@ -70,7 +70,7 @@ export default {
}
</script>
<style>
.card{
.card {
height: 300px;
background: rgba(103, 176, 185, 0.7);
transform: translateY(90%);
......@@ -79,6 +79,7 @@ export default {
border-radius: 30px 5px 15px 5px;
text-align: center;
}
.login {
max-width: 400px;
margin: 0 auto !important;
......
......@@ -150,7 +150,7 @@
</template>
<template #create="{ row, index }">
<p>
{{ row.extraFields[1].html }}
{{ row.extraFields ? row.extraFields[1].html : '' }}
</p>
</template>
<template #priority="{ row, index }">
......@@ -598,11 +598,17 @@ export default {
var dateinfo = {}
var bugUser = {}
value.forEach(ele => {
console.info(ele)
ele.priorityId in pinfo ? pinfo[ele.priorityId]++ : pinfo[ele.priorityId] = 1
ele.Severity in sinfo ? sinfo[ele.Severity]++ : sinfo[ele.Severity] = 1
// let date = ele.extraFields[1].html.split(' ')[0] || ''
const index = ele.extraFields.findIndex(ele => { return ele.id == "created" })
let date = index != -1 ? ele.extraFields[index].html.split(' ')[0] : 0
let date = null
if (ele.extraFields) {
const index = ele.extraFields?.findIndex(ele => { return ele.id == "created" }) || -1
date = index != -1 ? ele.extraFields[index].html.split(' ')[0] : 0
} else {
date = null
}
date in dateinfo ? dateinfo[date]++ : dateinfo[date] = 1
ele.ascription in bugUser ? bugUser[ele.ascription]++ : bugUser[ele.ascription] = 1
})
......@@ -652,8 +658,11 @@ export default {
a += 1
})
value.forEach(ele => {
const index = ele.extraFields.findIndex(item => { return item.id == "created" })
ele.start = index != -1 ? ele.extraFields[index].html.split(" ")[0] : ''
if (ele.extraFields) {
const index = ele.extraFields.findIndex(item => { return item.id == "created" })
ele.start = index != -1 ? ele.extraFields[index].html.split(" ")[0] : ''
}
else ele.start = ''
ele.end = new Date().toLocaleDateString()
this.case.forEach(each => {
if (ele.case.indexOf(each.key) != -1) {
......
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