Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/user/evaluationtool/RassAssessment.vue

@@ -45,36 +45,42 @@
                           </tr>
                         </thead>
                         <tbody>
-                          <tr class="bg_color" v-for="(item,index) in RASS" :key="index" :style="{'background':(index==0 || index % 2==0) ?'rgb(243, 240, 240)':'white'}">
-                              <td class='bing'>
-                                <!-- <div class="rightjiange" style="position: relative;">
-                                  <label><input type="radio" name="ball" :value="item.value" @change="handleCheckedCitiesChange"/>&nbsp;
-                                      <div style="display: inline-block;">{{item.title}}</div>
-                                      &nbsp;<div :style="{'display': 'inline-block','width':' 430px','position': 'absolute','top':index ==4 ? '-8px':'0px'}">
-                                     {{item.value}}
+                          <tr >
+                              <td>
+                                <table class="table" border="1" style="width: 100%;border-collapse: collapse;">
+                                  <tr class="bg_color" v-for="(item,index) in RASS" :key="index" 
+                                  :style="{'background':(index==0 || index % 2==0) ?'rgb(243, 240, 240)':'white'}">
+                                    <td>
+                                      <div class="rightjiange" style="position: relative;">
+                                        <label style="">
+                                          <input type="radio" name="ball" :value="item.value"  @change="handleCheckedCitiesChange"/>
+                                          <div style="display: inline-block;">{{ item.title }}</div>&nbsp;
+                                          <div :style="{'display': 'inline-block','position': 'absolute','top':index !=0 ? '-8px':'0px','overflow': 'auto','height': '30px'}">
+                                              {{ item.value }}
+                                          </div>
+                                        </label>
                                       </div>
-                                  </label>
-                                </div> -->
-                                <div class="rightjiange" style="position: relative;">
-                                  <label style="">
-                                    <input type="radio" name="ball" :value="item.value"  @change="handleCheckedCitiesChange"/>
-                                    <div style="display: inline-block;">{{ item.title }}</div>&nbsp;
-                                    <div :style="{'display': 'inline-block','position': 'absolute','top':index !=0 ? '-8px':'0px','overflow': 'auto','height': '30px'}">
-                                        {{ item.value }}
-                                    </div>
-                                  </label>
-                                </div>
+                                    </td>
+                                  </tr>
+                                </table>
                               </td>
-                              <td class='bing'>
-                                <div class="rightjiange" style="position: relative;">
-                                  <label style="">
-                                    <input type="radio" name="ball" :value="item.value2"  @change="handleCheckedCitiesChange"/>
-                                    <div style="display: inline-block;">{{ item.title2 }}</div>&nbsp;
-                                    <div :style="{'display': 'inline-block','position': 'absolute','top':index !=0 && index !=1 ? '-8px':'0px','overflow': 'auto','height': '30px'}">
-                                        {{ item.value2 }}
-                                    </div>
-                                  </label>
-                                </div>
+                              <td>
+                                <table class="table" border="1" style="width: 100%;border-collapse: collapse;">
+                                  <tr v-for="(item,index) in RASS1" :key="index"
+                                  :style="{'background':(index==0 || index % 2==0) ?'rgb(243, 240, 240)':'white'}">
+                                    <td>
+                                      <div class="rightjiange" style="position: relative;">
+                                        <label style="">
+                                          <input type="radio" name="ball" :value="item.value2"  @change="handleCheckedCitiesChange"/>
+                                          <div style="display: inline-block;">{{ item.title2 }}</div>&nbsp;
+                                          <div :style="{'display': 'inline-block','position': 'absolute','top':index !=0 && index !=1 ? '-8px':'0px','overflow': 'auto','height': '30px'}">
+                                              {{ item.value2 }}
+                                          </div>
+                                        </label>
+                                      </div>
+                                    </td>
+                                  </tr>
+                                </table>
                               </td>
                           </tr>
                         </tbody>
@@ -504,11 +510,17 @@ export default {
                   {title:'2分', value:'频繁发生昏昏欲睡，容易唤醒，但不能持续处于觉醒状态'},
                   {title:'3分', value:'无意识，无法唤醒'},{title:'S分', value:'正常意识，容易唤醒'}
                 ],
-            RASS:[{title:'-5分', value:'无法唤醒，对声音或物理刺激均无反应',title2:'0分', value2:'警觉的平静的'},
-                  {title:'-4分', value:'深度镇静，对声音刺激无反应，但对物理刺激有运动或睁眼反应',title2:'+1分', value2:'不安的焦虑的：焦虑但无强烈的攻击行为'},
-                  {title:'-3分', value:'中度镇静，对声音刺激有活动或睁眼动作（但无目光接触）',title2:'+2分', value2:'焦虑的激动的：经常性的无目的活动，人机对抗'},
-                  {title:'-2分', value:'轻度镇静，对于声音刺激可以有简短的目光接触的觉醒，<10s',title2:'+3分', value2:'非常焦虑激动的：牵拉或拔除管道，容易焦虑不安'},
-                  {title:'-1分', value:'困倦的昏昏欲睡的，不完全觉醒但能保持觉醒状态，对于声音刺激眼睛可以睁开或有目光接触≥10s',title2:'+4分', value2:'好斗的好战的：过于好斗，有暴力倾向，对医护人员有攻击行为'},
+            RASS:[{title:'-5分', value:'无法唤醒，对声音或物理刺激均无反应'},
+                  {title:'-4分', value:'深度镇静，对声音刺激无反应，但对物理刺激有运动或睁眼反应'},
+                  {title:'-3分', value:'中度镇静，对声音刺激有活动或睁眼动作（但无目光接触）'},
+                  {title:'-2分', value:'轻度镇静，对于声音刺激可以有简短的目光接触的觉醒，<10s'},
+                  {title:'-1分', value:'困倦的昏昏欲睡的，不完全觉醒但能保持觉醒状态，对于声音刺激眼睛可以睁开或有目光接触≥10s'},
+                ],
+            RASS1:[{title2:'0分', value2:'警觉的平静的'},
+                  {title2:'+1分', value2:'不安的焦虑的：焦虑但无强烈的攻击行为'},
+                  {title2:'+2分', value2:'焦虑的激动的：经常性的无目的活动，人机对抗'},
+                  {title2:'+3分', value2:'非常焦虑激动的：牵拉或拔除管道，容易焦虑不安'},
+                  {title2:'+4分', value2:'好斗的好战的：过于好斗，有暴力倾向，对医护人员有攻击行为'},
                 ],
             RassGJ:['NRS','表情法','视觉模拟法','语言描述法','行为学评估量表','其他'],
             yuyan:[{label:'0无痛',value:0},{label:'1微痛',value:1},{label:'2一般',value:2},{label:'4中度疼痛',value:4},{label:'6中重度疼痛',value:6},{label:'8重度疼痛',value:8},{label:'10无法忍受',value:10}],
@@ -534,6 +546,7 @@ export default {
         console.log('11111',e.target.value);
         const lent = this.LOS
         const len = this.RASS
+        const len2=this.RASS1
         for(let i=0;i<lent.length;i++){
           if(e.target.value == lent[i].value ){
             this.RASS_Totalpoints=lent[i].title.split('分')[0]
@@ -544,10 +557,14 @@ export default {
             console.log('2222',len[y].title.split('分')[0]);
             this.RASS_Totalpoints = len[y].title.split('分')[0]
           }
-          if(e.target.value == len[y].value2 ){
-            this.RASS_Totalpoints = len[y].title2.split('分')[0]
+          
+        }
+        for(let y=0;y<len2.length;y++){
+          if(e.target.value == len2[y].value2 ){
+            this.RASS_Totalpoints = len2[y].title2.split('分')[0]
           }
         }
+
       },
       radioclick(e,value){
         console.log('2222',e,value);

src/xt_pages/workforce/appointment.vue

@@ -130,53 +130,55 @@
       </div>
       <!-- 编辑 -->
        <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
-                        :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
-                         title="" @event1="changePartition"
-                         @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
-          <div class="position">
-            <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
-            <div>
-              <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
-                <el-tab-pane name="beforeWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="lastWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="thisWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="nextWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
-                </el-tab-pane>
-                <el-tab-pane name="nextTwoWeek">
-                  <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
-                </el-tab-pane>
-              </el-tabs>
-            </div>
-            <div style="display:flex;align-items:center">
-              <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
-              <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
-              <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-                导出排班
-              </el-button>
-              <el-button
-                  @click="generateLog()"
-                  class="filter-item"
-                  type="primary"
-                  v-if="is_edit"
-                  size="small"
-              >下载日志
-              </el-button>
-              <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
-              </el-button>
-              <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
-              <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
-              <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
-              <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+          :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
+          title="" @event1="changePartition"@event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
+          <div  style="position: relative;height: 50px">
+            <div style="position: fixed;height: 50px;width: 97%;background: #fff;z-index: 100;padding: 5px;">
+              <div style="position: relative;">
+                <!-- style="position: fixed;" class="position"-->
+                  <div style="display: inline-block;">
+                    <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
+                      <el-tab-pane name="beforeWeek">
+                        <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
+                      </el-tab-pane>
+                      <el-tab-pane name="lastWeek">
+                        <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+                      </el-tab-pane>
+                      <el-tab-pane name="thisWeek">
+                        <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+                      </el-tab-pane>
+                      <el-tab-pane name="nextWeek">
+                        <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+                      </el-tab-pane>
+                      <el-tab-pane name="nextTwoWeek">
+                        <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+                      </el-tab-pane>
+                    </el-tabs>
+                  </div>
+                  <div style="display: inline-block;float: right;">
+                    <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+                    <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
+                    <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+                      导出排班
+                    </el-button>
+                    <el-button
+                        @click="generateLog()"
+                        class="filter-item"
+                        type="primary"
+                        v-if="is_edit"
+                        size="small"
+                    >下载日志
+                    </el-button>
+                    <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+                    </el-button>
+                    <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+                    <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+                    <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+                    <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+                  </div>
+              </div>
             </div>
           </div>
-
         </edit-table-data>
         <!-- 编辑上上周 -->
         <beforeweekTable ref="beforeweeks" v-show="beforeshow" :week-time="activeName" :partitions-prop="partitions"
@@ -832,7 +834,7 @@ export default {
       // this.export_file_step_twos()
     },
     export_file_step_two: function(){
-     
+
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
         const filterVal = [
@@ -873,12 +875,12 @@ export default {
           })
 
           console.log("tablelist",this.tableList)
-          
+
 
           const filename = '排班模版'
 
           console.log('333333333',multiHeader),
-          
+
           excel.export_json_to_excel({
 
             multiHeader,
@@ -3224,7 +3226,7 @@ export default {
                     }
                     else{
                       list[i].shangwu5 = week[j].name+" "+this.getmode(week[j].mode_id)+" "+week[j].dialysis_machine_name
-                     
+
                     }
                   }
                   //周六下午
@@ -3638,7 +3640,7 @@ export default {
                     else{
                       list[i].xiawu14 = lastWeek[j].name+" "+this.getmode(lastWeek[j].mode_id)+" "+lastWeek[j].dialysis_machine_name
                     }
-                   
+
                   }
                   //周一晚上
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
@@ -4707,7 +4709,7 @@ export default {
                       }
                       else{
                         list[i].shangwu5 = week[j].name+" "+this.getmode(week[j].mode_id)+" "+week[j].dialysis_machine_name
-                      
+
                       }
                     }
                     //周六下午
@@ -5051,7 +5053,7 @@ export default {
       //     return this.mode[i].name
       //   }
       // }
-    
+
       var mode_name =""
       for(let i=0;i<this.mode.length;i++){
         if(ids==this.mode[i].id){
@@ -5063,7 +5065,7 @@ export default {
     }
   },
   created() {
-    
+
     this.getlist()
     this.getPatientList()
     var start_time = moment().weekday(1).format('YYYY-MM-DD');

src/xt_pages/workforce/components/editTableData.vue

@@ -107,8 +107,8 @@
       </div>
       <!-- 右侧 -->
       <div class="right_contain">
-        <div>
-          <div>
+        <div style="position: relative;height: 50px;">
+          <div style="position: fixed; z-index: 100;width: 82%;background: #fff;">
             <span>日期：</span>
             <el-select v-model="week_type" style="margin-bottom: 15px;" placeholder="请选择" multiple>
               <el-option
@@ -120,7 +120,6 @@
               >
               </el-option>
             </el-select>
-
             <span>分区：</span>
             <!-- 下拉框 -->
             <el-select
@@ -170,7 +169,7 @@
             :cell-style ='cellstyle'
             :row-class-name="tableRowClassName"
             show-summary
-
+            
             ref="table"
             style="table-layout: fixed;"
 
@@ -6230,7 +6229,7 @@ textarea{
   overflow: auto;
   margin: 0;
   background: #fff;
-  padding: 20px;
+  padding:0 20px 20px 20px;
   z-index:2000;
   height: 100%;
 }