Merge branch 'feat/zl' into 'release'

Feat/zl

See merge request !263

src/components/IM/diagnosis-live.vue

@@ -649,7 +649,6 @@
               that.memberList &&
               that.memberList.length > 0
             ) {
-
               that.memberList.map((i) => {
                 console.log('res==---', l, i.id, l.includes(i.id));
                 if (l.includes(i.id)) {
@@ -666,14 +665,12 @@
                   }
                 }
               });
-            }else {
-              if( that.memberList &&
-                that.memberList.length > 0) {
-                that.memberList.map( i => {
+            } else {
+              if (that.memberList && that.memberList.length > 0) {
+                that.memberList.map((i) => {
                   that.removeMember(i.liveUserId);
                 });
               }
-
             }
           });
         }, 2000);

src/components/common/diagnosis-time.vue

@@ -295,7 +295,7 @@
           font-weight: 400;
           color: #666666;
           border-radius: 9px;
-          border: 1px solid #D9D9D9;
+          border: 1px solid #d9d9d9;
           margin-right: 8px;
         }
         .info-phone {

src/utils/fetch-qiniu.js

-// api路径
-import {isNotEmptyUtils} from './utils';
+/* eslint-disable */
+import { isNotEmptyUtils } from './utils';
 
-export default async(url = '', data = {}, type = 'POST', method = 'fetch') => {
+export default async (url = '', data = {}, type = 'POST', method = 'fetch') => {
   type = type.toUpperCase();
 
   // url = (server==='WECHAT'?wechatUrl:baseUrl) + url;
@@ -12,7 +12,7 @@ export default async(url = '', data = {}, type = 'POST', method = 'fetch') => {
   console.log('完整url:', url);
   if (type == 'GET' && data) {
     let dataStr = ''; // 数据拼接字符串
-		Object.keys(data).forEach(key => {
+    Object.keys(data).forEach((key) => {
       dataStr += key + '=' + data[key] + '&';
     });
 
@@ -30,17 +30,22 @@ export default async(url = '', data = {}, type = 'POST', method = 'fetch') => {
       // mode: "cors",
       headers: {
         // 'Access-Control-Allow-Origin': '*',
-                'Accept': '*',
+        Accept: '*',
         'Content-Type': 'application/json',
-                'sysCode':'2'
+        sysCode: '2',
         // 'token': localStorage.getItem('token') || null, //固定传header：
         // 'system_code': 'todo'   //固定传header：系统编号
       },
     };
 
-        if (type == 'POST' || type === 'PUT' || type === 'PATCH' || type === 'DELETE' && data) {
+    if (
+      type == 'POST' ||
+      type === 'PUT' ||
+      type === 'PATCH' ||
+      (type === 'DELETE' && data)
+    ) {
       Object.defineProperty(requestConfig, 'body', {
-                value: JSON.stringify(data)
+        value: JSON.stringify(data),
       });
     }
     try {

src/utils/fetch.js

 import axios from 'axios';
-import store from '../store';
 // import { getHostnameAndPort } from '../utils'
 // axios.defaults.withCredentials = true
 
@@ -7,48 +6,45 @@ import store from '../store';
 const service = axios.create({
   // baseURL: process.env.BASE_API
   timeout: 600000,
-  withCredentials: false
+  withCredentials: false,
 });
 
 // request拦截器
-service.interceptors.request.use(config => {
+service.interceptors.request.use(
+  (config) => {
     config.headers['sysCode'] = 26;
     config.headers['token'] = localStorage.getItem('token');
-  config.headers['deviceInfo'] = JSON.stringify({ 'app_channel': '', 'app_mac': '', 'app_uuid': '', 'app_version': '', 'device_brand': '', 'device_ip': '', 'device_model': '', 'device_net': '', 'device_ops': '', 'resolution_wh': '', 'system_level': '', 'device_type': '10' });
+    config.headers['deviceInfo'] = JSON.stringify({
+      app_channel: '',
+      app_mac: '',
+      app_uuid: '',
+      app_version: '',
+      device_brand: '',
+      device_ip: '',
+      device_model: '',
+      device_net: '',
+      device_ops: '',
+      resolution_wh: '',
+      system_level: '',
+      device_type: '10',
+    });
     Object.assign(config.headers, config.changeHeader);
     if (config.fileHeader) {
       config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
     }
-
-  // if (config.data && config.data.setEntry) {
-  //   config.headers['sysCode'] = config.data.sysCode || 10
-  //   if(config.data.token){
-  //      config.headers['token'] = config.data.token || '63C3FA92AF8A45A48B31EB7FD97B95EB'
-  //   }
-
-  //   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
-  // }
-
     return config;
-}, error => {
+  },
+  (error) => {
     Promise.reject(error);
-});
+  }
+);
 
 // respone拦截器
 service.interceptors.response.use(
-  response => {
-    const res = response.data;
-    /*
-      baseUrl时，返回000000为成功
-      apiUrl时，返回200为成功
-    */
-    // if (res.code !== '000000') {
-    //   return Promise.reject(response.data)
-    // } else {
+  (response) => {
     return response.data;
-    // }
   },
-  error => {
+  (error) => {
     return Promise.reject(error);
   }
 );

src/utils/index.js

-/**
- * Created by Anndy Yang on 18/09/18.
- */
+/* eslint-disable */
 import { envConfig } from '@/utils/env-config';
 
 export function setEventByModuleCode(itemData) {
   const modeCode = itemData.appModuleInfo.code || '';
-    let paramList = itemData.appModuleInfo.paramList ? itemData.appModuleInfo.paramList : '';
+  let paramList = itemData.appModuleInfo.paramList
+    ? itemData.appModuleInfo.paramList
+    : '';
   if (modeCode === 'M001' || modeCode === 'M002' || modeCode === 'M003') {
     paramList = '';
   } else if (modeCode === 'M100' || modeCode === 'M300') {
-
     const urlPara = getUrlParmByCode(paramList);
     paramList[0] && (paramList[0].value += urlPara);
-
   } else if (modeCode === 'M400') {
-
   }
   if (typeof paramList === 'string' && !paramList) {
     paramList = [];
@@ -84,18 +81,14 @@ export function arraySort(originData, isUp = true, sortedField, converFun) {
           sourceB = converFun(sourceB[sortedField]);
         }
       }
-            // if(!sourceA || !sourceB) {
-            //   sourceA = 0
-            //   sourceB = 0
-            // }
       if (isUp) {
-                if ((sourceA - 0) > (sourceB - 0)) {
+        if (sourceA - 0 > sourceB - 0) {
           swap = sortedData[j];
           sortedData[j] = sortedData[j + 1];
           sortedData[j + 1] = swap;
         }
       } else {
-                if ((sourceA - 0) < (sourceB - 0)) {
+        if (sourceA - 0 < sourceB - 0) {
           swap = sortedData[j];
           sortedData[j] = sortedData[j + 1];
           sortedData[j + 1] = swap;

src/utils/live/index.js

+/* eslint-disable */
 /* 浏览器兼容提示 */
 export const CHECK_BROWSER_TIPS = {
   BROWSER_NOT_COMPATIBLE: '您的浏览器不支持直播功能！',
-  BROWSER_NOT_SUPPORT_SCREEN_SHARE: '您的浏览器不支持直播功能!'
+  BROWSER_NOT_SUPPORT_SCREEN_SHARE: '您的浏览器不支持直播功能!',
 };
 
-export const setLgTenText = time => {
+export const setLgTenText = (time) => {
   return time < 10 ? `0${time}` : time;
 };
 
@@ -21,11 +22,13 @@ export const countDown = (endtime) => {
   const nowtime = new Date(); // 获取当前时间
   const time = endtime - nowtime.getTime(); // 距离结束时间的毫秒数
   if (time > 0) {
-    const lefth = Math.floor(time / (1000 * 60 * 60) % 24); // 计算小时数
-    const leftm = Math.floor(time / (1000 * 60) % 60); // 计算分钟数
-    const lefts = Math.floor(time / 1000 % 60); // 计算秒数
+    const lefth = Math.floor((time / (1000 * 60 * 60)) % 24); // 计算小时数
+    const leftm = Math.floor((time / (1000 * 60)) % 60); // 计算分钟数
+    const lefts = Math.floor((time / 1000) % 60); // 计算秒数
     // 返回倒计时的字符串
-    return `${setLgTenText(lefth)}:${setLgTenText(leftm)}:${setLgTenText(lefts)}`;
+    return `${setLgTenText(lefth)}:${setLgTenText(leftm)}:${setLgTenText(
+      lefts
+    )}`;
   } else {
     return '时间已到';
   }
@@ -34,20 +37,20 @@ export const countDown = (endtime) => {
 export const laseTime = (endtime) => {
   const nowtime = new Date(); // 获取当前时间
   const time = endtime - nowtime.getTime(); // 距离结束时间的毫秒数
-  const lefth = Math.floor(time / (1000 * 60 * 60) % 24); // 计算小时数
-  const leftm = Math.floor(time / (1000 * 60) % 60); // 计算分钟数
-  const lefts = Math.floor(time / 1000 % 60); // 计算秒数
+  const lefth = Math.floor((time / (1000 * 60 * 60)) % 24); // 计算小时数
+  const leftm = Math.floor((time / (1000 * 60)) % 60); // 计算分钟数
+  const lefts = Math.floor((time / 1000) % 60); // 计算秒数
   return {
     lefth,
     leftm,
-    lefts
+    lefts,
   };
 };
 
 export const lastm = (startTime, endTime) => {
   const time = endTime - startTime; // 距离结束时间的毫秒数
-  const lefth = Math.floor(time / (1000 * 60 * 60) % 24); // 计算小时数
-  const leftm = Math.floor(time / (1000 * 60) % 60); // 计算分钟数
+  const lefth = Math.floor((time / (1000 * 60 * 60)) % 24); // 计算小时数
+  const leftm = Math.floor((time / (1000 * 60)) % 60); // 计算分钟数
   return lefth * 60 + leftm;
 };
 
@@ -69,7 +72,7 @@ export const listSort = (one, two, three, four, arr) => {
   const a = h.sort(listCompare(three));
   const b = a.sort(listCompare(two));
   newList = b.sort(listCompare(one, 1));
-  newList.forEach(item => {
+  newList.forEach((item) => {
     if (item.isCalling) {
       callArr.push(item);
     }
@@ -80,7 +83,7 @@ export const listSort = (one, two, three, four, arr) => {
   return {
     newList,
     callArr,
-    inviteArr
+    inviteArr,
   };
 };
 
@@ -93,13 +96,21 @@ export const getBroswer = () => {
   const sys = {};
   const ua = navigator.userAgent.toLowerCase();
   let s;
-  (s = ua.match(/edge\/([\d.]+)/)) ? sys.edge = s[1] :
-    (s = ua.match(/rv:([\d.]+)\) like gecko/)) ? sys.ie = s[1] :
-      (s = ua.match(/msie ([\d.]+)/)) ? sys.ie = s[1] :
-        (s = ua.match(/firefox\/([\d.]+)/)) ? sys.firefox = s[1] :
-          (s = ua.match(/chrome\/([\d.]+)/)) ? sys.chrome = s[1] :
-            (s = ua.match(/opera.([\d.]+)/)) ? sys.opera = s[1] :
-              (s = ua.match(/version\/([\d.]+).*safari/)) ? sys.safari = s[1] : 0;
+  (s = ua.match(/edge\/([\d.]+)/))
+    ? (sys.edge = s[1])
+    : (s = ua.match(/rv:([\d.]+)\) like gecko/))
+    ? (sys.ie = s[1])
+    : (s = ua.match(/msie ([\d.]+)/))
+    ? (sys.ie = s[1])
+    : (s = ua.match(/firefox\/([\d.]+)/))
+    ? (sys.firefox = s[1])
+    : (s = ua.match(/chrome\/([\d.]+)/))
+    ? (sys.chrome = s[1])
+    : (s = ua.match(/opera.([\d.]+)/))
+    ? (sys.opera = s[1])
+    : (s = ua.match(/version\/([\d.]+).*safari/))
+    ? (sys.safari = s[1])
+    : 0;
 
   if (sys.edge) return { broswer: 'Edge', version: sys.edge };
   if (sys.ie) return { broswer: 'IE', version: sys.ie };

src/views/IM/diagnosis-admin/modal/index.scss

@@ -124,9 +124,9 @@
   .show-work-set {
     margin-top: 100px;
   }
-  .maxNum-first-show{
+  .maxNum-first-show {
     margin-top: 20px;
-    .show-sep-num{
+    .show-sep-num {
       color: red;
     }
   }

src/views/IM/diagnosis-admin/serviceSchedule.vue

@@ -197,7 +197,7 @@
     workInStep,
     getLevel,
   } from '@/api/serviceSchedule';
-  import { departmentAll, savePCDayCount} from '@/api/diagnosis';
+  import { departmentAll, savePCDayCount } from '@/api/diagnosis';
   import TableServiceSchedule from '@/components/list/table-serviceSchedule';
   export default {
     components: {
@@ -259,9 +259,9 @@
         newCreateList: [],
         allTilst: [],
         allList: {},
-        centerDialogVisible:false,
-        doctorInfo:{},
-        maxNumValue:''
+        centerDialogVisible: false,
+        doctorInfo: {},
+        maxNumValue: '',
       };
     },
     watch: {},
@@ -455,16 +455,16 @@
       },
       submitSetData() {
         const params = {
-          doctorId:this.doctorInfo.doctorId,
-          preNum:this.maxNumValue
+          doctorId: this.doctorInfo.doctorId,
+          preNum: this.maxNumValue,
         };
-        savePCDayCount(params).then(res => {
+        savePCDayCount(params).then((res) => {
           if (res.code == '000000') {
             this.centerDialogVisible = false;
             this.search();
           }
         });
-      }
+      },
     },
   };
 </script>
@@ -611,7 +611,7 @@
         }
       }
     }
-}
+  }
 }
 </style>
 <style lang="scss">