ZhangBin
/
chinese-medicine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

状态修改和对照组修改

master
aBin 4 years ago
parent
d08dfc9591
commit
897ef8553b
13 changed files with 191 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/App.vue
  2. 26
      src/components/CaseTable/CaseTable.vue
  3. 127
      src/components/Echarts/Categorymap.vue
  4. 127
      src/components/Echarts/CategorymapHos.vue
  5. 24
      src/components/PatientInfo/PatientAdd.vue
  6. 4
      src/components/PatientInfo/PatientTable.vue
  7. 1
      src/components/PatientInfo/Search.vue
  8. 3
      src/config/api.js
  9. 2
      src/store/modules/home/mutations.js
  10. 8
      src/views/CaseAnalysis/CaseAnalysis.vue
  11. 8
      src/views/CaseSearch/CaseSearch.vue
  12. 2
      src/views/ProjectAssistant/Examine.vue
  13. 2
      src/views/ProjectAssistant/General.vue

18
src/App.vue
View File

@ -7,9 +7,9 @@
--> -->
<template> <template>
<a-config-provider :locale="zh_CN"> <a-config-provider :locale="zh_CN">
<div v-if="isRouter" class="d-flex flex-row flex-nowrap" id="app"> <!-- <div v-if="isRouter" class="d-flex flex-row flex-nowrap" id="app"> -->
<!-- <div class="d-flex flex-row flex-nowrap" id="app"> --> <div class="d-flex flex-row flex-nowrap" id="app">
<!-- <btn-con /> --> <btn-con />
<router-view class="flex-1 bg" style="padding: 6px"></router-view> <router-view class="flex-1 bg" style="padding: 6px"></router-view>
</div> </div>
</a-config-provider> </a-config-provider>
@ -18,12 +18,12 @@
<script> <script>
import { mapState, mapActions, mapMutations } from 'vuex'; import { mapState, mapActions, mapMutations } from 'vuex';
import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN'; import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
// import BtnCon from 'components/BtnCom/BtnCon.vue'; import BtnCon from 'components/BtnCom/BtnCon.vue';
import { getHId } from 'config/api'; import { getHId } from 'config/api';
export default { export default {
name: 'App', name: 'App',
// components: { BtnCon }, components: { BtnCon },
data() { data() {
return { zh_CN, isRouter: false }; return { zh_CN, isRouter: false };
}, },
@ -36,10 +36,10 @@ export default {
}, },
}, },
async created() { async created() {
// const userId = '1387952026067013632'; const userId = '1387952026067013632';
// const params = { userId }; const params = { userId };
// await this.getUserId(params); await this.getUserId(params);
// await this.getToken(); await this.getToken();
if (localStorage.getItem('patientId')) { if (localStorage.getItem('patientId')) {
this.setPatientId(localStorage.getItem('patientId')); this.setPatientId(localStorage.getItem('patientId'));
} }

26
src/components/CaseTable/CaseTable.vue
View File

@ -19,7 +19,7 @@
<span v-if="record.inputStatus === 0">新建</span> <span v-if="record.inputStatus === 0">新建</span>
<span v-else-if="record.inputStatus === 1">数据收集中</span> <span v-else-if="record.inputStatus === 1">数据收集中</span>
<span v-else-if="record.inputStatus === 2">数据收集按时完成</span> <span v-else-if="record.inputStatus === 2">数据收集按时完成</span>
<span v-else-if="record.inputStatus === 3">数据收集超时中</span> <!-- <span v-else-if="record.inputStatus === 3">数据收集超时中</span> -->
<span v-else-if="record.inputStatus === 4">废弃</span> <span v-else-if="record.inputStatus === 4">废弃</span>
<span v-else-if="record.inputStatus === 5">审核通过</span> <span v-else-if="record.inputStatus === 5">审核通过</span>
<span v-else-if="record.inputStatus === 6">已结算</span> <span v-else-if="record.inputStatus === 6">已结算</span>
@ -33,7 +33,7 @@
<a-empty v-else /> <a-empty v-else />
<a-modal title="修改状态" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel"> <a-modal title="修改状态" :visible="visible" :confirm-loading="confirmLoading" @ok="handleOk" @cancel="handleCancel">
<a-select :default-value="defaultValue" :key="defaultValue" style="width: 200px" @change="handleChange"> <a-select :default-value="defaultValue" :key="defaultValue" style="width: 200px" @change="handleChange">
<a-select-option v-for="(item, index) in statusList" :value="index" :key="index"> {{ item }} </a-select-option> <a-select-option v-for="item in statusList" :value="item.id" :key="item.id"> {{ item.name }} </a-select-option>
</a-select> </a-select>
</a-modal> </a-modal>
</div> </div>
@ -106,7 +106,25 @@ export default {
recordId: '', recordId: '',
recordType: '', recordType: '',
defaultValue: '', defaultValue: '',
statusList: ['新建', '数据收集中', '数据收集按时完成', '数据收集超时中', '废弃'], // statusList: ['新建', '数据收集中', '数据收集按时完成', '数据收集超时中', '废弃'],
statusList: [
{
name: '新建',
id: 0,
},
{
name: '数据收集中',
id: 1,
},
{
name: '数据收集按时完成',
id: 2,
},
{
name: '废弃',
id: 4,
},
],
}; };
}, },
@ -148,7 +166,7 @@ export default {
showEditModal(id, inputStatus) { showEditModal(id, inputStatus) {
this.recordId = id; this.recordId = id;
this.recordType = inputStatus; this.recordType = inputStatus;
this.defaultValue = this.statusList[inputStatus]; this.defaultValue = this.statusList[inputStatus].id;
this.visible = true; this.visible = true;
}, },
async handleOk() { async handleOk() {

127
src/components/Echarts/Categorymap.vue
View File

@ -57,7 +57,8 @@ export default {
// 绘制图表 // 绘制图表
await this.getData(); await this.getData();
var option = { var option = {
legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] }, // legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] },
legend: { data: ['新建', '数据收集按时完成', '数据收集中'] },
xAxis: [ xAxis: [
{ {
axisLabel: { axisLabel: {
@ -202,68 +203,68 @@ export default {
}, },
}, },
}, },
{ // {
name: '废弃', // name: '废弃',
type: 'bar', // type: 'bar',
// label: labelOption, // // label: labelOption,
emphasis: { focus: 'series' }, // emphasis: { focus: 'series' },
data: this.dList, // data: this.dList,
barWidth: this.widthNum > 550 ? 20 : 10, // barWidth: this.widthNum > 550 ? 20 : 10,
itemStyle: { // itemStyle: {
normal: { // normal: {
label: { // label: {
formatter: '{c}', // formatter: '{c}',
show: true, // show: true,
position: 'top', // position: 'top',
textStyle: { // textStyle: {
fontSize: '12', // fontSize: '12',
color: '#000', // color: '#000',
}, // },
}, // },
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#f00' }, //柱图渐变色 // { offset: 0, color: '#f00' }, //柱图渐变色
{ offset: 1, color: '#F00' }, //柱图渐变色 // { offset: 1, color: '#F00' }, //柱图渐变色
]), // ]),
}, // },
emphasis: { // emphasis: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#F00' }, //柱图高亮渐变色 // { offset: 0, color: '#F00' }, //柱图高亮渐变色
{ offset: 1, color: '#F00' }, //柱图高亮渐变色 // { offset: 1, color: '#F00' }, //柱图高亮渐变色
]), // ]),
}, // },
}, // },
}, // },
{ // {
name: '数据收集超时', // name: '数据收集超时',
type: 'bar', // type: 'bar',
// label: labelOption, // // label: labelOption,
emphasis: { focus: 'series' }, // emphasis: { focus: 'series' },
data: this.eList, // data: this.eList,
barWidth: this.widthNum > 550 ? 20 : 10, // barWidth: this.widthNum > 550 ? 20 : 10,
itemStyle: { // itemStyle: {
normal: { // normal: {
label: { // label: {
formatter: '{c}', // formatter: '{c}',
show: true, // show: true,
position: 'top', // position: 'top',
textStyle: { // textStyle: {
fontSize: '12', // fontSize: '12',
color: '#000', // color: '#000',
}, // },
}, // },
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#F5D041' }, //柱图渐变色 // { offset: 0, color: '#F5D041' }, //柱图渐变色
{ offset: 1, color: '#FF9000' }, //柱图渐变色 // { offset: 1, color: '#FF9000' }, //柱图渐变色
]), // ]),
}, // },
emphasis: { // emphasis: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#F5D041' }, //柱图高亮渐变色 // { offset: 0, color: '#F5D041' }, //柱图高亮渐变色
{ offset: 1, color: '#FF9000' }, //柱图高亮渐变色 // { offset: 1, color: '#FF9000' }, //柱图高亮渐变色
]), // ]),
}, // },
}, // },
}, // },
], ],
}; };
myChart.setOption(option); myChart.setOption(option);

127
src/components/Echarts/CategorymapHos.vue
View File

@ -44,7 +44,8 @@ export default {
await this.getData(this.hospitalId); await this.getData(this.hospitalId);
// 绘制图表 // 绘制图表
var option = { var option = {
legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] }, // legend: { data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时'] },
legend: { data: ['新建', '数据收集按时完成', '数据收集中'] },
xAxis: [ xAxis: [
{ {
axisLabel: { axisLabel: {
@ -189,68 +190,68 @@ export default {
}, },
}, },
}, },
{ // {
name: '废弃', // name: '废弃',
type: 'bar', // type: 'bar',
// label: labelOption, // // label: labelOption,
emphasis: { focus: 'series' }, // emphasis: { focus: 'series' },
data: this.dList, // data: this.dList,
barWidth: this.widthNum > 550 ? 20 : 10, // barWidth: this.widthNum > 550 ? 20 : 10,
itemStyle: { // itemStyle: {
normal: { // normal: {
label: { // label: {
formatter: '{c}', // formatter: '{c}',
show: true, // show: true,
position: 'top', // position: 'top',
textStyle: { // textStyle: {
fontSize: '12', // fontSize: '12',
color: '#000', // color: '#000',
}, // },
}, // },
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#f00' }, //柱图渐变色 // { offset: 0, color: '#f00' }, //柱图渐变色
{ offset: 1, color: '#F00' }, //柱图渐变色 // { offset: 1, color: '#F00' }, //柱图渐变色
]), // ]),
}, // },
emphasis: { // emphasis: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#F00' }, //柱图高亮渐变色 // { offset: 0, color: '#F00' }, //柱图高亮渐变色
{ offset: 1, color: '#F00' }, //柱图高亮渐变色 // { offset: 1, color: '#F00' }, //柱图高亮渐变色
]), // ]),
}, // },
}, // },
}, // },
{ // {
name: '数据收集超时', // name: '数据收集超时',
type: 'bar', // type: 'bar',
// label: labelOption, // // label: labelOption,
emphasis: { focus: 'series' }, // emphasis: { focus: 'series' },
data: this.eList, // data: this.eList,
barWidth: this.widthNum > 550 ? 20 : 10, // barWidth: this.widthNum > 550 ? 20 : 10,
itemStyle: { // itemStyle: {
normal: { // normal: {
label: { // label: {
formatter: '{c}', // formatter: '{c}',
show: true, // show: true,
position: 'top', // position: 'top',
textStyle: { // textStyle: {
fontSize: '12', // fontSize: '12',
color: '#000', // color: '#000',
}, // },
}, // },
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#F5D041' }, //柱图渐变色 // { offset: 0, color: '#F5D041' }, //柱图渐变色
{ offset: 1, color: '#FF9000' }, //柱图渐变色 // { offset: 1, color: '#FF9000' }, //柱图渐变色
]), // ]),
}, // },
emphasis: { // emphasis: {
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [ // color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: '#F5D041' }, //柱图高亮渐变色 // { offset: 0, color: '#F5D041' }, //柱图高亮渐变色
{ offset: 1, color: '#FF9000' }, //柱图高亮渐变色 // { offset: 1, color: '#FF9000' }, //柱图高亮渐变色
]), // ]),
}, // },
}, // },
}, // },
], ],
}; };
myChart.setOption(option); myChart.setOption(option);

24
src/components/PatientInfo/PatientAdd.vue
View File

@ -41,7 +41,7 @@
<!-- 组别 --> <!-- 组别 -->
<a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="组别"> <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="组别">
<a-select placeholder="请选择组别" v-decorator="['inpatientId', { rules: [{ required: true, message: '组别不能为空' }] }]"> <a-select placeholder="请选择组别" v-decorator="['inpatientId', { rules: [{ required: true, message: '组别不能为空' }] }]">
<a-select-option :key="index" :value="group.id" v-for="(group, index) in controlGroups">{{ group.name }}</a-select-option> <a-select-option :key="index" :value="group.id" v-for="(group, index) in controlList">{{ group.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
@ -56,7 +56,7 @@
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import { savePatientMes } from 'config/api'; import { savePatientMes, queryEnable } from 'config/api';
const formItemLayout = { const formItemLayout = {
labelCol: { span: 6 }, labelCol: { span: 6 },
@ -71,12 +71,26 @@ export default {
formItemLayout, formItemLayout,
tailItemLayout, tailItemLayout,
form: this.$form.createForm(this, { name: 'r-d-add' }), form: this.$form.createForm(this, { name: 'r-d-add' }),
controlList: [],
}; };
}, },
created() {
computed: mapState('home', ['controlGroups']), this.getList();
},
methods: { methods: {
async getList() {
try {
const res = await queryEnable({});
const { code, msg, data } = res.data;
if (code === 200) {
this.controlList = data;
} else {
console.log(msg);
}
} catch (error) {
console.error(error);
}
},
// 提交表单 // 提交表单
handleSubmit(e) { handleSubmit(e) {
e.preventDefault(); e.preventDefault();

4
src/components/PatientInfo/PatientTable.vue
View File

@ -25,8 +25,6 @@
? '数据收集中' ? '数据收集中'
: record.inputStatus === 2 : record.inputStatus === 2
? '数据收集按时完成' ? '数据收集按时完成'
: record.inputStatus === 3
? '数据收集超时'
: record.inputStatus === 4 : record.inputStatus === 4
? '废弃' ? '废弃'
: record.inputStatus === 5 : record.inputStatus === 5
@ -88,8 +86,6 @@
? '数据收集中' ? '数据收集中'
: record.inputStatus === 2 : record.inputStatus === 2
? '数据收集按时完成' ? '数据收集按时完成'
: record.inputStatus === 3
? '数据收集超时'
: record.inputStatus === 4 : record.inputStatus === 4
? '废弃' ? '废弃'
: record.inputStatus === 5 : record.inputStatus === 5

1
src/components/PatientInfo/Search.vue
View File

@ -43,6 +43,7 @@ export default {
return { return {
form: this.$form.createForm(this, { name: 'search' }), form: this.$form.createForm(this, { name: 'search' }),
visible: false, visible: false,
controlList: [],
}; };
}, },

3
src/config/api.js
View File

@ -55,6 +55,9 @@ export const queryQuestion = params => axios.get(`${tcm}/question/queryQuestion`
// 查询所有组别的信息 // 查询所有组别的信息
export const getQuery = params => axios.post(`${inpatient}/query`, params); export const getQuery = params => axios.post(`${inpatient}/query`, params);
// 查询组别信息（含有不可选择的）
export const queryEnable = params => axios.post(`${inpatient}/queryEnable`, params);
// 查询统计病例数据 // 查询统计病例数据
export const complete = params => axios.post(`${statistics}/complete`, params); export const complete = params => axios.post(`${statistics}/complete`, params);

2
src/store/modules/home/mutations.js
View File

@ -29,7 +29,7 @@ const mutations = {
}, },
/** /**
* 设置user用户信息 * 设置组别信息
* @param {object} state * @param {object} state
* @param {Array} data * @param {Array} data
*/ */

8
src/views/CaseAnalysis/CaseAnalysis.vue
View File

@ -1444,10 +1444,10 @@ export default {
id: 2, id: 2,
name: '数据收集按时完成', name: '数据收集按时完成',
}, },
{ // {
id: 3, // id: 3,
name: '数据收集超时中', // name: '数据收集超时中',
}, // },
{ {
id: 4, id: 4,
name: '废弃', name: '废弃',

8
src/views/CaseSearch/CaseSearch.vue
View File

@ -1409,10 +1409,10 @@ export default {
id: 2, id: 2,
name: '数据收集按时完成', name: '数据收集按时完成',
}, },
{ // {
id: 3, // id: 3,
name: '数据收集超时中', // name: '数据收集超时中',
}, // },
{ {
id: 4, id: 4,
name: '废弃', name: '废弃',

2
src/views/ProjectAssistant/Examine.vue
View File

@ -58,8 +58,6 @@
? '数据收集中' ? '数据收集中'
: record.inputStatus === 2 : record.inputStatus === 2
? '数据收集按时完成' ? '数据收集按时完成'
: record.inputStatus === 3
? '数据收集超时中'
: record.inputStatus === 4 : record.inputStatus === 4
? '废弃' ? '废弃'
: record.inputStatus === 5 : record.inputStatus === 5

2
src/views/ProjectAssistant/General.vue
View File

@ -60,8 +60,6 @@
? '数据收集中' ? '数据收集中'
: record.inputStatus === 2 : record.inputStatus === 2
? '数据收集按时完成' ? '数据收集按时完成'
: record.inputStatus === 3
? '数据收集超时中'
: record.inputStatus === 4 : record.inputStatus === 4
? '废弃' ? '废弃'
: record.inputStatus === 5 : record.inputStatus === 5

Write Preview
Loading…
Cancel
Save