Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/guidance/css/index.css

@@ -32,6 +32,8 @@ ul {
	float: right;
}
.ui-popup-full { width: 50%; }
#app>.ui-grid, #app>.ui-grid .ui-grid {
	height: 100%;
}

app/recover/html/personal-manage.html

@@ -92,8 +92,9 @@
			    							<span class="fr c-999">{{plan.time}}</span>
			    						</p>
			    						<div class="clearfix">
			    							<p class="fl w-100-78 bgc-c1c1c1 lh22 b-r-11 c-position-r c-t-center">{{setPercent(plan)}}
			    							<p class="fl w-100-78 bgc-c1c1c1 lh22 b-r-11 c-position-r c-t-center">
			    								<span class="c-position-a bgc-orange lh22 b-r-11 c-t-center c-fff" :style="{width: setPercent(plan), left: 0}"></span>
			    								<span class="c-position-r w-100 c-t-center">{{setPercent(plan)}}</span>
			    							</p>
			    							<span class="fr w60 c-999 lh22">{{plan.allFinishCount}}/{{plan.allCount}}</span>
			    						</div>

app/recover/html/project-detail.html

@@ -50,7 +50,7 @@
					<li class="fl set-photo c-border mr10 clearfix" v-for="(record, index) in planDetail.relationRecordImg" :key="index">
						<img class="fl" :src="handleImg(record)" alt="记录图" @click="lookPhoto(record)" />
					</li>
					<li class="c-t-center" v-if="!planDetail.relationRecordImg.length">暂无相关记录</li>
					<li class="c-t-center" v-if="planDetail.relationRecordImg && !planDetail.relationRecordImg.length">暂无相关记录</li>
				</ul>
			</div>
		</div>

app/rehabilitation/css/health_control.css

@@ -268,6 +268,9 @@ li {
    justify-content: center;
}
.datab p:nth-child(1){
    text-align: center;
}
.datab .cred {
    color: #ff3b30;

app/rehabilitation/css/management.css

@@ -36,6 +36,8 @@ a {
	float: right;
}
.ui-popup-full { width: auto; }
#app>.ui-grid, #app>.ui-grid .ui-grid {
	height: 100%;
}

app/rehabilitation/html/health_control.html

@@ -98,7 +98,7 @@
                                </p>
                            </div>
                            <div class="datab flex-box">
                                <p>{{data.planTypeName}}</p>
                                <p style="width: 120px">{{data.planTypeName}}</p>
                                <div class="layui-progress layui-progress-big" :lay-filter="data.id" lay-showpercent="true">
                                    <div class="layui-progress-bar" :id="'progress_'+data.id" lay-percent="">
                                    </div>

app/rehabilitation/html/moreplan.html

@@ -115,7 +115,7 @@
                       <div class="detail flex-box" v-for="(data, index) in dat.rehabilitationPlanList">
                            <div class="detaila flex-box">
                                <div class="quote2"></div>
                                {{data.planTypeName}}
                                <p style="width:120px;text-align: center;">{{data.planTypeName}}</p>
                            </div>
                            <div class="detailb flex-box">
                                <span class="cblue" :id="'span_font'+data.planId">进行中</span>

component/guidance/person-edit-panel.js

@@ -137,6 +137,7 @@ var PersonEditPanel = {
        deleteTemplate: function() {
        	var vm = this
        	var d = dialog({
        		width: 350,
				title: '删除模板',
				content: '删除后无法恢复,是否确认删除?',
				okValue: '确定',
@@ -166,6 +167,7 @@ var PersonEditPanel = {
        		return
        	}
            var d = dialog({
            	width: 350,
				content: '发出后无法变更，是否确认发送给居民？',
				okValue: '继续发送',
				ok: function () {

component/guidance/person-new-panel.js

@@ -117,6 +117,7 @@ var PersonNewPanel = {
        		return
        	}
            var d = dialog({
            	width: 350,
				content: '发出后无法变更，是否确认发送给居民？',
				okValue: '继续发送',
				ok: function () {

component/guidance/system-send-panel.js

@@ -165,6 +165,7 @@ var SystemSendPanel = {
        		return
        	}
            var d = dialog({
            	width: 350,
				content: '发出后无法变更，是否确认发送给居民？',
				okValue: '继续发送',
				ok: function () {

component/guidance/team-edit-panel.js

@@ -212,6 +212,7 @@ var TeamEditPanel = {
        deleteTemplate: function() {
        	var vm = this
        	var d = dialog({
        		width: 350,
				title: '删除模板',
				content: '删除后无法恢复,是否确认删除?',
				okValue: '确定',
@@ -252,6 +253,7 @@ var TeamEditPanel = {
        	}
        	
            var d = dialog({
            	width: 350,
				content: '发出后无法变更，是否确认发送给居民？',
				okValue: '继续发送',
				ok: function () {

component/guidance/team-new-panel.js

@@ -225,6 +225,7 @@ var TeamNewtPanel = {
        	}
        	
            var d = dialog({
            	width: 350,
				content: '发出后无法变更，是否确认发送给居民？',
				okValue: '继续发送',
				ok: function () {

component/rehabilitation/template-items.js

@@ -113,6 +113,7 @@ var TemplateItems = {
    		var vm = this
    		
    		var d = dialog({
    			width: 300,
				content: '确定删除该模板？',
				okValue: '确认',
				ok: function () {

plugins/artDialog/6.0.5/css/ui-dialog.min.css

@@ -1,4 +1,4 @@
.ui-popup-full { width: 100%; box-sizing: border-box; -webkit-box-sizing: border-box; padding: 0 25px !important; left: 0 !important }
/*.ui-popup-full { width: 100%; box-sizing: border-box; -webkit-box-sizing: border-box; padding: 0 25px !important; left: 0 !important }*/
.ui-dialog {
 *zoom: 1; _float: left; position: relative; background-color: #FFF; border: 1px solid #999; border-radius: 6px; outline: 0; background-clip: padding-box; font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height: 1.428571429; color: #333; opacity: 0; -webkit-transform: scale(0); transform: scale(0); -webkit-transition: -webkit-transform .15s ease-in-out, opacity .15s ease-in-out; transition: transform .15s ease-in-out, opacity .15s ease-in-out; padding: 0 10px }
.ui-popup-show .ui-dialog { opacity: 1; -webkit-transform: scale(1); transform: scale(1) }