修改工作台

src/views/IM/diagnosis-admin/workbench-new.vue

@@ -55,10 +55,7 @@
         v-else
         class="workbench-content"
       >
-        <div
-          v-if="currentDiagList"
-          class="workbench-li-c"
-        >
+        <div class="workbench-li-c">
           <div class="workbench-title">
             <div class="searh-input">
               <el-input
@@ -79,7 +76,7 @@
           </div>
           <!--  问诊状态内容 -->
           <div
-            v-if="isShowCardData"
+            v-if="currentDiagList.length"
             class="grid-c"
           >
             <div
@@ -95,21 +92,21 @@
               />
             </div>
           </div>
+          <div
+            v-else
+            class="nodata-container"
+          >
+            <img
+              src="@/assets/image/workbench/no_data_wz.png"
+              alt=""
+            >
+            <div class="nodata-title">
+              暂时没有问诊
+            </div>
+          </div>
         </div>
       </div>
     </div>
-    <!-- <div
-      v-else
-      class="nodata-container"
-    >
-      <img
-        src="../../../assets/image/workbench/no_data_wz.png"
-        alt=""
-      >
-      <div class="nodata-title">
-        暂时没有问诊
-      </div>
-    </div> -->
     <el-dialog
       :visible.sync="showIsReset"
       width="30%"
@@ -216,6 +213,7 @@
         userInfo: null,
         timer: null,
         currentDiagList: [], // 卡片列表数据
+        midCardData: [],
         mockData: [
           {
             doctorLastCallTime: '2021-12-02 19:58:01',
@@ -299,7 +297,7 @@
             appointEndTime: '2021-12-02 21:00:00',
             department: '呼吸内科',
             departmentId: 12,
-            diagnoseLogId: 3824,
+            diagnoseLogId: 3826,
             diagnoseType: 1,
             doctorCallKfStatus: 2,
             doctorCallStatus: 1,
@@ -334,6 +332,7 @@
         checkDoctorIdList: [],
         activeMoutendName: '',
         operatId: '',
+        localUserId: '',
         showIsReset: false,
       };
     },
@@ -354,13 +353,10 @@
       const s = storejs.get('soketQuest');
       const id =
         s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
-      this.operateUserId = id;
       this.userInfo = storejs.get('initSocketInfo');
-      console.log(
-        this.userInfo.userId,
-        'userInfouserInfo',
-        this.tabPositionValue
-      );
+      if (!id) {
+        this.localUserId = this.userInfo.userId;
+      }
       this.initCard();
       const that = this;
       // 轮循
@@ -369,7 +365,7 @@
           // that.isShowCardData = false;
           that.initCard();
         }, 0);
-      }, 4000);
+      }, 40000);
       this.doctorDeparList();
     },
     destroyed() {
@@ -399,10 +395,8 @@
         this.showIsReset = false;
       },
       confirmResert() {
-        const userInfo = storejs.get('initSocketInfo');
-        const { userId } = userInfo;
         const param = {
-          uid: this.operatId ? this.operatId : userId,
+          uid: this.operatId ? this.operatId : this.localUserId,
         };
         doctorListRest(param).then((res) => {
           if (res.code == '000000') {
@@ -458,11 +452,9 @@
       },
 
       initCard() {
-        console.log(this.isShowCardData);
         const parms = {
           bizType: this.tabPositionValue, // 1,异常的列表 2,不需要处理的列表
-          userId: this.userInfo.userId || this.operateUserId, //   userId
-          condition: this.orderOrName || '',
+          userId: this.operatId || this.localUserId, //   userId
         };
         // this.currentDiagList = this.mockData;
         conditionNewList(parms)
@@ -484,36 +476,65 @@
           });
       },
       handleData(data) {
-        console.log(data, 'data');
         this.currentDiagList = [];
+        this.midCardData = [];
+        const searchVal = this.orderOrName;
         data.forEach((item, index) => {
           // item.diagnoseLogId = '--' + Math.random() * 10;
           item['definitionRandom'] = Math.random() * 10;
-          this.$set(this.currentDiagList, index, item);
+          if (searchVal) {
+            // 如果有查询条件一直后去的是查询结果
+            if (item.diagnoseLogId == searchVal || item.doctorName == searchVal) {
+              this.currentDiagList.push(item);
+            }
+          } else {
+            this.currentDiagList.push(item);
+          }
+          this.$set(this.midCardData, index, item);
         });
         console.log('this.currentDiagList', this.currentDiagList);
         this.isShowCardData = true;
-      // this.$nextTick(() => {
-      // });
       },
       getSerachValue(value) {
-        this.orderOrName = value;
+        this.orderOrName = value.trim();
       },
       handleCheckedCitiesChange(value) {
         console.log(value, 'value11');
       },
       getSearchValue() {
         if (!this.orderOrName) {
-          console.log(789, this.departmentId);
           return this.$message({
             message: '医生名字或订单号不能为空',
             type: 'warning',
             duration: 1000,
           });
         } else {
-          this.initCard();
+          // 前端根据现在数据筛选结果
+          this.handleSearchResult(this.orderOrName);
         }
       },
+      // 处理查询结果
+      handleSearchResult(searchVal) {
+        this.isShowCardData = false;
+        this.currentDiagList = [];
+        console.log(this.midCardData, searchVal);
+        this.midCardData.forEach((item) => {
+          console.log(
+            searchVal,
+            item.diagnoseLogId,
+            'item.diagnoseLogId',
+            item.doctorName == searchVal,
+            item.doctorName
+          );
+          if (item.diagnoseLogId == searchVal || item.doctorName == searchVal) {
+            console.log(11111111, item.definitionRandom);
+            item.definitionRandom = Math.random() * 10;
+            this.currentDiagList.push(item);
+          }
+        });
+        console.log(this.currentDiagList, '00000');
+        this.isShowCardData = true;
+      },
       tabChange(val) {
         console.log(val, 'val1111====');
         this.tabPositionValue = val;
@@ -637,7 +658,6 @@
         display: grid;
         grid-template-columns: auto auto auto;
         grid-template-rows: auto auto auto;
-        //grid-template-columns: 32% 32% 32%;
         //grid-row-gap: 2%;
         grid-column-gap: 10px;
         padding: 0px 7px;

vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
     port: 8080,
     proxy: {
       '/proxy': {
-        target: 'https://test1-sc.yunqueyi.com/',
+        target: 'https://dev-sc.yunqueyi.com/',
         ws: false,
         changeOrigin: true,
         secure: true,