cnhis-design-vue 0.2.16-beta → 0.2.20-beta

package/packages/multi-chat/chat/multiVideo.vue

@@ -184,6 +184,7 @@ import { getSipUserId } from '@/utils/sip-device';
 import fetch, { qs } from '@/utils/chatFetch';
 import { Button, Modal, Popover, Tooltip } from 'ant-design-vue';
 import SvgIcon from '@/component/svg/index.vue';
+import uniRTCAPI from './mixins/uniRTCAPI';
 
 const videoStatus = {
   1: '未接听',
@@ -195,6 +196,7 @@ const videoStatus = {
 
 export default {
   inject: ['store'],
+  mixins: [uniRTCAPI],
   components: {
     [Button.name]: Button,
     [Popover.name]: Popover,
@@ -468,6 +470,12 @@ export default {
           this.setRecordId(recordId);
           this.setVideoData(data.map);
           // this.appendVideoMessage();
+          // 江苏省
+          if (this.uniRTC) {
+            const targetList = data.map?.targetList || []; 
+            this.checkStatus(targetList);
+            this.startCall(targetList);
+          }
         } else {
           data.resultMsg && this.$message.warning(data.resultMsg);
         }
@@ -850,6 +858,8 @@ export default {
       fetch.post('/chat/access/videoHangUp', qs.stringify(data)).then(({ data }) => {
         if (data.result === 'SUCCESS') {
           this.handleLeaveRoom();
+          // 江苏省主动挂断
+          this.uniRTC && this.hangUp();
         }
       });
     },
@@ -886,8 +896,12 @@ export default {
           if (accept == 0) {
             this.setMultiVideoShow(false);
             this.setVideoData({});
+            // 江苏省拒接
+            this.uniRTC && this.refuseCall();
             return;
           }
+          // 江苏省接听
+          this.uniRTC && this.acceptCall();
           let res = data.obj || data.map;
           let { token: userSig, roomId, recordId, caller, mode, type } = res;
           this.setCurrentSip(sip);

package/packages/multi-chat/chat/scrollList.vue

@@ -989,7 +989,7 @@ export default {
         ) : null}
 
         {isNoData && ((isEnd && !infiniteMsgShow) || !isEnd) ? (
-          <div class="no-data">
+          <div class={[theme, 'no-data']}>
             <img src={require('../img/no-data2.png')} />
             <span>{this.i18nText('1.1.6.11')}</span>
           </div>
@@ -1010,10 +1010,16 @@ export default {
   & > img {
     width: 160px;
   }
+  &.fold > img {
+    width: 80%;
+  }
   span {
     display: inline-block;
     font-size: 14px;
   }
+  &.fold span {
+    font-size: 12px;
+  }
 }
 .chat-scroll-container {
   height: 100%;

package/packages/multi-chat/chat/video.vue

@@ -54,9 +54,11 @@ import RtcClient from '../utils/rtc-client';
 import fetch, { qs } from '@/utils/chatFetch';
 import { Icon, Popconfirm, Tooltip } from 'ant-design-vue';
 import SvgIcon from '@/component/svg/index.vue';
+import uniRTCAPI from './mixins/uniRTCAPI';
 
 export default {
   inject: ['store', 'i18nText'],
+  mixins: [uniRTCAPI],
   components: {
     [Popconfirm.name]: Popconfirm,
     [Tooltip.name]: Tooltip,
@@ -230,6 +232,8 @@ export default {
             this.setShowVideo(false);
             this.setVideoData({});
           }
+          // 江苏省会议挂断
+          this.uniRTC && this.hangUp();
         } else {
           this.$message.warning(data.resultMsg);
         }

package/packages/multi-chat/components/user-status.vue

@@ -1,20 +1,25 @@
 <template>
   <div>
     <a-dropdown
-      v-if="type === 'right-top'"
-      placement="bottomCenter"
+      :placement="placement"
       :getPopupContainer="
         triggerNode => {
           return triggerNode.parentNode || document.body;
         }
       "
     >
-      <a-button>
+      <a-button v-if="placement === 'bottomCenter'">
         <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size: 16px"></svg-icon>
         <img v-else :src="getImg(status)" height="16" />
         {{ statusDesc }}
         <a-icon type="down" />
       </a-button>
+      <div v-else class="status-btn">
+        <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size: 16px"></svg-icon>
+        <img v-else :src="getImg(status)" height="16" />
+        {{ statusDesc }}
+        <a-icon type="down" />
+      </div>
       <a-menu slot="overlay">
         <a-menu-item v-for="{ title, status, description, icon } in statusList" :key="status" @click="handleStatusChange(status)">
           <template v-if="description">
@@ -41,7 +46,7 @@
         </a-menu-item>
       </a-menu>
     </a-dropdown>
-    <template v-else>
+    <!-- <template v-else>
       <div class="status-btn">
         <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size: 16px"></svg-icon>
         <img v-else :src="getImg(status)" height="16" />
@@ -73,7 +78,7 @@
           </li>
         </ul>
       </div>
-    </template>
+    </template> -->
   </div>
 </template>
 <script>
@@ -93,9 +98,9 @@ export default {
     SvgIcon
   },
   props: {
-    type: {
+    placement: {
       type: String,
-      default: 'right-top'
+      default: 'bottomCenter'
     },
   },
   computed: {
@@ -150,44 +155,44 @@ export default {
 <style lang="less" scoped>
 .status-btn {
   position: relative;
-  padding-right: 10px;
-  height: 26px;
-  line-height: 26px;
+  // padding-right: 10px;
+  height: 28px;
+  line-height: 28px;
   cursor: pointer;
-  .status-list {
-    position: absolute;
-    right: -85px;
-    bottom: 8px;
-    z-index: 2;
-    display: none;
-    padding: 4px 0;
-    outline: none;
-    list-style-type: none;
-    border-radius: 4px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, .15);
-    background-color: #fff;
-    transition: all .5s;
-    li {
-      height: 32px;
-      line-height: 32px;
-      padding: 0 16px;
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      background: #fff;
-      a {
-        padding-right: 8px;
-        color: rgba(0, 0, 0, 0.65);
-      }
-      &:hover {
-        background: #f2f2f2;
-      }
-    }
-  }
-  &:hover {
-    .status-list {
-      display: block;
-    }
-  }
+  // .status-list {
+  //   position: absolute;
+  //   right: -85px;
+  //   bottom: 8px;
+  //   z-index: 2;
+  //   display: none;
+  //   padding: 4px 0;
+  //   outline: none;
+  //   list-style-type: none;
+  //   border-radius: 4px;
+  //   box-shadow: 0 2px 8px rgba(0, 0, 0, .15);
+  //   background-color: #fff;
+  //   transition: all .5s;
+  //   li {
+  //     height: 32px;
+  //     line-height: 32px;
+  //     padding: 0 16px;
+  //     display: flex;
+  //     align-items: center;
+  //     cursor: pointer;
+  //     background: #fff;
+  //     a {
+  //       padding-right: 8px;
+  //       color: rgba(0, 0, 0, 0.65);
+  //     }
+  //     &:hover {
+  //       background: #f2f2f2;
+  //     }
+  //   }
+  // }
+  // &:hover {
+  //   .status-list {
+  //     display: block;
+  //   }
+  // }
 }
 </style>

package/packages/multi-chat/setting/baseInfo/index.vue

@@ -186,9 +186,9 @@
         <div class="functional-module" v-if="!isConference && !isStaff">
           <span class="title" style="display: inline-block;margin-bottom: 10px;">
             {{ i18nText('1.9.427') }}
-            <a-checkbox @change="handleBotSettingShow" :checked="showBotSetting"></a-checkbox>
+            <!-- <a-checkbox @change="handleBotSettingShow" :checked="showBotSetting"></a-checkbox> -->
           </span>
-          <a-row class="bot-setting" v-if="showBotSetting">
+          <!-- <a-row class="bot-setting" v-if="showBotSetting">
             <a-col :span="4">
               <a-form-item label="secretId">
                 <a-input v-decorator="['secretId']" style="width: 150px;"></a-input>
@@ -205,7 +205,7 @@
             <a-form-item label="botId">
               <a-input v-decorator="['botId']" style="width: 150px;"></a-input>
             </a-form-item>
-          </a-row>
+          </a-row> -->
           <a-row class="bot-setting">
             <a-form-item label="选择机器人">
               <a-select v-decorator="['robotId']" :placeholder="'选择机器人'" style="width: 200px;" allowClear showSearch :filterOption="filterOption">

package/packages/multi-chat/setting/configuration/index.vue

@@ -39,7 +39,7 @@
         </a-row>
       </a-form-model>
 
-      <div key="txy" v-if="obj.vendor == 1">
+      <div key="txy" v-if="obj.vendor == 1 || obj.vendor == 3">
         <div class="page-title">
           腾讯云API密钥
           <a-tooltip
@@ -105,6 +105,43 @@
           </a-row>
         </a-form-model>
       </div>
+      <div key="txy" v-if="obj.vendor == 3">
+        <div class="page-title">
+          江苏省统一平台密钥
+          <a-tooltip
+            :arrowPointAtCenter="true"
+            placement="bottomRight"
+            :overlayStyle="{
+              width: '360px',
+              'max-width': '360px'
+            }"
+          >
+            <template slot="title">
+              <div>
+                <div>江苏省统一平台密钥</div>
+                <p style="margin: 10px 0">
+                  江苏省统一平台。
+                </p>
+              </div>
+            </template>
+            <svg-icon class="icon" icon-class="xitongtubiaodaohangtubiaowenti" />
+          </a-tooltip>
+        </div>
+        <a-form-model :colon="false">
+          <a-row>
+            <a-col :span="col.lSpan">
+              <a-form-model-item label="appId">
+                <a-input v-model="obj.uniAppId"></a-input>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="col.rSpan" :offset="col.rOffset">
+              <a-form-model-item label="secretKey">
+                <a-input v-model="obj.uniSecretKey" type="password"></a-input>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
     </div>
     <div class="footer-submit">
       <a-button type="primary" @click="handleSubmit">

package/packages/multi-chat/store/actions.js

@@ -2,6 +2,27 @@ import fetch, { qs } from '@/utils/chatFetch';
 import Vue from 'vue';
 import vexutils from '@/utils/vexutils';
 import { fmtRobotMessage } from '../utils';
+import UniRTCObject from "@/utils/UniRTCv2";
+
+const deepClone = source => {
+  let target;
+  if (typeof source === "object" && source) {
+    target = Array.isArray(source) ? [] : {};
+    for (let key in source) {
+      if (Object.prototype.hasOwnProperty.call(source, key)) {
+      // if (source.hasOwnProperty(key)) {
+        if (typeof source[key] !== "object") {
+          target[key] = source[key];
+        } else {
+          target[key] = deepClone(source[key]);
+        }
+      }
+    }
+  } else {
+    target = source;
+  }
+  return target;
+};
 
 export default {
   /* 更新聊天记录 */
@@ -347,5 +368,60 @@ export default {
           commit('setVideoVoiceList', list);
         }
       });
+  },
+  async initUniRTC({ commit, state }, obj) {
+    const { uniAppId, uniSecretKey, params } = obj;
+    let uniRTC = null;
+    const getLoginToken = async () => {
+      let appSign;
+      const paramsData = {
+        clientType: '1',
+        deviceToken: uniRTC.deviceToken,
+        appId: uniAppId,
+        secretKey: uniSecretKey
+      };
+      try {
+        const { data } = await fetch.get('/chat/access/getMediaAuthSign', { params: paramsData });
+        if (data.result == 'SUCCESS') {
+          appSign = data.obj;
+          return appSign;
+        }
+      } catch (error) {
+        console.log('获取签名失败:', error);
+        return;
+      }
+    };
+    uniRTC = new UniRTCObject(uniAppId, getLoginToken);
+    uniRTC.onCallComing = incoming => {
+      commit("setIncoming", incoming);
+      console.log('onCallComing->', incoming);
+    };
+    uniRTC.onHangup = () => {
+      commit("setIncoming", null);
+      commit("setOuting", []);
+    };
+    // uniRTC.onCallTimeout = () => {
+    //   commit("setIncoming", null);
+    //   commit("setOuting", []);
+    // };
+    uniRTC.onCallRefused = outing => {
+      const index = state.outing.findIndex(v => v.target === outing.target);
+      if (index > -1) {
+        let cloneOuting = deepClone(state.outing);
+        cloneOuting.splice(index, 1);
+        commit("setOuting", cloneOuting);
+      }
+    };
+    commit("setUniRTC", uniRTC);
+    setTimeout(async () => {
+      console.log('本机设备token->', uniRTC.deviceToken);
+      const res = await fetch.post('/chat/service/registerDeviceToken', qs.stringify({
+        ...params,
+        deviceToken: uniRTC.deviceToken,
+      }));
+      if (res.data?.result !== 'SUCCESS') {
+        console.log(res.data.resultMsg);
+      }
+    }, 1500);
   }
 };

package/packages/multi-chat/store/getters.js

@@ -340,5 +340,14 @@ export default {
   },
   userStatus(state) {
     return state.userStatus;
+  },
+  uniRTC(state) {
+    return state.uniRTC;
+  },
+  incoming(state) {
+    return state.incoming;
+  },
+  outing(state) {
+    return state.outing;
   }
 };

package/packages/multi-chat/store/mutation.js

@@ -266,4 +266,13 @@ export default {
   setUserStatus(state, userStatus) {
     state.userStatus = userStatus;
   },
+  setUniRTC(state, uniRTC) {
+    state.uniRTC = uniRTC;
+  },
+  setIncoming(state, incoming) {
+    state.incoming = incoming;
+  },
+  setOuting(state, outing) {
+    state.outing = outing;
+  }
 };

package/packages/multi-chat/store/state.js

@@ -103,6 +103,9 @@ export default () => {
     isQuickReply: false,
     isRecorderVoice: false,
     msgRecordCache: {}, // 消息已读记录缓存
-    userStatus: ''
+    userStatus: '',
+    uniRTC: null,
+    incoming: null,
+    outing: []
   };
 };

package/packages/scale-view/answerParse.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="answerParse" :class="{ 'answerParse-success': answerSuccess }">
-    <div class="answer-res">
-      <svg-icon :iconClass="answerIcon"></svg-icon>
-      {{ answerResText }}
+    <div class="answer-res-wrap">
+      <div class="answer-res">
+        <svg-icon :iconClass="answerIcon"></svg-icon>
+        {{ answerResText }}
+      </div>
+      <div v-if="answerSuccess"> 本题得分：{{ questionScore }}分 </div>
     </div>
     <div class="correct-answer" v-if="correctAnswer">
       <p>正确答案：</p>
@@ -62,19 +65,29 @@ export default {
   background: rgba(253, 246, 246, 0.6);
   margin-top: 6px;
   margin-bottom: 12px;
-  .answer-res {
-    display: inline-flex;
+  .answer-res-wrap {
+    display: flex;
+    justify-content: space-between;
     align-items: center;
-    padding: 0 18px;
-    line-height: 36px;
-    color: #fff;
-    background: #f06f64;
-    border-radius: 18px;
     margin-bottom: 16px;
-    font-weight: 700;
-    svg {
-      margin-right: 8px;
-      font-size: 16px;
+    .answer-res {
+      display: inline-flex;
+      align-items: center;
+      padding: 0 18px;
+      line-height: 36px;
+      color: #fff;
+      background: #f06f64;
+      border-radius: 18px;
+      font-weight: 700;
+      svg {
+        margin-right: 8px;
+        font-size: 16px;
+      }
+    }
+    .answer-score {
+      font-size: 14px;
+      font-weight: 600;
+      color: #2e2e2e;
     }
   }
   .correct-answer {

package/packages/scale-view/scaleView.vue

@@ -36,15 +36,15 @@
           >
             <div class="totalScore-warp" v-if="hasScore">
               <div>
-                测评分数：<span>{{ config.totalScore }}分</span>
+                测评总分：<span>{{ maxScore }}分</span>
               </div>
               <div>
-                测评总分：<span>{{ maxScore }}分</span>
+                测评分数：<span :style="{ color: getEvaResColor }">{{ config.totalScore }}分</span>
               </div>
               <template v-if="hasEvaluateSetting">
                 <div>
                   测评结果：
-                  <span class="score-result">{{ config.evaluateResult }}</span>
+                  <span class="score-result" :style="{ color: getEvaResColor }">{{ config.evaluateResult }}</span>
                 </div>
                 <div>
                   结果说明：<span>{{ config.evaluateResultExplain }}</span>
@@ -462,12 +462,15 @@ export default create({
         }) || [];
       return valueArr.length;
     },
+    hasparamsEvaluate() {
+      return this.paramsEvaluate && Object.keys(this.paramsEvaluate).length;
+    },
     // url中是否有默认值
     hasDefault() {
       let hash = window.location.hash;
       let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
       let hasDefault = defaultVariable.find(item => hash.includes(item));
-      return hasDefault;
+      return this.paramsEvaluate || hasDefault;
     },
     // 是否有提交按钮
     showSaveBtn() {
@@ -514,6 +517,16 @@ export default create({
       return function(item) {
         return item.databaseTitle || item.title;
       };
+    },
+    getEvaResColor() {
+      let { evaluateResultConfig, totalScore } = this.config;
+      totalScore = +totalScore || 0;
+      if (!evaluateResultConfig.length || !totalScore) return "#2474FF";
+      let matchItem = evaluateResultConfig.find(
+        item => item.startScore <= totalScore && totalScore <= item.endScore
+      );
+      if (!matchItem) return "#2474FF";
+      return matchItem.color || "#2474FF";
     }
   },
   watch: {
@@ -521,6 +534,7 @@ export default create({
       immediate: true,
       deep: true,
       handler(newVal, oldVal) {
+        console.log(this.params, "---params");
         if (oldVal) {
           if (newVal.guage_id) {
             if (newVal.guage_id != oldVal.guage_id) {
@@ -583,7 +597,8 @@ export default create({
       banSubmit: false,
       isFinished: false,
       maxScore: 0,
-      originConfig: {}
+      originConfig: {},
+      paramsEvaluate: null
     };
   },
   mounted() {
@@ -636,9 +651,16 @@ export default create({
 
       this.originConfig = JSON.parse(JSON.stringify(this.config));
 
+      if (this.params && Object.keys(this.params).length) {
+        let res = this.handleBtnParamsEvaluate(this.params);
+        res && Object.keys(res).length && (this.paramsEvaluate = res);
+      }
+
       this.handleEvaluateParams(this.config.evaluateResultSetting);
       this.handleShowEvaluate();
 
+      console.log(this.config.evaluateResultSetting);
+
       this.defaultFormArray = JSON.parse(JSON.stringify(list));
       let filterArr = this.filterArr;
       list = list.filter(v => !filterArr.includes(v.type));
@@ -648,6 +670,17 @@ export default create({
       this.fontSize = data.fontSize;
       this.spinning = false;
     },
+    handleBtnParamsEvaluate(params) {
+      let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
+      let res = {};
+      for (let key in params) {
+        let value = params[key];
+        if (defaultVariable.includes(key) && value) {
+          res[key] = value;
+        }
+      }
+      return res;
+    },
     /** *
      * 解析测评参数
      */
@@ -655,6 +688,10 @@ export default create({
       if (!evaluateResultSetting || !Object.keys(evaluateResultSetting).length) return;
       // 分享测评量表链接URL支持传入测评名称-evaname 测评说明-evadesc 测评时间-evast 测评时长-evadur 固定参数
       let query = this.handleQueryParams();
+      // 按钮传参
+      if (this.hasparamsEvaluate) {
+        query = this.paramsEvaluate;
+      }
       let obj = {
         evaluateName: "evaname",
         evaluateExplain: "evadesc",
@@ -747,6 +784,10 @@ export default create({
     },
     setDefaultEvaluate(evaluateResultSetting) {
       let query = this.handleQueryParams();
+      // 按钮传参
+      if (this.hasparamsEvaluate) {
+        query = this.paramsEvaluate;
+      }
       if (query.evaname) {
         this.$set(evaluateResultSetting, "evaluateName", query.evaname);
       }
@@ -1211,12 +1252,12 @@ export default create({
       const { relation_logic_is, condition, relation_logic } = relationLogicObj;
       if (relation_logic_is) {
         const results = condition.map(c => {
-          const { title } = this.formArray.filter(f => f.seq == c.subject_seq)[0];
-          if (utils.isString(form[title])) {
-            return c.value.includes(form[title]);
+          let key = this.formKey(this.formArray.filter(f => f.seq == c.subject_seq)[0]);
+          if (utils.isString(form[key])) {
+            return c.value.includes(form[key]);
           } else {
-            if (utils.isArray(form[title])) {
-              return form[title].some(v => c.value.includes(v));
+            if (utils.isArray(form[key])) {
+              return form[key].some(v => c.value.includes(v));
             }
           }
         });

package/packages/select-label/labelFormContent.vue

@@ -183,9 +183,12 @@ export default create({
         return !labelObj[key].itemList;
       });
     },
-
+    SelectedList(){
+      const { labelSelectedList = [], labelSelectedEdit = [] } = this;
+      return labelSelectedList.concat(labelSelectedEdit)
+    },
     selectLabelId() {
-      const list = this?.labelSelectedList || [];
+      const list = this?.SelectedList || [];
       if (Array.isArray(list)) {
         return list.map(v => v.labelId);
       }
@@ -238,8 +241,8 @@ export default create({
     },
 
     hanldeBackfill() {
-      const { labelConfig, labelSelectedList, selectLabelId } = this;
-      this.$set(this, 'labelSelectedEdit', labelSelectedList);
+      const { labelConfig, SelectedList = [], selectLabelId} = this;
+      this.$set(this, 'labelSelectedEdit', SelectedList);
       if (typeof labelConfig === 'object') {
         let keys = Object.keys(labelConfig || {});
         keys.forEach(k => {