2 Commits c5dc237fd8 ... 42945cb9b1

Author SHA1 Message Date
  chenyue 42945cb9b1 Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application 6 years ago
  chenyue 94ba869472 饶露修改的new-recover 6 years ago
2 changed files with 13 additions and 10 deletions
  1. 7 8
      api/http-request.js
  2. 6 2
      app/recover/html/new_recover.html

+ 7 - 8
api/http-request.js

@ -1,5 +1,5 @@
(function($) {
    var publish_version = false;
    var publish_version = true;
    var isInner = false; //发布线上后有内外网的配置
    var docInfo = "app_storage";
    var agentName = "wlyyAgentForDoc";
@ -13,7 +13,7 @@
        server = "http://www.xmtyw.cn/wlyy/"
        imserver = "http://27.155.101.77:3000/api/v2";
        socketUrl = "http://27.155.101.77:3000";
        articleServer = "http://www.xmtyw.cn/wlyy/"
        articleServer = "http://www.xmtyw.cn/wlyytest/"
        loginUrl = "../../login/login.html";
        imgServer = "http://www.xmtyw.cn/";
        if(isInner){
@ -25,13 +25,13 @@
            imgServer = "http://10.95.22.10:8011/";
        }
    } else { // 测试环境配置
        server = "http://172.26.0.118:9092/wlyy/"
        imserver = "http://172.26.0.118:3000/api/v2";
        socketUrl = "http://172.26.0.118:3000";
        server = "http://192.168.131.172:9092/wlyy/"
        imserver = "http://192.168.131.172:3000/api/v2";
        socketUrl = "http://192.168.131.172:3000";
//      server = "http://192.168.131.154:8080/"
        articleServer="http://172.26.0.118:9092/wlyy/"
        articleServer="http://192.168.131.172:9092/wlyy/"
//   server = "http://192.168.131.130:8080/";
//		server = "http://192.168.131.118:8080/"; // 明芬
//		server = "http://192.168.131.123:8080/"; // 明芬
//      server = "http://192.168.131.127:8060/"; //逸祥
//      server = "http://192.168.131.24:8080/"; //仕杰
//		server = "http://192.168.131.143:8080/"; // 志南
@ -41,7 +41,6 @@
        loginUrl = "../../login/login.html";
//      loginUrl = "/PC-prescription/login.html"; //自己本地测试时的路径
        imgServer = "http://172.19.103.54/";
        imgServer = "http://172.26.0.110:8888/";
    }
    var baseInfo = window.localStorage.getItem(docInfo);

+ 6 - 2
app/recover/html/new_recover.html

@ -60,7 +60,7 @@
	        				<label style="transform: translateY(50%); color: #999999;font-weight: normal;">就诊事件:</label>
							<div class="input-group-btn" style="width: 80%; transform: translateY(50%);top: -5px;">
								<button style="width:223px;padding: 0; text-overflow: ellipsis; overflow: hidden;" v-bind:disabled="edit" type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
									{{diagnosisInfo[indexOrder].orgName}}
									{{diagnosisInfo[indexOrder] && diagnosisInfo[indexOrder].orgName}}
									<span class="caret" style="position: absolute; top: 50%; right: 20px; margin-top: -2px;"></span>
								</button>
								<ul class="dropdown-menu" style="min-width: 206px;" >
@ -310,7 +310,7 @@
                	searchKey: null,
                	havePlan: false,
                	frequencyList: [],
                	diagnosisInfo:"",
                	diagnosisInfo:[],
                	indexOrder:0,
                	profileRes:[],
                	nodata:false,
@ -775,7 +775,11 @@
                		this.pati = pati
                		this.getPatientInfo()
                		this.findTemplateList()
<<<<<<< HEAD
//              		this.diagnosisQuery()
=======
                		this.diagnosisQuery()
>>>>>>> c5dc237fd8688dc3370532b7c19f9580c3a15538
                	},
                	// 添加模板
                	addMuban: function(oId) {