cnhis-design-vue 0.1.65-beta → 0.1.69-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.1.65-beta",
+  "version": "0.1.69-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -45,7 +45,13 @@
     "vuedraggable": "^2.24.3",
     "vxe-table": "^3.4.1",
     "wangeditor": "^4.7.5",
-    "xe-utils": "^3.4.0"
+    "xe-utils": "^3.4.0",
+    "recorder-core": "^1.1.21080800",
+    "socket.io-client": "^2.4.0",
+    "stompjs": "^2.3.3",
+    "trtc-js-sdk": "^4.11.7",
+    "video.js": "^7.8.4",
+    "vue-infinite-scroll": "^2.0.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.7",
@@ -67,13 +73,7 @@
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
     "prettier": "^1.19.1",
-    "recorder-core": "^1.1.21080800",
-    "socket.io-client": "^2.4.0",
-    "stompjs": "^2.3.3",
-    "trtc-js-sdk": "^4.11.7",
-    "video.js": "^7.8.4",
     "vue": "^2.6.14",
-    "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "^2.6.14",
     "webpack-node-externals": "^3.0.0"
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/big-table/src/Fieldset.vue

@@ -8,10 +8,10 @@
             <!-- 字段名称 -->
             <span class="width-large"> 所有字段 </span>
             <!-- 编辑 -->
-            <span v-if="false" class="width-show">
+            <!-- <span v-if="false" class="width-show">
               <c-checkbox v-if="showCheckBox('isEdit')" :checked="calculateCheck('isEdit')" @change="handleAllCheck($event, 'isEdit')" />
               编辑
-            </span>
+            </span> -->
             <!-- 显示 -->
             <span class="width-show">
               <c-checkbox v-if="showCheckBox('isShow')" :checked="calculateCheck('isShow')" @change="handleAllCheck($event, 'isShow')" />
@@ -104,9 +104,9 @@
                   </span>
                 </span>
                 <!-- 编辑 -->
-                <span v-if="false" class="width-show">
+                <!-- <span v-if="false" class="width-show">
                   <c-checkbox v-show="ele.sid != '0001'" :defaultChecked="ele.isEdit == '1'" :checked="ele.isEdit == '1' ? true : false" @change="onChangeEdit($event, ele, j)"></c-checkbox>
-                </span>
+                </span> -->
                 <!-- 显示 -->
                 <span class="width-show">
                   <c-checkbox v-show="ele.sid != '0001'" :defaultChecked="ele.isShow == '1'" :checked="ele.isShow == '1' ? true : false" @change="onChangeShow($event, ele, j)"></c-checkbox>
@@ -170,9 +170,9 @@
                 <!-- 固定 -->
                 <span class="width-showed">
                   <select class="is-sort-style" v-model="ele.isFixed">
-                    <option value="0">不固定</option>
-                    <option value="1">左固定</option>
-                    <option value="2">右固定</option>
+                    <option :value="0">不固定</option>
+                    <option :value="1">左固定</option>
+                    <option :value="2">右固定</option>
                   </select>
                 </span>
                 <slot>
@@ -1465,24 +1465,24 @@ export default create({
       return document.getElementsByClassName('setting-tabs-about')[0];
     },
     showCheckBox(key) {
-      return this.fieldList.some(i => Object.prototype.hasOwnProperty.call(i, key));
+      return this.fields.some(i => Object.prototype.hasOwnProperty.call(i, key));
     },
     calculateCheck(key) {
-      if (!this.fieldList.length) return false;
-      return this.fieldList.every(i => {
+      if (!this.fields.length) return false;
+      return this.fields.every(i => {
         if (!Object.prototype.hasOwnProperty.call(i, key)) return true;
         return i[key];
       });
     },
     handleAllCheck(e, key) {
       const value = e.target.checked ? 1 : 0;
-      this.fieldList.forEach(i => {
+      this.fields.forEach(i => {
         if (Object.prototype.hasOwnProperty.call(i, key)) {
           i[key] = value;
         }
         return i;
       });
-      this.fieldList = [].concat(this.fieldList);
+      this.fields = [].concat(this.fields);
     },
     hanldeSaveAboutItem() {
       this.saveSetting();

package/packages/scale-view/answerParse.vue

@@ -0,0 +1,106 @@
+<template>
+  <div class="answerParse" :class="{ 'answerParse-success': answerSuccess }">
+    <div class="answer-res">
+      <svg-icon :iconClass="answerIcon"></svg-icon>
+      {{ answerResText }}
+    </div>
+    <div class="correct-answer" v-if="correctAnswer">
+      <p>正确答案：</p>
+      <span>{{ correctAnswer }}</span>
+    </div>
+    <div class="answer-key">
+      <p>答案解析：</p>
+      <span>{{ answerKeyText }}</span>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "answerParse",
+  components: {},
+  props: ["item"],
+  data() {
+    return {};
+  },
+
+  computed: {
+    answerSuccess() {
+      let { questionScore } = this.item;
+      // let { questionScore, maxScore } = this.item?.scoreConfigs || {};
+      // if (questionScore && questionScore == maxScore) return true;
+      return questionScore > 0;
+    },
+    answerIcon() {
+      return this.answerSuccess ? "xitongtubiaodui" : "xitongtubiaocuo";
+    },
+    answerResText() {
+      return this.answerSuccess ? "回答正确" : "回答错误";
+    },
+    correctAnswer() {
+      let { correctAnswer } = this.item?.scoreConfigs || {};
+      return correctAnswer;
+    },
+    answerKeyText() {
+      let { answerKey } = this.item?.scoreConfigs || {};
+      return answerKey || "无";
+    }
+  },
+  watch: {},
+  // 生命周期
+  created() {},
+  mounted() {},
+
+  // 方法
+  methods: {}
+};
+</script>
+<style lang="less" scoped>
+.answerParse {
+  padding: 16px;
+  color: #2e2e2e;
+  border-radius: 8px;
+  background: rgba(253, 246, 246, 0.6);
+  margin-top: 6px;
+  margin-bottom: 12px;
+  .answer-res {
+    display: inline-block;
+    padding: 0 18px;
+    line-height: 36px;
+    color: #fff;
+    background: #f06f64;
+    border-radius: 18px;
+    margin-bottom: 16px;
+    svg {
+      margin-right: 8px;
+    }
+  }
+  .correct-answer {
+    line-height: 20px;
+    margin-bottom: 16px;
+    p {
+      display: inline-block;
+    }
+    span {
+      word-break: break-all;
+      color: #91c850;
+      font-size: 16px;
+    }
+  }
+  .answer-key {
+    line-height: 20px;
+    p {
+      line-height: 20px;
+      margin-bottom: 16px;
+    }
+    span {
+      word-break: break-all;
+    }
+  }
+  &.answerParse-success {
+    background: rgba(234, 251, 228, 0.6);
+    .answer-res {
+      background: #91c850;
+    }
+  }
+}
+</style>

package/packages/scale-view/evaluateCountdown.vue

@@ -66,7 +66,9 @@ export default {
       if (!useFormArray || !useFormArray.length) return;
       let useForm = {};
       useFormArray.forEach(item => {
-        useForm[item.title] = form[item.title];
+        const key = item.databaseTitle || item.title;
+        // useForm[item.title] = form[item.title];
+        useForm[key] = form[key];
       });
       console.log(useForm);
       let num = 0;

package/packages/scale-view/formitem/r-choice.vue

@@ -16,15 +16,16 @@
         :disabled="isLock"
         :style="{ color: choiceColor(o) }"
       >
-        <text-over-tooltip
+        <!-- <text-over-tooltip
           :refName="'chooseValue' + curIndex + i"
           class="choose-value"
           :content="o.label"
           :textColor="choiceColor(o)"
-        ></text-over-tooltip>
+        ></text-over-tooltip> -->
         <!-- <a-tooltip :title="o.label">
           {{ o.label }}
         </a-tooltip> -->
+         {{ o.label }}
 
         <a-input
           v-model="othersText"
@@ -44,7 +45,7 @@
     >
       <a-checkbox
         class="choice-checkbox"
-        v-for="(o, i) in curOptions"
+        v-for="(o) in curOptions"
         :key="o.value"
         :value="o.value"
         :class="{ 'block-checkbox': !item.setting.isHorizontal }"
@@ -53,11 +54,14 @@
         <!-- <a-tooltip :title="o.label">
           {{ o.label }}
         </a-tooltip> -->
-        <text-over-tooltip
+        <span style="white-space: initial;">
+          {{ o.label }}
+        </span>
+        <!-- <text-over-tooltip
           :refName="'chooseValue' + curIndex + i"
           class="choose-value"
           :content="o.label"
-        ></text-over-tooltip>
+        ></text-over-tooltip> -->
         <a-input
           v-model="othersText"
           :disabled="isLock"
@@ -105,7 +109,7 @@
 import { Select, Input, Radio, Checkbox, Cascader } from "ant-design-vue";
 import { judgeTypes } from "../mixin/judgeTypes";
 // import format from "@/components/table/mixins/format";
-import TextOverTooltip from "./text-over-tooltip/TextOverTooltip.vue";
+// import TextOverTooltip from "./text-over-tooltip/TextOverTooltip.vue";
 import utils from "@/utils/utils-map";
 import axios from 'axios';
 export default {
@@ -129,7 +133,7 @@ export default {
     },
   },
   components: {
-    TextOverTooltip,
+    // TextOverTooltip,
     [Input.name]: Input,
     [Cascader.name]: Cascader,
     [Checkbox.name]: Checkbox,
@@ -437,7 +441,7 @@ export default {
   /deep/ .choice-radio,
   /deep/ .choice-checkbox {
     display: inline-flex;
-    align-items: center;
+    align-items: flex-start;
     margin-bottom: 5px;
     margin-right: 8px;
     margin-left: 0px;
@@ -488,7 +492,7 @@ export default {
     /deep/.ant-radio-wrapper span.ant-radio + * {
       display: inline-flex;
       align-items: center;
-      white-space: inherit;
+      white-space: initial;
     }
     &.choice-wrap-1 label {
       width: 100%;
@@ -502,6 +506,13 @@ export default {
     &.choice-wrap-4 label {
       width: 25%;
     }
+    /deep/ .ant-checkbox {
+      // margin-top: -0.2em;
+      margin-top: 5px;
+    }
+    /deep/ .ant-checkbox-inner {
+      vertical-align: top;
+    }
   }
   /deep/.choice-radio span,
   /deep/.choice-checkbox span {