修改了bug

feige

2024-12-04 d10cfa799cfa059d21542369b37ba0b480babdc6

修改了bug

 ruoyi-ui/src/views/healthy/healthYear.vue

@@ -96,6 +96,33 @@
              </el-row>

            </el-form>
         
              <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 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,11 +204,31 @@
            <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>
@@ -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 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 >
@@ -1164,6 +1239,68 @@

      },


      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;

 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; ">粤ICP备2023050334号<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>公安备案号44010402003045</a>
    </div>
  </div>