shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

结果模板修改

master
mch 2 years ago
parent
4ffa865495
commit
28d539ec08
7 changed files with 202 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/api/api.js
  2. 36
      src/api/request.js
  3. 12
      src/router/index.js
  4. 67
      src/utlis/istoken.js
  5. 73
      src/views/fee-settings/Item.vue
  6. 44
      src/views/fee-settings/MedicalPackage.vue
  7. 35
      src/views/login/Login.vue

26
src/api/api.js
View File

@ -2,20 +2,20 @@ import request from '@/api/request'
import mm from "@/utlis/mm";
export function getapi(url, params = {}, config) {
return new Promise((resolve, reject) => {
request.get(`${mm.apiurl}${url}`, {
params: params,
...config
}).then(res => {
resolve(res)
}).catch(err => {
reject(err.data)
})
export function getapi(url, params = {}, config) {
return new Promise((resolve, reject) => {
request.get(`${mm.apiurl}${url}`, {
params: params,
...config
}).then(res => {
resolve(res)
}).catch(err => {
reject(err.data)
})
}
//axios封装post
})
}
//axios封装post
export function postapi(url, paramsdata = {}, config) {
return new Promise((resolve, reject) => {
request.post(`${mm.apiurl}${url}`, paramsdata, config).then(res => {

36
src/api/request.js
View File

@ -2,19 +2,17 @@
import router from "@/router"
import axios from "axios"
// import Promise from 'promise'
import {yztoken} from "@/utlis/istoken"
import { yztoken } from "@/utlis/istoken"
import mm from "@/utlis/mm";
import { Message } from 'element-ui';
const instance = axios.create({
baseURL: mm.apiurl,
timeout:5000
timeout: 5000
});
//请求拦截
instance.interceptors.request.use(
function (config) {
yztoken()
let token = localStorage.getItem('token')
@ -29,15 +27,15 @@ instance.interceptors.request.use(
return Promise.reject(err)
}
)
//响应拦截
instance.interceptors.response.use(
instance.interceptors.response.use(
(res) => {
//console.log(res);
if (res.data.code == 1) {
// const { data } = res;
console.log(9527);
console.log(res);
// const { data } = res;
console.log(9527);
console.log(res);
return res.data
} else if (res.Code == -1) {
// console.log(res.data.message);
@ -49,15 +47,15 @@ instance.interceptors.response.use(
}
},
(err) => {
console.log(err);
if (response.data.code == -1) {
router.push({ path: '/login' })
// this.$router.push({path:'/login'})
// this.$message.success('状态失效')
Message.error('状态失效请重新登录')
console.log('token失效返回登录');
}
console.log(err);
// console.log(err);
// if (response.data.code == -1) {
// router.push({ path: '/login' })
// // this.$router.push({path:'/login'})
// // this.$message.success('状态失效')
// Message.error('状态失效请重新登录')
// console.log('token失效返回登录');
// }
// console.log(err);
return Promise.reject(err)
}
// function (response) {

12
src/router/index.js
View File

@ -153,7 +153,17 @@ const routes = [
},
{
path: '/diagnosis',
component: () => import('../views/fee-settings/Diagnosis.vue')
component: () => import('../views/fee-settings/Diagnosis.vue'),
hidden: true,
// meta: {
// title: '诊断',
// menu
// }
meat: {
title: '诊断',
noCache: true,
menus: ['diagosis:advertDemandRelease']
}
},
{
path: '/item-result-template',

67
src/utlis/istoken.js
View File

@ -2,41 +2,38 @@ import moment from "moment";
import axios from "axios";
import mm from "@/utlis/mm";
export const yztoken=()=>{
console.log('验证')
let dqtime=parseInt(new Date().getTime()/1000); // 当前时间的时间戳
let tokentime=parseInt(window.localStorage.getItem("expires_in")) ; //登录缓存后的时间戳
if(dqtime>tokentime-10)
{
console.log('重新拉取')
//少于300秒 重新拉取
axios.post(
mm.apiurl+"/connect/token",
{
client_id: "Peis_App",
grant_type: "refresh_token",
refresh_token: window.localStorage.getItem("refresh_token")
},
{
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
}
)
.then((res) => {
writetoken(res.data.expires_in)
window.localStorage.setItem("token", res.data.access_token);
window.localStorage.setItem("refresh_token", res.data.refresh_token);
});
}
export const yztoken = () => {
console.log('验证')
let dqtime = parseInt(new Date().getTime() / 1000); // 当前时间的时间戳
let tokentime = parseInt(window.localStorage.getItem("expires_in")); //登录缓存后的时间戳
if (dqtime > tokentime - 10) {
console.log('重新拉取')
//少于300秒 重新拉取
axios.post(
mm.apiurl + "/connect/token",
{
client_id: "Peis_App",
grant_type: "refresh_token",
refresh_token: window.localStorage.getItem("refresh_token")
},
{
headers: {
"Content-Type": "application/x-www-form-urlencoded",
},
}
)
.then((res) => {
writetoken(res.data.expires_in)
window.localStorage.setItem("token", res.data.access_token);
window.localStorage.setItem("refresh_token", res.data.refresh_token);
});
}
}
export const writetoken=(addtime)=>{
let date = moment();
date.add(addtime, 's');
let lasttime=parseInt(new Date(date).getTime() / 1000)
console.log(lasttime)
window.localStorage.setItem("expires_in", lasttime); //写入计算过的时间戳
export const writetoken = (addtime) => {
let date = moment();
date.add(addtime, 's');
let lasttime = parseInt(new Date(date).getTime() / 1000)
console.log(lasttime)
window.localStorage.setItem("expires_in", lasttime); //写入计算过的时间戳
}

73
src/views/fee-settings/Item.vue
View File

@ -52,7 +52,7 @@
<div style="width: 85%">
<el-table
:data="tableData"
style="width: 100%; height: 500px"
style="width: 95%; height: 500px"
row-key="id"
class="el-table__body-wrapper tbody"
highlight-current-row
@ -81,6 +81,10 @@
{{ scope.row.lastModificationTime | dateFormat }}
</template>
</el-table-column>
<el-table-column
label="结果类别"
prop="resultTemplateTypeFlag"
></el-table-column>
<el-table-column label="操作">
<template>
<el-tag
@ -379,8 +383,28 @@
{{ scope.row.lastModificationTime | dateFormat }}
</template>
</el-table-column>
<el-table-column label="结果" prop="result"></el-table-column>
<el-table-column label="项目结果">
<template slot-scope="scope">
{{scope.row.id}}
</template>
</el-table-column>
<el-table-column label="类别">
<template slot-scope="scope">
<el-select
v-model="sexname[scope.row.displayName - 1]"
placeholder="请选择"
>
<el-option
v-for="item in resultitemtype"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</template>
</el-table-column>
</el-table>
</div>
<div style="margin-top: 5px">
@ -616,11 +640,11 @@
>诊断设置</el-button
>
</div>
<div style="margin-top: 10px; margin-left: 10px">
<!-- <div style="margin-top: 10px; margin-left: 10px">
<el-button type="primary" @click="adddiagnosis"
>增加诊断</el-button
>
</div>
</div> -->
</div>
</div>
</div>
@ -804,11 +828,32 @@
</span>
</el-dialog>
<!--诊断设置弹框 -->
<el-dialog title="诊断建议设置" :visible.sync="dialogVisible" width="80%">
<el-dialog title="诊断建议设置" :visible.sync="diagnostisbox" width="80%">
<div style="display: flex">
<div style="width: 95%">
<el-card>
<el-row>
<el-col :span="8">
<el-select v-model="value" placeholder="请选择">
<el-option
v-for="item in itemTypeId"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</el-col>
<el-col :span="8"> 2122 </el-col>
</el-row>
<!-- table部分 -->
<el-row> </el-row>
</el-card>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false"
<el-button @click="diagnostisbox = false">取 消</el-button>
<el-button type="primary" @click="diagnostisbox = false"
>确 定</el-button
>
</span>
@ -836,6 +881,8 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
export default {
data() {
return {
value: "",
diagnostisbox: false, //诊断设置弹框的方法
// tabelform: {
// ageLowerLimit: "input无法输入",
// },
@ -1117,6 +1164,7 @@ export default {
],
ssdate: [],
fssubdex: "",
resultitemtype: [], //项目类别
};
},
created() {
@ -1303,7 +1351,9 @@ export default {
},
//诊断设置弹框新增
diagnosticsettings() {
console.log("1");
// this.diagnostisbox = true;
// console.log("1");
this.$router.push({ path: "/diagnosis" });
},
digitaladdion() {
this.referencerangedata.push({
@ -1429,8 +1479,13 @@ export default {
this.$message.warning("请选择操作的数据");
} else {
this.rurestdialogVisible = true;
getapi("/api/app/item-result-template").then((res) => {
this.reusttableData = res.data.items;
});
// // 获取项目类别
getapi("/api/app/item-type/by-code-all").then((res) => {
this.resultitemtype = res.data;
console.log(res);
});
}

44
src/views/fee-settings/MedicalPackage.vue
View File

@ -109,7 +109,39 @@
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="6">
<el-form-item label="创建者">
<el-input v-model="form.creatorName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<el-input
:value="form.creationTime | dateFormat"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="修改者">
<el-input v-model="form.lastModifierName" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="修改时间">
<el-input
:value="form.lastModificationTime | dateFormat"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- -->
</el-form>
<!-- -->
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="onsbmit">确 定</el-button>
@ -199,10 +231,10 @@
</div>
</div>
</div>
<div class="confirmcancellation">
<el-button :disabled="isdislob" @click="Onsubmit">确定</el-button>
<el-button :disabled="isdislob">取消</el-button>
</div>
<div class="confirmcancellation">
<el-button :disabled="isdislob" @click="Onsubmit">确定</el-button>
<el-button :disabled="isdislob">取消</el-button>
</div>
</div>
<!-- 按钮区域 -->
@ -341,7 +373,7 @@ export default {
this.rowDrop();
},
methods: {
Onsubmit() {
Onsubmit() {
let sampleGroupId = this.form.id;
console.log(this.form.id);
console.log(this.rightdata);
@ -397,7 +429,6 @@ export default {
if (this.leftdata.length > 0) {
this.leftdata.splice(this.num, 1);
this.rightdata.push(this.rightobj);
}
},
//右移动
@ -430,6 +461,7 @@ export default {
this.rightobj = item;
this.num = index;
console.log(this.num);
console.log(this.rightobj);
},
//q全移去
allclear() {

35
src/views/login/Login.vue
View File

@ -4,14 +4,30 @@
<div class="mainbody">
<div class="title">系统登录</div>
<div class="userform">
<el-form :model="form" :rules="rules" ref="form" class="demo-ruleForm">
<el-form
:model="form"
:rules="rules"
ref="form"
class="demo-ruleForm"
>
<el-form-item label="" prop="Username">
<el-input v-model="form.Username" placeholder="用户名" prefix-icon="el-icon-s-custom"></el-input>
<el-input
v-model="form.Username"
placeholder="用户名"
prefix-icon="el-icon-s-custom"
></el-input>
</el-form-item>
<el-form-item label="" prop="Password">
<el-input v-model="form.Password" placeholder="密码" type="password" prefix-icon="el-icon-unlock"></el-input>
<el-input
v-model="form.Password"
placeholder="密码"
type="password"
prefix-icon="el-icon-unlock"
></el-input>
</el-form-item>
<el-button type="primary" class="btn" @click="onSubmit(form)">用户登录</el-button>
<el-button type="primary" class="btn" @click="onSubmit(form)"
>用户登录</el-button
>
</el-form>
</div>
</div>
@ -21,7 +37,7 @@
<script>
import { lognis } from "@/request/ruquset";
import { yzstr } from "@/utlis/validate.js";
import {yztoken,writetoken} from "@/utlis/istoken";
import { yztoken, writetoken } from "@/utlis/istoken";
export default {
data() {
return {
@ -80,9 +96,12 @@ export default {
}
)
.then((res) => {
writetoken(res.data.expires_in)
writetoken(res.data.expires_in);
window.localStorage.setItem("token", res.data.access_token);
window.localStorage.setItem("refresh_token", res.data.refresh_token);
window.localStorage.setItem(
"refresh_token",
res.data.refresh_token
);
// window.localStorage.setItem("expires_in", res.data.expires_in);
window.localStorage.setItem("tokentype", res.data.token_type);
window.localStorage.setItem("user", this.form.Username);
@ -127,7 +146,7 @@ export default {
// // console.log(this.$moment);
// console.log('33');
// console.log(parseInt(new Date().getTime() / 1000) + '');
}
},
};
</script>

Write Preview
Loading…
Cancel
Save