From d10cfa799cfa059d21542369b37ba0b480babdc6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 04 十二月 2024 23:54:49 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/healthy/healthYear.vue | 202 ++++++++++++++++++++++++++++++++++++++++++--------
ruoyi-ui/src/views/login.vue | 2
2 files changed, 171 insertions(+), 33 deletions(-)
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 50e540a..7e6eb93 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -94,9 +94,36 @@
</el-input>
</el-form-item>
</el-row>
-
+
</el-form>
- </el-col>
+
+ <el-form ref="elForm" :model="HealthyBaseList" :rules="rules" size="medium" label-position="left"
+ v-loading="loading" :data="HealthyBaseList" >
+
+ <el-row :span="16">
+ <el-form-item label="琛�鍨�" prop="bloodClass" label-width="40px">
+ <!-- <el-radio label="a" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">A鍨嬭</el-radio>
+ <el-radio label="b" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">B鍨嬭</el-radio>
+ <el-radio label="o" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange"> O鍨嬭</el-radio>
+ <el-radio label="ab" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange" >AB鍨嬭</el-radio>
+ <el-radio label="rh" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">RH鍨嬭</el-radio>
+ <el-radio label="other" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鍏朵粬</el-radio>
+ <el-radio label="unknown" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鏈煡琛�鍨�</el-radio>
+ --> <el-select :disabled="dsb" v-model="selectedBloodType" @change="handlebloodChange" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in Bloodoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+
+
+ </el-form-item>
+ </el-row>
+
+ </el-form>
+ </el-col>
</el-container>
</div>
@@ -125,22 +152,7 @@
<!-- </el-dialog> self:user:export-->
</el-container>
<div>
- <el-form ref="elForm" :model="HealthyBaseList" :rules="rules" size="medium" label-position="left"
- v-loading="loading" :data="HealthyBaseList" >
-
- <el-row :span="16">
- <el-form-item label="琛�鍨�:" prop="bloodClass" label-width="70px">
- <el-radio label="a" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">A鍨嬭</el-radio>
- <el-radio label="b" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">B鍨嬭</el-radio>
- <el-radio label="o" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange"> O鍨嬭</el-radio>
- <el-radio label="ab" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange" >AB鍨嬭</el-radio>
- <el-radio label="rh" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">RH鍨嬭</el-radio>
- <el-radio label="other" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鍏朵粬</el-radio>
- <el-radio label="unknown" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鏈煡琛�鍨�</el-radio>
- </el-form-item>
- </el-row>
-
- </el-form>
+
</div>
<el-container>
<div >
@@ -149,11 +161,28 @@
<el-form ref="elForm" :model="HealthyBaseList" :rules="rules" size="medium" label-position="left"
v-loading="loading" :data="HealthyBaseList" >
<el-row :span="16">
- <el-form-item label="杩囨晱鍙诧細" prop="allergyClass" label-width="70px">
- <el-radio label="medicine" v-model="selectedallergyType" :disabled="dsb" @change="handleAllergyChange">鑽墿</el-radio>
- <el-radio label="food" v-model="selectedallergyType" :disabled="dsb" @change="handleAllergyChange">椋熺墿</el-radio>
- <el-radio label="other" v-model="selectedallergyType" :disabled="dsb" @change="handleAllergyChange">鍏朵粬</el-radio>
- </el-form-item>
+
+ <el-form-item label="杩囨晱鍙�" prop="allergyClass" label-width="60px">
+ <!-- <el-radio label="a" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">A鍨嬭</el-radio>
+ <el-radio label="b" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">B鍨嬭</el-radio>
+ <el-radio label="o" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange"> O鍨嬭</el-radio>
+ <el-radio label="ab" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange" >AB鍨嬭</el-radio>
+ <el-radio label="rh" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">RH鍨嬭</el-radio>
+ <el-radio label="other" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鍏朵粬</el-radio>
+ <el-radio label="unknown" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鏈煡琛�鍨�</el-radio>
+ --> <el-select :disabled="dsb" v-model="selectedallergyType" @change="handleAllergyChange" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in gmoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+
+
+ </el-form-item>
+
+
</el-row>
<el-dialog title="濉啓鍏朵粬杩囨晱鍙�" :visible="showOtherDialog" @close="closeOtherDialog">
<el-input v-model="otherText" placeholder="璇疯緭鍏ュ叾浠栬繃鏁忓彶"></el-input>
@@ -175,13 +204,33 @@
<el-form ref="elForm" :model="HealthyBaseList" :rules="rules" size="medium" label-position="left"
v-loading="loading" :data="HealthyBaseList" >
<el-row :span="20">
- <el-form-item label="閬椾紶鐥呭彶:" prop="geneticDiseaseClass" label-width="80px">
+ <!-- <el-form-item label="閬椾紶鐥呭彶" prop="geneticDiseaseClass" label-width="80px">
<el-radio label="hypertension" v-model="selectedgeneticDiseaseType" :disabled="dsb" @change="handlegeneticDiseaseChange">楂樿鍘�</el-radio>
<el-radio label="diabetes" v-model="selectedgeneticDiseaseType" :disabled="dsb" @change="handlegeneticDiseaseChange">绯栧翱鐥�</el-radio>
<el-radio label="tumor" v-model="selectedgeneticDiseaseType" :disabled="dsb" @change="handlegeneticDiseaseChange">鑲跨槫</el-radio>
<el-radio label="other" v-model="selectedgeneticDiseaseType" :disabled="dsb" @change="handlegeneticDiseaseChange">鍏朵粬</el-radio>
</el-form-item>
+ -->
+ <el-form-item label="閬椾紶鐥呭彶" prop="geneticDiseaseClass" label-width="80px">
+ <!-- <el-radio label="a" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">A鍨嬭</el-radio>
+ <el-radio label="b" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">B鍨嬭</el-radio>
+ <el-radio label="o" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange"> O鍨嬭</el-radio>
+ <el-radio label="ab" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange" >AB鍨嬭</el-radio>
+ <el-radio label="rh" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">RH鍨嬭</el-radio>
+ <el-radio label="other" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鍏朵粬</el-radio>
+ <el-radio label="unknown" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鏈煡琛�鍨�</el-radio>
+ --> <el-select :disabled="dsb" v-model="selectedgeneticDiseaseType" @change="handlegeneticDiseaseChange" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in ycoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+
+
+ </el-form-item>
</el-row>
<el-row :span="20">
<el-form-item label="鐩墠鍩虹鐥�" prop="baseDisease" label-width="90px">
@@ -292,7 +341,7 @@
<el-form ref="elForm" :model="LiveHabbitList" :rules="rules" size="medium" label-position="left"
v-loading="loading" :data="LiveHabbitList" >
<el-row :span="16">
- <el-form-item label="鐫＄湢:" prop="sleepClass" label-width="80px">
+ <!-- <el-form-item label="鐫＄湢:" prop="sleepClass" label-width="80px">
<el-radio label="good" v-model="selectedsleepType" :disabled="dsb" @change="handlesleepChange">鑹ソ</el-radio>
<el-radio label="general" v-model="selectedsleepType" :disabled="dsb" @change="handlesleepChange">涓�鑸�</el-radio>
<el-radio label="easyWake" v-model="selectedsleepType" :disabled="dsb" @change="handlesleepChange"> 鏄撻啋</el-radio>
@@ -300,7 +349,28 @@
<el-radio label="sleepless" v-model="selectedsleepType" :disabled="dsb" @change="handlesleepChange">澶辩湢</el-radio>
<el-radio label="snore" v-model="selectedsleepType" :disabled="dsb" @change="handlesleepChange">鎵撻季</el-radio>
<el-radio label="wakefulness" v-model="selectedsleepType" :disabled="dsb" @change="handlesleepChange">鐫′笉鐔�</el-radio>
- </el-form-item>
+ </el-form-item> -->
+ <el-form-item label="鐫＄湢:" prop="sleepClass" label-width="80px">
+ <!-- <el-radio label="a" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">A鍨嬭</el-radio>
+ <el-radio label="b" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">B鍨嬭</el-radio>
+ <el-radio label="o" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange"> O鍨嬭</el-radio>
+ <el-radio label="ab" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange" >AB鍨嬭</el-radio>
+ <el-radio label="rh" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">RH鍨嬭</el-radio>
+ <el-radio label="other" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鍏朵粬</el-radio>
+ <el-radio label="unknown" v-model="selectedBloodType" :disabled="dsb" @change="handlebloodChange">鏈煡琛�鍨�</el-radio>
+ --> <el-select :disabled="dsb" v-model="selectedsleepType" @change="handlesleepChange" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in spoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+
+
+ </el-form-item>
+
+
</el-row>
</el-form>
</el-col>
@@ -599,7 +669,7 @@
</el-container>
</div>
</el-dialog>
-<el-dialog :visible.sync="open3" width="800px" append-to-body @close="">
+<el-dialog :visible.sync="open3" width="1200px" append-to-body @close="">
<h2 style="font-size:21px">鐜板瓨鍋ュ悍闂</h2>
<el-container>
@@ -696,13 +766,11 @@
</div>
</el-container>
- <div>
+ <div style="position:relative">
<el-tabs type="border-card" v-model="activeName"
v-loading="loading" :data="HealthNoteList" >
- <el-button size='mini' type="text" class="btn_edit" @click="saveData" style='top: 0px;right: 20px;'>
- <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
- <span >{{ editMode ? this.bstn='淇濆瓨' : this.bstn='淇敼' }}</span>
- </el-button>
+
+
<el-tab-pane label="鐢熸椿涔犳儻" name="lifeHabits" >
<template v-if="editMode">
<div style="padding-top: 10px">
@@ -801,6 +869,13 @@
</template>
</el-tab-pane>
</el-tabs>
+
+ <div style="margin-bottom: 10px;position: absolute;right:10px;top:5px" >
+ <el-button size='mini' type="text" class="btn_edit" @click="saveData" style='top: 0px; bottom:0px;right: 20px;'>
+ <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+ <span >{{ editMode ? this.bstn='淇濆瓨' : this.bstn='淇敼' }}</span>
+ </el-button>
+ </div>
</div>
<div style="padding-top:30px" >
<el-container >
@@ -1163,7 +1238,69 @@
},
+
+ spoptions:[
+ { value: 'good',
+ label: '鑹ソ'},
+ { value: 'general',
+ label: '涓�鑸�'},
+ { value: 'easyWake',
+ label: '鏄撻啋'},
+ { value: 'dreaminess',
+ label: '澶氭ⅵ'},
+ { value: 'sleepless',
+ label: '澶辩湢'},
+ { value: 'snore',
+ label: '鎵撻季'},
+ { value: 'wakefulness',
+ label: '鐫′笉鐔�'},
+
+ ],
+ ycoptions:[
+ { value: 'hypertension',
+ label: '楂樿鍘�'},
+ { value: 'diabetes',
+ label: '绯栧翱鐥�'},
+ { value: 'tumor',
+ label: '鑲跨槫'},
+ { value: 'other',
+ label: '鍏跺畠'},
+ ],
+ gmoptions:[
+ { value: 'medicine',
+ label: '鑽墿'},
+ { value: 'food',
+ label: '椋熺墿'},
+ { value: 'other',
+ label: '鍏跺畠'},
+ ],
+Bloodoptions: [{
+ value: 'a',
+ label: 'A鍨嬭'
+ }, {
+ value: 'b',
+ label: 'B鍨嬭'
+ },
+ {
+ value: 'o',
+ label: 'o鍨嬭'
+ }, {
+
+ value: 'ab',
+ label: 'AB鍨嬭'
+ },
+ {
+ value: 'rh',
+ label: 'RH鍨嬭'
+ }, {
+ value: 'otherText',
+ label: '鍏跺畠'
+ },
+ {
+ value: 'unknown',
+ label: '鏈煡琛�鍨�'
+ }],
// 鑿滃崟鍒楄〃
menuOptions: [],
// 閮ㄩ棬鍒楄〃
@@ -1232,6 +1369,7 @@
},
//琛�鍨嬩慨鏀�
handlebloodChange() {
+
if (this.selectedBloodType === '') {
// 娌℃湁閫夋嫨琛�鍨嬶紝涓嶈繘琛屼慨鏀癸紝淇濈暀鍘熷鏁版嵁
this.selectedBloodType = this.originalBloodType;
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 232dfa6..8354128 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -211,7 +211,7 @@
</el-dialog>
<!-- 搴曢儴 -->
<div class="el-login-footer" >
- <span style="color: black; ">Copyright 漏 GDUT All Rights Reserved.<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></span>
+ <span style="color: black; "><span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></span>
<a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">绮CP澶�2023050334鍙�<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>鍏畨澶囨鍙�44010402003045</a>
</div>
</div>
--
Gitblit v1.9.1