Browse Source

样式修改

yingzhou 6 years ago
parent
commit
a013fd6175

+ 2 - 2
api/http-request.js

@ -28,7 +28,7 @@
        socketUrl = "http://172.19.103.88:3000";
//      server = "http://192.168.131.154:8080/"
        articleServer="http://172.19.103.88:9092/wlyy/"
     server = "http://192.168.131.130:8080/";
//   server = "http://192.168.131.130:8080/";
//		server = "http://192.168.131.123:8080/"; // 明芬
//      server = "http://192.168.131.127:8060/"; //逸祥
//      server = "http://192.168.131.24:8080/"; //仕杰
@ -221,8 +221,8 @@
        if(tip) {
            count ++;
            if(count == 1){
            	toLoginPage()
                toastr && toastr.warning(tip)
//              toLoginPage()
            }
        }
    }

+ 4 - 1
app/rehabilitation/css/rehabilitation_management.css

@ -68,7 +68,7 @@ body,html,.c-container{height: 100%;}
.coloured-box{top: 0;position: absolute;right: 5px;}
.coloured-ribbon-blue{background: url(../images/biaoqian-lanse_img.png) center center / 100% 100% no-repeat;}
.coloured-ribbon-green{background: url(../images/biaoqian-lvse_img.png) center center / 100% 100% no-repeat;margin-left: 5px;}
.task-icon{position: absolute;right: 63px;top: 10px;min-height: 20px;}
.task-icon{position: absolute;left: 50px;top: 10px;min-height: 20px;}
.task-icon .icon-check{position: absolute;right: -3px;bottom: 0;width: 15px;height: 15px;}
.day-number{font-size: 28px;color: #999999;margin-bottom: 0;line-height: 1;}
/*进度条*/
@ -103,6 +103,9 @@ body,html,.c-container{height: 100%;}
/*.time-axis tr:hover p{}*/
[is-future="1"] .cur-status,[is-future="2"] .cur-status{background-color: #12b7f5;}
[is-future="-1"] .cur-status{background-color: #ff3b30;}
.c-ff3b30{color: #ff3b30;}
[is-future="1"] .day-number{color: #12B6F4;}
[is-future="2"] .day-number{color: #333;}
[is-future="3"] .cur-status{background-color: #5cb85c;}
.time-box:after{content: '';position: absolute;right: 0;z-index: 2;right: 19px;height: 100%;width: 1px;background-color: #d7dce6;top: 50%;}
.time-axis tr:nth-last-of-type(1) .time-box:after{display: none;}

+ 1 - 1
app/rehabilitation/html/guide_the_message.html

@ -110,7 +110,7 @@
	      		<div class="note-info pt10" v-if="(service.type==2 || service.type==3 || service.type==4) && service.relationRecordCode">
	      			<p class="f14 c-333">关联记录</p>
	      			<p class="guanlian-list text-center c-333" @click="viewDetial(service.type,service.relationRecordCode)">
	      				<span class="pull-right"><i class="icon icon-arrow-right"></i></span>{{service.type==2?'健康文章':(service.type==3?'健康之道':'随访记录')}} {{service.completeTimeShort}}
	      				<span class="pull-right"><i class="icon icon-arrow-right"></i></span>{{service.type==2?'健康文章':(service.type==3?'健康指导':'随访记录')}} {{service.completeTimeShort}}
	      			</p>
	      		</div>
	      		<div id="outerdiv" style="position:fixed;top:0;left:0;background:rgba(0,0,0,0.7);z-index:2;width:100%;height:100%;display:none;">

+ 2 - 2
app/rehabilitation/html/rehabilitation_management.html

@ -75,7 +75,7 @@
						</div>
						<div class="calendar-days">
							<div class="flex-box">
								<div class="calendar-day" v-for="item in calendarData" @click="viewDetail(item.planDetailIds)">
								<div class="calendar-day" v-for="item in calendarData" @click="viewDetail(item.planDetailIds)" :is-future="item.future">
									<span class="day-number">{{item.day}}</span>
									<div class="task-icon">
										<i v-if="item.myTaskFlag" class="icon icon-flag icon-20"></i>
@ -124,7 +124,7 @@
								<td class="executor">{{item.doctor_name}}</td>
								<td class="place-of-execution">{{item.hospital_name}}</td>
								<td class="view-task" @click="viewDetail(item.id,item.status,1)">查看</td>
								<td class="task-status">{{item.status==0?'未完成':(item.status==1?'已完成':'已预约')}}</td>
								<td class="task-status" :class="item.future==-1?'c-ff3b30':(item.status==0?'c-666':'')">{{item.status==0?'未完成':(item.status==1?'已完成':'已预约')}}</td>
							</tr>
							<tr v-if="!timeAxisData.length">
								<td colspan="6" class="f16 ptb10 text-center">

+ 1 - 1
app/rehabilitation/html/service_item_content.html

@ -100,7 +100,7 @@
			      		<div class="note-info pt10" v-if="service.status==1 && (service.type==2 || service.type==3 || service.type==4) && service.relationRecordCode">
			      			<p class="f14 c-333">关联记录</p>
			      			<p class="guanlian-list text-center c-333" @click="viewDetial(service.type,service.relationRecordCode)">
			      				<span class="pull-right"><i class="icon icon-arrow-right"></i></span>{{service.type==2?'健康文章':(service.type==3?'健康之道':'随访记录')}} {{service.completeTimeShort}}
			      				<span class="pull-right"><i class="icon icon-arrow-right"></i></span>{{service.type==2?'健康文章':(service.type==3?'健康指导':'随访记录')}} {{service.completeTimeShort}}
			      			</p>
			      		</div>
		      		</div>

+ 1 - 1
app/rehabilitation/js/guide_the_message.js

@ -224,7 +224,7 @@
						//				  offset: ['100px'], //右下角弹出
						area: ['80%', '600px'],
						shade: 0.5,
						title: '指导留言',
						title: '指导教育',
						fixed: true, //不固定
						maxmin: true,
						closeBtn: 1,

+ 7 - 3
app/rehabilitation/js/rehabilitation_management.js

@ -209,6 +209,7 @@
					vm.calendarData=[];
					if(res.status==200){
						var data=res.data
						var _currentTimeStamp=+new Date(new Date().setHours(0, 0, 0, 0));
						for(var i in __days){
							var _key=__days[i].date+'-'+(__days[i].day>9?__days[i].day:'0'+__days[i].day);
							var item={
@ -219,7 +220,7 @@
								if(_key==j){
									item=data[j];
									item.day=__days[i].day;
									var finishFlag=false;
									var finishFlag=false
									var sFlag=false;
									var fFlag=false;
									if(item.specialist){
@ -242,8 +243,12 @@
									break;
								}
							}
							var thatTime=+new Date(_key)-8*60*60*1000;
							var future=_currentTimeStamp>thatTime?0:(_currentTimeStamp==thatTime?1:2);
							item.future=future;
							vm.calendarData.push(item);
						}
						console.log(vm.calendarData)
					}
				})
			},
@ -278,13 +283,12 @@
				}
				rehaAPI.calendarPlanDetailList(params).then(function(res){
					if(res.status==200){
						var _currentTimeStamp=+new Date(vm.currentDayForEn);
						var _currentTimeStamp=+new Date(new Date().setHours(0, 0, 0, 0))
						vm.timeAxisData=_.map(res.data||{},function(o){
							var _time=o.executeTime.split(' ');
							var thatTime=+new Date(_time[0]);
							var future=_currentTimeStamp>thatTime?0:(_currentTimeStamp==thatTime?1:2);
							(o.status==0 && _currentTimeStamp>thatTime) && (future=-1)
							console.log(future)
							var _html=o.status==2?'预':(future==-1?'逾':'');
							_html=future==1?'今':_html;
							if(_html=='预') future=3;

+ 1 - 2
app/rehabilitation/js/service_item_content.js

@ -30,7 +30,7 @@
						//				  offset: ['100px'], //右下角弹出
						area: ['80%', '600px'],
						shade: 0.5,
						title: '指导留言',
						title: '指导教育',
						fixed: true, //不固定
						maxmin: true,
						closeBtn: 1,
@ -187,7 +187,6 @@
				var vm=this;
				var imurl=httpRequest.socketUrl;
			    jQuery.getScript(imurl+"/socket.io/socket.io.js").done(function() {
			    	var type=2;//咨询类型
			        var socket = io.connect(imurl);
			        var sessionId = 'system';
			        socket.emit('login', {userId: userInfo.uid, password: userInfo.uid,sessionId:sessionId,clientType:"doctor"});