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 | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 400 insertions(+), 75 deletions(-) diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue index dcc293f..7e6eb93 100644 --- a/ruoyi-ui/src/views/healthy/healthYear.vue +++ b/ruoyi-ui/src/views/healthy/healthYear.vue @@ -19,6 +19,26 @@ <el-divider /> +<el-row :gutter="2"> + <el-col :border="1" :span="4" v-for="(item, index) in allBasicInfo" :key="o" :offset="1"> + <div> + <el-card :body-style="{ padding: '1px' }"> + <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png" class="image"> + <div style=""> + <span>{{item}}</span> + <div class="bottom clearfix"> + + <el-button type="text" class="button" @click="handleEditInfo(index)">鏌ョ湅璇︽儏</el-button> + </div> + </div> + </el-card> + </div> + </el-col> +</el-row> + + + <el-dialog :visible.sync="open" width="800px" append-to-body @close=""> + <h2 style="font-size:21px">鍩烘湰鎯呭喌</h2> <el-container> @@ -74,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> @@ -102,64 +149,10 @@ </div> - <div style="padding-left:400px;padding-top:30px" > - <el-container > - - - <el-row :gutter="10" class="mb8"> - <el-col > - <el-button - plain - @click="handleEdit()" - style="width: 80px;height: 32px;background: #E0EEFE;" - v-if="isShow" - v-hasPermi="['system:role:edit']" - >缂栬緫</el-button> - <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> - <br> - - </el-col> - -<!-- <el-col style="padding-top: 10px;">--> -<!-- <el-button--> -<!-- plain--> -<!-- style="width: 80px;height: 32px;background: #D2F3E0;"--> -<!-- @click="handleExport"--> -<!-- v-hasPermi="['family:note:export']"--> -<!-- >瀵煎嚭</el-button></el-col>--> - - <el-col style="padding-top: 10px;"> - <el-button - plain - style="width: 80px;height: 32px;background: #FFDDE3;" - v-print="'#printable-content'" - v-hasPermi="['family:note:export']" - >鎵撳嵃</el-button></el-col> - - - </el-row> - - </el-container> - </div> <!-- </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 > @@ -168,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> @@ -194,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"> @@ -213,7 +243,50 @@ </el-container> </div> </el-container> + + <div style="padding-top:30px" > + <el-container > + + + <el-row :gutter="10" class="mb8"> + <el-col > + <el-button + plain + @click="handleEdit()" + style="width: 80px;height: 32px;background: #E0EEFE;" + v-if="isShow" + v-hasPermi="['system:role:edit']" + >缂栬緫</el-button> + <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> + <br> + + </el-col> + + <!-- <el-col style="padding-top: 10px;">--> + <!-- <el-button--> + <!-- plain--> + <!-- style="width: 80px;height: 32px;background: #D2F3E0;"--> + <!-- @click="handleExport"--> + <!-- v-hasPermi="['family:note:export']"--> + <!-- >瀵煎嚭</el-button></el-col>--> + + <!-- <el-col style="padding-top: 10px;"> + <el-button + plain + style="width: 80px;height: 32px;background: #FFDDE3;" + v-print="'#printable-content'" + v-hasPermi="['family:note:export']" + >鎵撳嵃</el-button></el-col> --> + + + </el-row> + + </el-container> + </div> +</el-dialog> + +<el-dialog :visible.sync="open1" width="800px" append-to-body @close=""> <h2 style="font-size:21px">鐢熸椿涔犳儻</h2> <el-container> <div style="padding-left:0px" > @@ -268,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> @@ -276,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> @@ -362,8 +456,49 @@ </el-container> </div> </el-container> - - + + + <div style="padding-top:30px" > + <el-container > + + + <el-row :gutter="10" class="mb8"> + <el-col > + <el-button + plain + @click="handleEdit()" + style="width: 80px;height: 32px;background: #E0EEFE;" + v-if="isShow" + v-hasPermi="['system:role:edit']" + >缂栬緫</el-button> + <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> + <br> + + </el-col> + + <!-- <el-col style="padding-top: 10px;">--> + <!-- <el-button--> + <!-- plain--> + <!-- style="width: 80px;height: 32px;background: #D2F3E0;"--> + <!-- @click="handleExport"--> + <!-- v-hasPermi="['family:note:export']"--> + <!-- >瀵煎嚭</el-button></el-col>--> + + <!-- <el-col style="padding-top: 10px;"> + <el-button + plain + style="width: 80px;height: 32px;background: #FFDDE3;" + v-print="'#printable-content'" + v-hasPermi="['family:note:export']" + >鎵撳嵃</el-button></el-col> --> + + + </el-row> + + </el-container> + </div> +</el-dialog> +<el-dialog :visible.sync="open2" width="800px" append-to-body @close=""> <h2 style="font-size:21px">鎶ょ悊鏌ヤ綋</h2> <el-container> <div style="padding-left:0px" > @@ -494,8 +629,47 @@ </el-container> </div> </el-container> - - + <div style="padding-top:30px" > + <el-container > + + + <el-row :gutter="10" class="mb8"> + <el-col > + <el-button + plain + @click="handleEdit()" + style="width: 80px;height: 32px;background: #E0EEFE;" + v-if="isShow" + v-hasPermi="['system:role:edit']" + >缂栬緫</el-button> + <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> + <br> + + </el-col> + + <!-- <el-col style="padding-top: 10px;">--> + <!-- <el-button--> + <!-- plain--> + <!-- style="width: 80px;height: 32px;background: #D2F3E0;"--> + <!-- @click="handleExport"--> + <!-- v-hasPermi="['family:note:export']"--> + <!-- >瀵煎嚭</el-button></el-col>--> + + <!-- <el-col style="padding-top: 10px;"> + <el-button + plain + style="width: 80px;height: 32px;background: #FFDDE3;" + v-print="'#printable-content'" + v-hasPermi="['family:note:export']" + >鎵撳嵃</el-button></el-col> --> + + + </el-row> + + </el-container> + </div> +</el-dialog> +<el-dialog :visible.sync="open3" width="1200px" append-to-body @close=""> <h2 style="font-size:21px">鐜板瓨鍋ュ悍闂</h2> <el-container> @@ -592,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"> @@ -697,7 +869,54 @@ </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 > + + + <el-row :gutter="10" class="mb8"> + <el-col > + <el-button + plain + @click="handleEdit()" + style="width: 80px;height: 32px;background: #E0EEFE;" + v-if="isShow" + v-hasPermi="['system:role:edit']" + >缂栬緫</el-button> + <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button> + <br> + + </el-col> + + <!-- <el-col style="padding-top: 10px;">--> + <!-- <el-button--> + <!-- plain--> + <!-- style="width: 80px;height: 32px;background: #D2F3E0;"--> + <!-- @click="handleExport"--> + <!-- v-hasPermi="['family:note:export']"--> + <!-- >瀵煎嚭</el-button></el-col>--> + + <!-- <el-col style="padding-top: 10px;"> + <el-button + plain + style="width: 80px;height: 32px;background: #FFDDE3;" + v-print="'#printable-content'" + v-hasPermi="['family:note:export']" + >鎵撳嵃</el-button></el-col> --> + + + </el-row> + + </el-container> + </div> + </el-dialog> </div> </template> @@ -723,6 +942,11 @@ dicts: ['sys_normal_disable'], data() { return { + open:false, + open1:false, + open2:false, + open3:false, + allBasicInfo:["鍩烘湰鎯呭喌","鐢熸椿涔犳儻","鎶ょ悊鏌ヤ綋","鐜板湪鍋ュ悍闂"], dictionary: {}, // 閬僵灞� editMode: false, // 鏄惁澶勪簬缂栬緫妯″紡 @@ -1014,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: [], // 閮ㄩ棬鍒楄〃 @@ -1044,6 +1330,18 @@ }, methods: { + handleEditInfo(index) + { + + if(index==0) + this.open = true + else if(index==1) + this.open1 = true; + else if(index==2) + this.open2 = true; + else + this.open3 = true; + }, saveData() { // 灏嗘暟鎹彂閫佺粰鍚庣 // alert(this.bstn) @@ -1071,6 +1369,7 @@ }, //琛�鍨嬩慨鏀� handlebloodChange() { + if (this.selectedBloodType === '') { // 娌℃湁閫夋嫨琛�鍨嬶紝涓嶈繘琛屼慨鏀癸紝淇濈暀鍘熷鏁版嵁 this.selectedBloodType = this.originalBloodType; @@ -2323,4 +2622,30 @@ position: absolute; top: 0; padding-right: 90px; -}</style> +} + + .bottom { + margin-top: 13px; + line-height: 12px; + } + + .button { + padding: 0; + float: right; + } + + .image { + width: 100%; + display: block; + } + + .clearfix:before, + .clearfix:after { + display: table; + content: ""; + } + + .clearfix:after { + clear: both + } +</style> -- Gitblit v1.9.1