zsw007 3 年 前
コミット
841dd33b36
2 ファイル変更29 行追加17 行削除
  1. 27 15
      src/components/callRecord/CallRecordManager.vue
  2. 2 2
      vue.config.js

+ 27 - 15
src/components/callRecord/CallRecordManager.vue

@@ -2,16 +2,6 @@
   <div>
     <crumbs title="调用记录" style="min-width: 980px;" class="knowledgeTitle">
       <el-form :inline="true"  class="demo-form-inline">
-        <el-form-item label="患者标识:" prop="patientId">
-          <el-input
-            size="mini"
-            v-model="filter.patientId"
-            placeholder="输入患者标识"
-            clearable
-            maxlength="50"
-          ></el-input>
-        </el-form-item>
-        
         <el-form-item label="接收时间: ">
           &nbsp;&nbsp;
           <el-date-picker
@@ -21,7 +11,7 @@
             size="small"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            style="width: 240px"
+            style="width: 310px"
             :default-time="['00:00:00', '23:59:59']"
             format="yyyy-MM-dd HH:mm"
             value-format="yyyy-MM-dd HH:mm"
@@ -37,13 +27,15 @@
             size="small"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            style="width: 240px"
+            style="width: 310px"
             :default-time="['00:00:00', '23:59:59']"
             format="yyyy-MM-dd HH:mm"
             value-format="yyyy-MM-dd HH:mm"
           >
           </el-date-picker>
         </el-form-item>
+        
+        
         <!-- <el-form-item label="状态:">
           <el-select
             v-model="filter.successFlag"
@@ -72,6 +64,16 @@
         </el-form-item> -->
       </el-form>
       <el-form class="secLine" :inline="true">
+        <el-form-item label="患者标识:" prop="patientId">
+          <el-input
+            size="mini"
+            v-model="filter.patientId"
+            placeholder="输入患者标识"
+            clearable
+            maxlength="50"
+          ></el-input>
+        </el-form-item>
+
         <el-form-item label="服务名:" prop="sceneName">
           <el-input
             size="mini"
@@ -292,7 +294,6 @@ export default {
       pageLayout: config.pageLayout,
       total: 0,
       titleWidth: "970px", //头部最小宽度
-      
       reqVisible: false,
       respVisible: false,
       params: '',
@@ -350,6 +351,7 @@ export default {
       );
       this.getDataList();
     },
+
     filterDatas() {
       this.currentPage = 1;
       this.getDataList(1);
@@ -411,7 +413,7 @@ export default {
           }
         }else{
            startGmtReq =  this.filter.recepDate[0]+':00'
-           endGmtReq =  this.filter.recepDate[1]+':00'
+           endGmtReq =  this.filter.recepDate[1]+':59'
         }
       }
 
@@ -423,7 +425,7 @@ export default {
           }
         }else{
            startGmtResp =  this.filter.resDate[0]+':00'
-           endGmtResp =  this.filter.resDate[1]+':00'
+           endGmtResp =  this.filter.resDate[1]+':59'
         }
       }
 
@@ -583,6 +585,11 @@ export default {
 }
 
 .demo-form-inline {
+  display: flex;
+  justify-content: flex-end;
+  .el-form-item:nth-child(1) {
+    margin-right: 10px;
+  }
   .el-input--mini {
     /deep/.el-input__inner {
       width: 100%;
@@ -627,4 +634,9 @@ export default {
   padding: 0 20px;
 }
 
+
+
+
+ 
+
 </style>

+ 2 - 2
vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
-// const proxy_path = 'http://192.168.2.241:80';
+const proxy_path = 'http://192.168.2.241:80';
 // const proxy_path = 'http://192.168.2.236:88';
-const proxy_path = 'http://192.168.2.236:6060';
+//const proxy_path = 'http://192.168.2.236:6060';
 //const proxy_path = 'http://192.168.2.241:6060';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚