瀏覽代碼

PCIMbug修改

zyz 6 年之前
父節點
當前提交
4173569ed4
共有 5 個文件被更改,包括 65 次插入12 次删除
  1. 54 4
      api/http-request.js
  2. 1 1
      app/home/html/index.html
  3. 3 3
      app/jbsc/css/filter_type.css
  4. 2 2
      app/jbsc/html/filter_type.html
  5. 5 2
      app/jbsc/html/questionnaire.html

+ 54 - 4
api/http-request.js

@ -24,7 +24,8 @@
        server = "http://172.19.103.88:9092/wlyy/"
        imserver = "http://172.19.103.88:3000/api/v2";
        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.133:8080/";
//      server = "http://192.168.131.127:8060/"; //逸祥
@ -37,7 +38,7 @@
        imgServer = "http://172.19.103.54/";
    }
    userAgent = localStorage.getItem(agentName)
    userAgent = window.localStorage.getItem(agentName)
    if(userAgent) {
@ -55,7 +56,7 @@
    if(isRelogined && location.href.indexOf("login.html") < 0){
        sessionStorage.removeItem('wlyy_relogin')
    }
	
    function httpGet(url, options) {
        //发送ajax请求
        return new Promise(function(resolve, reject) {
@ -80,7 +81,30 @@
                }, options));
        })
    }
	function articleGet(url, options) {
        //发送ajax请求
        return new Promise(function(resolve, reject) {
            $.ajax(articleServer + url,
                $.extend({}, {
                    type: 'GET',
                    dataType: 'JSON',
                    beforeSend: function(request) {
                        var agent = userAgent || {
                            imei: localStorage.getItem('WLYY_IMEI'),
                            platform: 4
                        }
                        request.setRequestHeader("userAgent", JSON.stringify(agent));
                    },
                    error: function(res) {
                        reject(res)
                    },
                    success: function(res) {
                        failCodeHandle(res)
                        resolve(res)
                    }
                }, options));
        })
    }
    function httpPost(url, options) {
        //发送ajax请求
        return new Promise(function(resolve, reject) {
@ -104,6 +128,29 @@
                }, options));
        })
    }
    function articlePost(url, options) {
        //发送ajax请求
        return new Promise(function(resolve, reject) {
            $.ajax(articleServer + url,
                $.extend({}, {
                    type: 'POST',
                    dataType: 'JSON',
                    beforeSend: function(request) {
                        var agent = userAgent || {
                            imei: localStorage.getItem('WLYY_IMEI')
                        }
                        request.setRequestHeader("userAgent", JSON.stringify(agent));
                    },
                    error: function(res) {
                        reject(res)
                    },
                    success: function(res) {
                        failCodeHandle(res)
                        resolve(res)
                    }
                }, options));
        })
    }
    function imHttpGet(url, options) {
        //发送ajax请求
@ -148,6 +195,7 @@
    }
    function toLoginPage() {
    	return 
        if(location.href.indexOf('login.html') > -1) {
            return;
        }
@ -242,6 +290,8 @@
        imHttpPost: imHttpPost,
        getImgUrl: getImgUrl,
        imgServer:imgServer,
        articleGet:articleGet,
        articlePost:articlePost,
        failCodeHandle: failCodeHandle,
        loginIm: function(data){
            return imHttpPost('/users/login', data);

+ 1 - 1
app/home/html/index.html

@ -33,7 +33,7 @@
    </head>
    <body>
    	<div class="flex-box" style="align-items: stretch;">
    		<iframe style="width: 300px;height: calc(100vh);" frameborder='0' src="menu.html" noresize="noresize" id="tab"></iframe>
    		<iframe style="width: 250px;height: calc(100vh);" frameborder='0' src="menu.html" noresize="noresize" id="tab"></iframe>
       	 	<iframe class="flex-box-item" src="href:aboutblank;" frameborder='0' name="view_frame" id="main" class="p10" noresize="noresize"></iframe>
    	</div>
    </body>

+ 3 - 3
app/jbsc/css/filter_type.css

@ -13,9 +13,9 @@
.go-back{color: #12B7F5!important;}
.select-list p{margin-bottom: 0;}
.denizen-list{padding: 0;list-style: none;overflow: hidden;}
.search-box{position: relative;}
.search-denizen{position: relative;}
.search-icon{width: 50px;height: 40px;position: absolute;right: 0;top: 0;display: block;background: url(../../../images/sousuo_icon.png) center center / 15px 15px no-repeat;}
.search-box input{height: 28px;padding: 2px 10px;background-color: #f5f5fa;}
.search-denizen input{height: 28px;padding: 2px 10px;background-color: #f5f5fa;}
.select-box select{border: 0;border: none;box-shadow: none;padding-left: 0;padding-right: 0;margin-top: 2px;}
.select-box select:focus{outline: none;box-shadow: none;}
.pt6{padding-top: 6px;}
@ -60,6 +60,6 @@
.mb-icon-round.red{border: solid 1px #FF4c4c;color: #FF4c4c;}
.mb-icon-round.orange{border: solid 1px #FFc691;color: #FFc691;}
.mb-icon-round.green{border: solid 1px #06bf04;color: #06bf04;}
.start-screening{height: 40px;width: 200px;margin: 20px auto;display: block;}
.start-screening{height: 40px;width: 200px;margin: 20px auto;display: block;background-color: #12b7f5;color: #fff;}
.clear-fixed-bottom{height: 80px;}
.btn-fixed-bottom{background: #fff;position: fixed;left: 0;right: 0;bottom: 0;max-width: 280px;}

+ 2 - 2
app/jbsc/html/filter_type.html

@ -35,7 +35,7 @@
								<option v-for="item in doctorList" :value="item.id">{{item.name}}</option>
							</select>
						</li>
						<li class="plr10 pt6 search-box">
						<li class="plr10 pt6 search-denizen">
							<input type="text" placeholder="搜索居民名" v-model="denizenName" class="form-control" />
							<span class="search-icon" @click="searchDenizen"></span>
						</li>
@ -97,7 +97,7 @@
					</ul>
					<div class="clear-fixed-bottom" v-if="(currentType==1)">
						<div class="btn-fixed-bottom">
							<button class="btn btn-primary start-screening" :class="{'disabled':!screeningResidents.code}"  @click="startScreening">开始筛查</button>
							<button class="btn start-screening" :class="{'disabled':!screeningResidents.code}"  @click="startScreening">开始筛查</button>
						</div>
					</div>
				</div>

+ 5 - 2
app/jbsc/html/questionnaire.html

@ -85,7 +85,7 @@
				</div>
				
				<div class="btn-group-bottom">
					<button class="btn btn-primary" @click="save" :class="{'disabled':progress!=100}">提交</button>
					<button class="btn btn-primary" @click="save">提交</button>
					<button class="btn btn-default" @click="signOut">退出</button>
				</div>
			</div>
@ -158,7 +158,6 @@
						this.selectArr = _.filter(this.selectArr,function(o) {
								return o.qstCode !=data.qstCode;
						}) || [];
						console.log(this.selectArr)
						this.selectArr.push(data);
						var len=this.selectArr.length;
						var questions=Object.values(this.questions)
@ -210,6 +209,10 @@
					},
					save:function(){
						var vm=this;
						if(vm.progress!=100){
							top.layer.msg('问卷还未全部填写', {icon: 5});
							return ;
						}
						var loadding = top.layer.load(0, {shade: false}); //0代表加载的风格,支持0-2
						var data={
							patientCode:vm.screeningResidents,