通用记录界面优化

src/api/index.js

@@ -3,13 +3,10 @@ import config from './config.js';
 
 axios.default.timeout = 500000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-<<<<<<< HEAD
 //axios.defaults.baseURL = 'http://192.168.2.236:6060';
 axios.defaults.baseURL = 'http://192.168.2.241:84';
-=======
-axios.defaults.baseURL = 'http://192.168.2.236:6060';
+//axios.defaults.baseURL = 'http://192.168.2.236:6060';
 // axios.defaults.baseURL = 'http://192.168.2.241';
->>>>>>> test
 // axios.defaults.baseURL = 'http://192.168.3.113:6060';
 
 

src/assets/css/common.css

@@ -11,4 +11,6 @@ html,body,#app {
     margin-right: 20px;
   }
 
-
+  .el-time-panel__btn.confirm {
+      color: #48C5D7;
+  }

src/components/callRecord/CallRecordManager.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <crumbs title="调用记录" style="min-width: 980px;" class="knowledgeTitle">
-      <el-form :inline="true"  class="demo-form-inline">
+    <crumbs title="调用记录" style="min-width: 980px" class="knowledgeTitle">
+      <el-form :inline="true" class="demo-form-inline">
         <el-form-item label="接收时间: ">
           &nbsp;&nbsp;
           <el-date-picker
@@ -9,8 +9,8 @@
             type="datetimerange"
             align="right"
             size="small"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
             style="width: 310px"
             :default-time="['00:00:00', '23:59:59']"
             format="yyyy-MM-dd HH:mm"
@@ -25,8 +25,8 @@
             type="datetimerange"
             align="right"
             size="small"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
             style="width: 310px"
             :default-time="['00:00:00', '23:59:59']"
             format="yyyy-MM-dd HH:mm"
@@ -124,18 +124,22 @@
             >
               <span>{{scope.row.parDescription.slice(0,8)+'...'}}</span>
             </el-tooltip>-->
-            <span>{{ scope.row.patientId === null? '-' : scope.row.patientId }}</span>
+            <span>{{
+              scope.row.patientId === null ? "-" : scope.row.patientId
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column label="服务名" align="center">
           <template slot-scope="scope">{{ scope.row.sceneName }}</template>
         </el-table-column>
-        <el-table-column prop="parConceptName" label="请求内容" align="center" width="100">
+        <el-table-column
+          prop="parConceptName"
+          label="请求内容"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="reqData(scope.row)"
+            <el-button type="text" size="small" @click="reqData(scope.row)"
               >详情</el-button
             >
             <!--<el-tooltip
@@ -150,12 +154,14 @@
             <!-- <span>{{scope.row.parConceptName}}</span> -->
           </template>
         </el-table-column>
-        <el-table-column prop="parLibTypeName" label="响应内容" align="center" width="100">
+        <el-table-column
+          prop="parLibTypeName"
+          label="响应内容"
+          align="center"
+          width="100"
+        >
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="respData(scope.row)"
+            <el-button type="text" size="small" @click="respData(scope.row)"
               >详情</el-button
             >
           </template>
@@ -195,7 +201,7 @@
         <el-table-column label="状态" width="100" align="center">
           <template slot-scope="scope">
             <span>
-                {{ scope.row.successFlag === 1 ? "成功" : "失败" }}
+              {{ scope.row.successFlag === 1 ? "成功" : "失败" }}
             </span>
           </template>
         </el-table-column>
@@ -206,9 +212,13 @@
           width="180"
           show-overflow-tooltip
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <span>
-              {{ scope.row.subHospitalName === null? '-' : scope.row.subHospitalName }}
+              {{
+                scope.row.subHospitalName === null
+                  ? "-"
+                  : scope.row.subHospitalName
+              }}
             </span>
           </template>
         </el-table-column>
@@ -218,9 +228,13 @@
           align="center"
           width="100"
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <span>
-              {{ scope.row.subHospitalCode === null? '-' : scope.row.subHospitalCode }}
+              {{
+                scope.row.subHospitalCode === null
+                  ? "-"
+                  : scope.row.subHospitalCode
+              }}
             </span>
           </template>
         </el-table-column>
@@ -236,24 +250,15 @@
         :total="total"
       ></el-pagination>
       <!-- 请求弹出框 -->
-      <el-dialog
-        title="请求日志信息"
-        :visible.sync="reqVisible"
-        width="660px"
-        >
+      <el-dialog title="请求日志信息" :visible.sync="reqVisible" width="660px">
         <div class="request-item">
-          {{params}}
+          {{ params }}
         </div>
-        
       </el-dialog>
 
       <!-- 响应内容弹出框 -->
-      <el-dialog
-        title="响应日志信息"
-        :visible.sync="respVisible"
-        width="660px"
-        >
-        <div class="request-item">{{result}}</div>
+      <el-dialog title="响应日志信息" :visible.sync="respVisible" width="660px">
+        <div class="request-item">{{ result }}</div>
       </el-dialog>
     </div>
   </div>
@@ -281,9 +286,9 @@ export default {
         successFlag: "",
         patientId: "",
         sceneName: "",
-        subHospitalName: '', // 子院区
-        recepDate: '', // 接收日期
-        resDate: '', // 响应日期
+        subHospitalName: "", // 子院区
+        recepDate: "", // 接收日期
+        resDate: "", // 响应日期
       },
       cacheData: {},
       currentPage: 1,
@@ -294,8 +299,8 @@ export default {
       titleWidth: "970px", //头部最小宽度
       reqVisible: false,
       respVisible: false,
-      params: '',
-      result: ''
+      params: "",
+      result: "",
     };
   },
   created() {
@@ -322,18 +327,18 @@ export default {
   // },
   methods: {
     // 请求内容展示
-    reqData(row){
-      console.log('请求内容：', row);
-      this.reqVisible = true
-      this.params = row.params
-      console.log('请求内容：', this.params);
+    reqData(row) {
+      console.log("请求内容：", row);
+      this.reqVisible = true;
+      this.params = row.params;
+      console.log("请求内容：", this.params);
     },
 
     // 响应内容展示
-    respData(row){
+    respData(row) {
       console.log("响应内容：", row);
-      this.respVisible = true
-      this.result = row.result
+      this.respVisible = true;
+      this.result = row.result;
     },
 
     statusTrans(type) {
@@ -401,29 +406,35 @@ export default {
         this.clearFilter();
       }
       console.log(this.filter.recepDate);
-      let startGmtReq,endGmtReq,startGmtResp,endGmtResp
-      if(this.filter.recepDate){
-        console.log(this.filter.recepDate[0].split(' '));
-        if(this.filter.recepDate[0].split(0,9) === this.filter.recepDate[1].split(0,9)){
-          if(this.filter.recepDate[0]){
-             startGmtReq =  this.filter.recepDate[0]+':00'
-             endGmtReq =  this.filter.recepDate[1]+':59'
+      let startGmtReq, endGmtReq, startGmtResp, endGmtResp;
+      if (this.filter.recepDate) {
+        console.log(this.filter.recepDate[0].split(" "));
+        if (
+          this.filter.recepDate[0].split(0, 9) ===
+          this.filter.recepDate[1].split(0, 9)
+        ) {
+          if (this.filter.recepDate[0]) {
+            startGmtReq = this.filter.recepDate[0] + ":00";
+            endGmtReq = this.filter.recepDate[1] + ":59";
           }
-        }else{
-           startGmtReq =  this.filter.recepDate[0]+':00'
-           endGmtReq =  this.filter.recepDate[1]+':59'
+        } else {
+          startGmtReq = this.filter.recepDate[0] + ":00";
+          endGmtReq = this.filter.recepDate[1] + ":59";
         }
       }
 
-      if(this.filter.resDate){
-        if(this.filter.resDate[0].split(0,9) === this.filter.resDate[1].split(0,9)){
-          if(this.filter.resDate[0]){
-             startGmtResp =  this.filter.resDate[0]+':00'
-             endGmtResp =  this.filter.resDate[1]+':59'
+      if (this.filter.resDate) {
+        if (
+          this.filter.resDate[0].split(0, 9) ===
+          this.filter.resDate[1].split(0, 9)
+        ) {
+          if (this.filter.resDate[0]) {
+            startGmtResp = this.filter.resDate[0] + ":00";
+            endGmtResp = this.filter.resDate[1] + ":59";
           }
-        }else{
-           startGmtResp =  this.filter.resDate[0]+':00'
-           endGmtResp =  this.filter.resDate[1]+':59'
+        } else {
+          startGmtResp = this.filter.resDate[0] + ":00";
+          endGmtResp = this.filter.resDate[1] + ":59";
         }
       }
 
@@ -437,7 +448,7 @@ export default {
         endGmtReq: endGmtReq,
         startGmtResp: startGmtResp,
         endGmtResp: endGmtResp,
-        subHospitalName: this.filter.subHospitalName.trim() // 子院区
+        subHospitalName: this.filter.subHospitalName.trim(), // 子院区
       };
       return param;
     },
@@ -517,8 +528,8 @@ export default {
         patientId: "",
         sceneName: "",
         subHospitalName: "",
-        recepDate: '', // 接收日期
-        resDate: '', // 响应日期
+        recepDate: "", // 接收日期
+        resDate: "", // 响应日期
       };
     },
     update() {
@@ -612,9 +623,9 @@ export default {
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 1;
   overflow: hidden;
-   white-space: nowrap;
-   text-overflow: ellipsis;
-  -o-text-overflow:ellipsis;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
 }
 
 /deep/.el-dialog {
@@ -632,9 +643,9 @@ export default {
   padding: 0 20px;
 }
 
-
-
-
- 
-
+.el-time-panel__footer {
+  /deep/.confirm{
+    color: #48c5d7 !important;
+  }
+}
 </style>