Merge branch 'test' of http://192.168.2.236:10080/zhouna/cdssHospital into test

src/assets/css/common.css

@@ -11,4 +11,12 @@ html,body,#app {
     margin-right: 20px;
   }
 
+  .el-time-panel__btn.confirm {
+      color: #48C5D7;
+  }
 
+  .el-button.is-plain:hover {
+    background: #FFF;
+    border-color: #48C5D7;
+    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,12 +9,13 @@
             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"
             value-format="yyyy-MM-dd HH:mm"
+            :class="filter.recepDate === null ? 'active' : ''"
           >
           </el-date-picker>
         </el-form-item>
@@ -25,12 +26,13 @@
             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"
             value-format="yyyy-MM-dd HH:mm"
+            unlink-panels
           >
           </el-date-picker>
         </el-form-item>
@@ -124,18 +126,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 +156,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 +203,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 +214,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 +230,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 +252,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 +288,9 @@ export default {
         successFlag: "",
         patientId: "",
         sceneName: "",
-        subHospitalName: '', // 子院区
-        recepDate: '', // 接收日期
-        resDate: '', // 响应日期
+        subHospitalName: "", // 子院区
+        recepDate: null, // 接收日期
+        resDate: null, // 响应日期
       },
       cacheData: {},
       currentPage: 1,
@@ -294,8 +301,9 @@ export default {
       titleWidth: "970px", //头部最小宽度
       reqVisible: false,
       respVisible: false,
-      params: '',
-      result: ''
+      params: "",
+      result: "",
+      gmtReq: ''
     };
   },
   created() {
@@ -305,6 +313,13 @@ export default {
       that.getDataList();
     });
   },
+  computed: {
+  //   pickerOptions: {
+  //       disabledDate(time) {
+  //         return time.getTime() > Date.now()
+  //     }
+  // }
+  },
   watch: {
     filter: {
       handler: function () {
@@ -322,18 +337,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) {
@@ -374,6 +389,9 @@ export default {
               data.records[j].successFlag == "1" ? "成功" : "失败";
             }
             this.list = data.records;
+            this.gmtReq = list.map(item => {
+              return item.gmtReq.tofixed(2)
+            })
             console.log("调用接口数据：", this.list);
             if (!flag) {
               //搜索时不缓存
@@ -400,30 +418,35 @@ export default {
       if (isTurnPage && !this.searched) {
         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'
+
+      //  接收时间 开始时间补0  结束时间补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'
+      //  响应时间 开始时间补0  结束时间补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";
         }
       }
 
@@ -433,11 +456,11 @@ export default {
         patientId: this.filter.patientId.trim(), // 患者标识
         sceneName: this.filter.sceneName.trim(), // 服务名
         successFlag: this.filter.successFlag,
-        startGmtReq: startGmtReq,
-        endGmtReq: endGmtReq,
-        startGmtResp: startGmtResp,
-        endGmtResp: endGmtResp,
-        subHospitalName: this.filter.subHospitalName.trim() // 子院区
+        startGmtReq: startGmtReq ? startGmtReq : null,
+        endGmtReq: endGmtReq ? endGmtReq : null,
+        startGmtResp: startGmtResp ? startGmtResp : null,
+        endGmtResp: endGmtResp ? endGmtResp : null,
+        subHospitalName: this.filter.subHospitalName.trim(), // 子院区
       };
       return param;
     },
@@ -517,8 +540,8 @@ export default {
         patientId: "",
         sceneName: "",
         subHospitalName: "",
-        recepDate: '', // 接收日期
-        resDate: '', // 响应日期
+        recepDate: "", // 接收日期
+        resDate: "", // 响应日期
       };
     },
     update() {
@@ -612,9 +635,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 +655,15 @@ export default {
   padding: 0 20px;
 }
 
+.el-time-panel__footer {
+  /deep/.confirm{
+    color: #48c5d7 !important;
+  }
+}
 
+.active {
+  color: #ff0000;
+}
 
 
- 
-
 </style>

src/components/icss/hemp/AddHemp.vue

@@ -1,4 +1,4 @@
-<<<<<<< .mine
+
 <template>
   <div class="AddChemicalAndCommonMappingWrapper clearfix">
     <crumbs
@@ -22,10 +22,10 @@
         <div class="leftBox clearfix">
           <el-row>
             <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="hisName">
+              <el-form-item label="麻醉名称：" prop="hisName">
                 <el-input v-model="form.hisName" clearable style="minWidth: 240px"></el-input>
               </el-form-item>
-              <el-form-item label="麻醉类型预览：">
+              <el-form-item label="麻醉名称预览：">
                 <span class="previewInfo" style="minWidth: 240px">{{form.hisName}}</span>
               </el-form-item>
             </el-col>
@@ -38,7 +38,7 @@
         <div class="rightBox">
           <el-row>
             <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="searchText">
+              <el-form-item label="麻醉名称：" prop="searchText">
                 <el-select
                   style="width:100%;minWidth: 240px"
                   v-model="form.searchText"
@@ -63,7 +63,7 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="麻醉类型预览：">
+              <el-form-item label="麻醉名称预览：">
                 <span class="previewInfo" style="minWidth: 240px">{{form.searchText}}</span>
               </el-form-item>
             </el-col>
@@ -399,86 +399,7 @@ export default {
   }
 }
 </style>
-=======
-<template>
-  <div class="AddChemicalAndCommonMappingWrapper clearfix">
-    <crumbs
-      :title="isEdit ? '麻醉关联维护--修改关联' : '麻醉关联维护--添加关联'"
-      class="topBack"
-      :param="$route.params"
-      linkTo="Fusion"
-    ></crumbs>
-    <el-form
-      :model="form"
-      :rules="rules"
-      label-position="right"
-      label-width="120px"
-      ref="relationForm"
-    >
-      <div class="AddChemicalAndCommonMappingBox clearfix">
-        <div class="titleBox clearfix">
-          <p class="title">医院术语</p>
-          <p class="title">标准术语</p>
-        </div>
-        <div class="leftBox clearfix">
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="hisName">
-                <el-input v-model="form.hisName" clearable style="minWidth: 240px"></el-input>
-              </el-form-item>
-              <el-form-item label="麻醉类型预览：">
-                <span class="previewInfo" style="minWidth: 240px">{{form.hisName}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <div class="midBox">
-          <img class="midLogo" src="../../../images/relation.png" alt />
-          <p class="midTitle">相互关联</p>
-        </div>
-        <div class="rightBox">
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="麻醉类型：" prop="searchText">
-                <el-select
-                  style="width:100%;minWidth: 240px"
-                  v-model="form.searchText"
-                  filterable
-                  remote
-                  clearable
-                  :loading="showDrop"
-                  loading-text="加载中..."
-                  @change="changeWord"
-                  @focus="handleFocus"
-                  @visible-change="handleVisible"
-                  placeholder="搜索"
-                  :remote-method="searchTerms"
-                  reserve-keyword
-                >
-                  <el-option
-                    v-for="(item,idx) in uniqueNameList"
-                    :key="idx"
-                    :label="item"
-                    :value="item"
-                    :title="item"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="麻醉类型预览：">
-                <span class="previewInfo" style="minWidth: 240px">{{form.searchText}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-      </div>
-      <div class="btn">
-        <el-form-item>
-          <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
-        </el-form-item>
-      </div>
-    </el-form>
-  </div>
-</template>
+
 <script>
 import api from '@api/icss.js';
 export default {
@@ -494,8 +415,8 @@ export default {
       },
       rules: {
         hisName: [
-          { required: true, message: '请输入麻醉类型', trigger: 'change' },
-          { max: 80, message: '麻醉类型最多80字', trigger: 'change' }
+          { required: true, message: '请输入麻醉名称', trigger: 'change' },
+          { max: 80, message: '麻醉名称最多80字', trigger: 'change' }
         ],
         searchText: [
           { required: true, message: '请选择麻醉类型', trigger: 'change' }
@@ -800,4 +721,3 @@ export default {
   }
 }
 </style>
->>>>>>> .theirs

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:84';
-const proxy_path = 'http://192.168.2.236:88';
+const proxy_path = 'http://192.168.2.241:84';
+//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.241:6060';
 // const proxy_path = 'http://192.168.3.101:5050';