Página inicial Explorar Ajuda
Registrar Entrar
front
/
preliminary
2
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

Merge remote-tracking branch 'origin/his/shaoyifu' into syf-scale1220

# Conflicts:
#	config/index.js
#	src/components/Symptom.vue
zhouna 3 anos atrás
pai
839b39219e 995ca25e31
commit
0314c6ef07
5 arquivos alterados com 39 adições e 11 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 17 1
      src/App.vue
  2. 8 2
      src/common/Head.vue
  3. 3 2
      src/components/Department.vue
  4. 10 5
      src/components/MainPage.vue
  5. 1 1
      src/utils/tools.js

+ 17 - 1
src/App.vue
Ver arquivo 

@@ -1,5 +1,7 @@
 
 <template>
 
-    <div id="app">
 
+  <div>
 
+    <p class="pc-enter" v-if="!isMobile">请在手机端访问</p>
 
+    <div v-else id="app">
 
         <router-view/>
 
         <portal-target name="notification-outlet"></portal-target>
 
         <portal-target name="notification-detail"></portal-target>
 
@@ -7,11 +9,20 @@
 
         <portal-target name="notification-usual"></portal-target>
 
         <portal-target name="notification-head"></portal-target>
 
     </div>
 
+  </div>
 
 </template>
 
 <script>
 
   export default {
 
     name:'App',
 
+    data:()=>{
 
+      return{
 
+        isMobile:/(iPhone|iPad|iPod|iOS|Android|SymbianOS|Windows Phone)/i.test(navigator.appVersion),
 
+      }
 
+    },
 
     mounted(){
 
+      if(!this.isMobile){
 
+        return;
 
+      }
 
       (/iphone|ipod|ipad/i.test(navigator.appVersion)) && document.addEventListener('blur', (e) => {
 
         // 这里加了个类型判断，因为a等元素也会触发blur事件
 
         if(['input', 'textarea'].includes(e.target.localName)) {
 
@@ -28,6 +39,11 @@
 
 </script>
 
 <style lang="less">
 
   @import "./less/index.less";
 
+  .pc-enter{
 
+    margin: 20px 0 0;
 
+    text-align: center;
 
+    font-size: 14px;
 
+  }
 
 </style>

+ 8 - 2
src/common/Head.vue
Ver arquivo 

@@ -4,6 +4,7 @@
 
       <div class="title">
 
         <span :class="{'active':activeTab==i.type}" :style="{width:(100/allMoudles.length)+'%'}" v-for="i in allMoudles">{{i.name}}</span>
 
       </div>
 
+      <p class="num">题目{{progressNum}}</p>
 
       <div class="progress">
 
         <p :style="{width:progress}"></p>
 
       </div>
 
@@ -12,7 +13,7 @@
 
 </template>
 
 <script>
 
 export default {
 
-  props:['activeTab','allMoudles','progress']
 
+  props:['activeTab','allMoudles','progress','progressNum']
 
 }
 
 </script>
 
 <style lang="less" scoped>
 
@@ -27,6 +28,11 @@ export default {
 
   .title{
 
     height: 100%;
 
   }
 
+  .num{
 
+    text-indent: 16px;
 
+    font-size: 12px;
 
+    color: #6678FF;
 
+  }
 
   span{
 
     display: inline-block;
 
     font-size: .26rem;
 
@@ -53,4 +59,4 @@ export default {
 
     }
 
   }
 
 }
 
-</style>
 
+</style>

+ 3 - 2
src/components/Department.vue
Ver arquivo 

@@ -55,7 +55,7 @@
 
         },
 
         created(){
 
             let query = this.$route.query;
 
-            let type = query.patientInfoType,name = query.patientName,value = query.patientInfo,code=query.hospitalCode,sonHospitalCode=query.sonHospitalCode,sonHospitalName=query.sonHospitalName;
 
+            let type = query.patientInfoType,name = query.patientName,value = query.patientInfo,code=query.hospitalCode,sonHospitalCode=query.sonHospitalCode,sonHospitalName=query.sonHospitalName,interId=query.interId;
 
             if(value&&name&&type&&code){//带信息直接跳转列表页面
 
                 this.getSysConfig(code)
 
                 const param = {
 
@@ -64,7 +64,8 @@
 
                     hospitalCode: code,
 
                     patientName:name,
 
                     sonHospitalCode: sonHospitalCode||'',
 
-                    sonHospitalName: sonHospitalName||''
 
+                    sonHospitalName: sonHospitalName||'',
 
+                    interId: interId
 
                 };
 
                 this.signInStr(param);
 
             }else{

+ 10 - 5
src/components/MainPage.vue
Ver arquivo 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div class="page">
 
-    <Head :activeTab='activeTab' :allMoudles='allMoudles' :progress='progress'/>
 
+    <Head :activeTab='activeTab' :allMoudles='allMoudles' :progressNum="progressNum" :progress='progress'/>
 
     <!-- <div class="progress-bar">
 
       <div class="title">
 
         <span :class="{'active':activeTab==i.type}" :style="{width:(100/allMoudles.length)+'%'}" v-for="i in allMoudles">{{i.name}}</span>
 
@@ -49,7 +49,7 @@
 
         <div v-for="(item,idx) in addContentQasList" :key="'3'+idx+item.id">
 
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="cancelNum"/>
 
         </div>
 
-        
+
 
         <!-- <div v-for="(item,idx) in diagnoseQasList" :key="'1'+idx+item.id" v-if="activeTab==moduleKeys[1]||activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
 
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length]" :cancelNum="cancelNum"/>
 
         </div>
 
@@ -59,7 +59,7 @@
 
         <div v-for="(item,idx) in addContentQasList" :key="'3'+idx+item.id" v-if="activeTab==moduleKeys[3]">
 
           <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="cancelNum"/>
 
         </div> -->
 
-        
+
 
       </div>
 
     </div>
 
     <MultSelect @updataResult="updataResultSingle" :num="num" :symptomResult="symptomResult" v-if="type==3"></MultSelect>
 
@@ -160,6 +160,8 @@ export default {
 
       wrong:false,      //是否显示错误toast
 
       showConfirm: false,
 
       time:1000,
 
+      progressNum:'',
 
+
 
     }
 
   },
 
   created() {
 
@@ -207,6 +209,9 @@ export default {
 
         return '0.1px';
 
       }
 
       const moduleName = this.moduleMap[this.activeTab]+'QasList';
 
+      const pnum = this[moduleName].length;
 
+      const snum = (this.num+1)>pnum?pnum:(this.num+1);
 
+      this.progressNum=(pnum===0?0:snum)+"/"+pnum;
 
       const precent = (this.num+1)/this[moduleName].length;
 
       return precent*100+"%";
 
     }
 
@@ -353,7 +358,7 @@ export default {
 
       //上传的图片及是否有可上传***答案不显示在预览所以不记录到state.diagnose.text中
 
       if(this.symptomResult.id!==999999&&this.symptomResult.controlType!=4){
 
         // console.log('当前问题单选',this.num-1,this.canceledQa,contentResult.val,contentResult.valp)
 
-        this.$store.commit('setText', { 
+        this.$store.commit('setText', {
 
           type: this.activeTab,
 
           text: contentResult.val,
 
           textP: contentResult.valp,
 
@@ -497,7 +502,7 @@ export default {
 
   position: fixed;
 
   box-sizing: border-box;
 
   overflow: hidden;
 
-  top: 0.86rem;
 
+  top: 1.4rem;
 
 }
 
 .scrollPart {
 
   // padding-bottom: 5rem;

+ 1 - 1
src/utils/tools.js
Ver arquivo 

@@ -1,7 +1,7 @@
 
 
 const qs = require('qs');
 
 const $ = require('jquery');
 
-const imageUrlPrefix = 'http://192.168.2.122:82';//'http://223.93.170.82:10082' //后台图片地址
 
+const imageUrlPrefix = 'http://61.153.6.101:82';//'http://223.93.170.82:10082' //后台图片地址
 
 // const imageUrlPrefix = 'http://192.168.2.236:82' //后台图片地址
 
 
 const configer = {