Merge branch 'develop' into 'release'

Develop

See merge request !115

src/components/common/diagnoseAdvice.vue

@@ -10,6 +10,7 @@
       <span>诊断建议</span>
       <el-input
         rows="10"
+        maxlength="1000"
         type="textarea"
         v-model="diagnoseAdvice"
         placeholder="请输入内容"

src/utils/env-config.js

@@ -23,6 +23,7 @@ export const envConfig = {
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com',
+    // baseUrl: 'https://test1-sc.yunqueyi.com',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
     qiniuImgUrl: "https://test1-file.yunqueyi.com",

src/utils/live/RtcClient.js

@@ -54,7 +54,7 @@ class RtcClient {
         userId: this.userId_,
         mirror: true
       });
-      // this.startRTC()
+      this.startRTC()
     } catch (e) {
       console.error('加入房间失败 ' + e);
       this.vueInstance.reloadfn()

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

@@ -186,15 +186,18 @@ export default {
     setItem(data, item) {
       item.timeleft = 0;
     },
+
     // 主动呼叫
     drivingCall(data) {
+      console.log("data-----------",data)
       // /team/call/direct/{imAccId}呼叫
       let url = `/im/team/call/direct/`;
       let params = {
         imAccId: data.accId,
-        imTeamId: data.imTeamId,
+        imTeamId: this.tid,
         liveRoomId: this.roomId
       };
+      console.log("-----------",params)
       this.POST(url, params).then((res) => {
         if (res.code === "000000") {
           //  this.tid = this.$route.query.tid || "";

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

@@ -162,18 +162,21 @@ export default {
       const s = this.searchParam;
       s.returnStatus = val;
       this.searchParam = s;
+      s.pageNo=1;
       this.inquirySearch("tab");
     },
     changeDatetime(val) {
       const s = this.searchParam;
       s.dateTime = val.format("yyyy-MM-dd");
       this.searchParam = s;
+      s.pageNo=1;
       this.inquirySearch("clear");
     },
     handleSizeChange(val) {
       const s = this.searchParam;
       s.pageSize = val;
       this.searchParam = s;
+      this.inquirySearch();
     },
     handleCurrentChange(val) {
       const s = this.searchParam;