cnhis-design-vue 2.0.10 → 2.0.13

package/packages/scale-view/scaleView.vue

@@ -18,17 +18,17 @@
         ></evaluatePage>
         <template v-else>
           <evaluateCountdown
-              v-if="showEvaluateCoundownPage"
-              ref="evaluateCountdown"
-              :formArray="formArray"
-              :evaluateResultConfig="config.evaluateResultConfig"
-              :evaluateResultSetting="config.evaluateResultSetting"
-              :form="form"
-              :isFinished="isFinished"
-              :currentTime="currentTime"
-              :showEvaluateCountdown="showEvaluateCountdown"
-              @closeEvaluateCountdown="closeEvaluateCountdown"
-            ></evaluateCountdown>
+            v-if="showEvaluateCoundownPage"
+            ref="evaluateCountdown"
+            :formArray="formArray"
+            :evaluateResultConfig="config.evaluateResultConfig"
+            :evaluateResultSetting="config.evaluateResultSetting"
+            :form="form"
+            :isFinished="isFinished"
+            :currentTime="currentTime"
+            :showEvaluateCountdown="showEvaluateCountdown"
+            @closeEvaluateCountdown="closeEvaluateCountdown"
+          ></evaluateCountdown>
           <div
             class="scale-container"
             :class="{ 'scale-container-nopadding': handlePageClass }"
@@ -36,18 +36,24 @@
           >
             <div class="totalScore-warp" v-if="hasScore">
               <div>
-                测评总分：<span>{{ maxScore }}分</span>
+                测评总分：
+                <span>{{ maxScore }}分</span>
               </div>
               <div>
-                测评分数：<span :style="{ color: getEvaResColor }">{{ config.totalScore }}分</span>
+                测评分数：
+                <span :style="{ color: getEvaResColor }">{{ config.totalScore }}分</span>
               </div>
               <template v-if="hasEvaluateSetting">
                 <div>
                   测评结果：
-                  <span class="score-result" :style="{ color: getEvaResColor }">{{ config.evaluateResult }}</span>
+                  <span
+                    class="score-result"
+                    :style="{ color: getEvaResColor }"
+                  >{{ config.evaluateResult }}</span>
                 </div>
                 <div>
-                  结果说明：<span>{{ config.evaluateResultExplain }}</span>
+                  结果说明：
+                  <span>{{ config.evaluateResultExplain }}</span>
                 </div>
               </template>
             </div>
@@ -130,9 +136,10 @@
                         v-html="handleShowQuestionNumber(item)"
                       ></span>
                       <span class="required-text" v-if="isFormBoldOpen(item)">(必填)</span>
-                      <span class="evalute-label" v-if="showEvaluateLabel(item)">
-                        {{ showEvaluateLabel(item) }}
-                      </span>
+                      <span
+                        class="evalute-label"
+                        v-if="showEvaluateLabel(item)"
+                      >{{ showEvaluateLabel(item) }}</span>
                       <template v-if="showEvatip(item)">
                         <span class="evalute-tip" @click="showEvaTipModal(item)">
                           <svg-icon icon-class="a-xitongtubiaotishi" />查看提示
@@ -260,52 +267,42 @@
   </div>
 </template>
 <script>
-import {
-  Icon,
-  Checkbox,
-  Tree, 
-  Tooltip,
-  Input,
-  Spin,
-  FormModel,
-  Divider,
-  Button
-} from "ant-design-vue";
-import create from "@/core/create";
-import { MyChoice, MyInput, MyAddress, MyUpload, MyTime, MyPrompt } from "./formitem";
-import MapComp from "../map/src/popup-map";
-import labelForm from "~/select-label/select-label";
-import vodChunkUpload from "~/upload/chunk-upload/vod-chunk-upload.vue";
+import { Icon, Checkbox, Tree, Tooltip, Input, Spin, FormModel, Divider, Button } from 'ant-design-vue';
+import create from '@/core/create';
+import { MyChoice, MyInput, MyAddress, MyUpload, MyTime, MyPrompt } from './formitem';
+import MapComp from '../map/src/popup-map';
+import labelForm from '~/select-label/select-label';
+import vodChunkUpload from '~/upload/chunk-upload/vod-chunk-upload.vue';
 // import { EventBus } from "@/common/utils/eventBus.js";
-import { judgeTypes } from "./mixin/judgeTypes";
-import NoDataJs from "./mixin/NoData";
+import { judgeTypes } from './mixin/judgeTypes';
+import NoDataJs from './mixin/NoData';
 // import { mapGetters } from "vuex";
-import moment from "moment";
-import utils from "@/utils/utils-map";
-import evaluatePage from "./evaluatePage.vue";
-import evaluateCountdown from "./evaluateCountdown.vue";
-import answerParse from "./answerParse.vue";
+import moment from 'moment';
+import utils from '@/utils/utils-map';
+import evaluatePage from './evaluatePage.vue';
+import evaluateCountdown from './evaluateCountdown.vue';
+import answerParse from './answerParse.vue';
 import vexutils from '@/utils/vexutils';
 import NoData from './NoData.vue';
 export default create({
-  name: "scale-view",
+  name: 'scale-view',
   mixins: [judgeTypes, NoDataJs],
   props: {
     ids: {
       type: Object,
       default: () => {
-        return { guage_id: "", db_id: undefined };
+        return { guage_id: '', db_id: undefined };
       }
     },
     params: { default: () => ({}), type: Object },
     guageData: { type: Object, default: () => ({}) },
     noBtn: { type: Boolean, default: false },
     hideBtn: { type: Boolean, default: false },
-    source: { type: String, default: "" },
+    source: { type: String, default: '' },
     isLock: { type: Boolean, default: false },
     type: {
       type: String,
-      default: ""
+      default: ''
     },
     styleSetting: {
       type: Object,
@@ -321,7 +318,7 @@ export default create({
         extrasmall: 0.9
       })
     },
-    openType: { type: String, default: "" },
+    openType: { type: String, default: '' },
     scaleApiConfig: {
       type: Object,
       default: () => ({})
@@ -364,14 +361,10 @@ export default create({
       };
     },
     isFormBoldOpen() {
-      return function(item) {
+      return function (item) {
         let res = item.required;
         // 量表未登录时 判断 url中是否有 formBoldOpen
-        if (
-          !this.styleSetting ||
-          !Object.keys(this.styleSetting).length ||
-          !("formBoldOpen" in this.styleSetting)
-        ) {
+        if (!this.styleSetting || !Object.keys(this.styleSetting).length || !('formBoldOpen' in this.styleSetting)) {
           return res && this.queryformBoldOpen;
         }
         return res && this.styleSetting.formBoldOpen;
@@ -379,11 +372,11 @@ export default create({
     },
     scaleStyle() {
       let fontSize = this.fontSize;
-      if (!fontSize || fontSize === "S") return null;
+      if (!fontSize || fontSize === 'S') return null;
       const keyValue = {
-        L: "large",
-        M: "medium",
-        XS: "extrasmall"
+        L: 'large',
+        M: 'medium',
+        XS: 'extrasmall'
       };
       fontSize = keyValue[fontSize];
       const scale = (fontSize && this.fontSizeObj[fontSize]) || 1;
@@ -396,7 +389,7 @@ export default create({
       };
     },
     handlePageClass() {
-      if (this.type == "customList" && !this.noBtn) return false;
+      if (this.type == 'customList' && !this.noBtn) return false;
       if (!this.noBtn && !this.hideBtn) return false;
       return true;
     },
@@ -404,14 +397,11 @@ export default create({
       return item => this.showEvent(item);
     },
     handleShowQuestionNumber() {
-      return function(item) {
+      return function (item) {
         let { type } = item || {};
-        let tempTile =
-          this.config?.autoQuestionNumber === false
-            ? item.showTitle
-            : `${item.softcode}、${item.showTitle}`;
+        let tempTile = this.config?.autoQuestionNumber === false ? item.showTitle : `${item.softcode}、${item.showTitle}`;
         if (!this.isEvaluation(type)) return tempTile;
-        
+
         let score = this.handleEvaluationScore(item);
         return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
         // if (this.noBtn) {
@@ -431,7 +421,7 @@ export default create({
     hasScore() {
       let { config } = this;
       if (!config || !Object.keys(config).length) return false;
-      if ("totalScore" in config) return true;
+      if ('totalScore' in config) return true;
       return false;
     },
     // 预览按钮打开的量表页面
@@ -442,11 +432,11 @@ export default create({
     hasEvaluateSetting() {
       let { config } = this;
       if (!config || !Object.keys(config).length) return false;
-      if ("evaluateResult" in config && config.evaluateResult) return true;
+      if ('evaluateResult' in config && config.evaluateResult) return true;
       return false;
     },
     getTimeValue() {
-      return function(item) {
+      return function (item) {
         let value = this.form[this.formKey(item)];
         return value;
       };
@@ -457,25 +447,11 @@ export default create({
       // 有evaluateResultSetting || url中含有固定参数
       // 倒计时未结束
       // 未填写过
-      return (
-        !this.isPreviewScale &&
-        this.showEvaluatePage &&
-        this.showEvaluateSettingWrap &&
-        !this.isFinished &&
-        !this.noBtn &&
-        !this.hideBtn
-      );
+      return !this.isPreviewScale && this.showEvaluatePage && this.showEvaluateSettingWrap && !this.isFinished && !this.noBtn && !this.hideBtn;
     },
     // 是否展示倒计时
     showEvaluateCoundownPage() {
-      return (
-        !this.isPreviewScale &&
-        !this.showEvaluateEntry &&
-        this.showEvaluateCountdownWrap &&
-        !this.isFinished &&
-        !this.noBtn &&
-        !this.hideBtn
-      );
+      return !this.isPreviewScale && !this.showEvaluateEntry && this.showEvaluateCountdownWrap && !this.isFinished && !this.noBtn && !this.hideBtn;
     },
     // 是否设置 evaluateResultSetting
     hasEvaluateResultSetting() {
@@ -494,7 +470,7 @@ export default create({
     // url中是否有默认值
     hasDefault() {
       let hash = window.location.hash;
-      let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
+      let defaultVariable = ['evaname', 'evadesc', 'evast', 'evadur', 'evaan'];
       let hasDefault = defaultVariable.find(item => hash.includes(item));
       return this.paramsEvaluate || hasDefault;
     },
@@ -515,56 +491,43 @@ export default create({
       return this.hideBtn || this.isLock || this.isFinished;
     },
     showEvaluateLabel() {
-      return function(item) {
+      return function (item) {
         let obj = {
-          EVALUATE_RADIO_BLOCK: "单选题",
-          EVALUATE_CHECKBOX_BLOCK: "多选题"
+          EVALUATE_RADIO_BLOCK: '单选题',
+          EVALUATE_CHECKBOX_BLOCK: '多选题'
         };
         return obj[item.type];
       };
     },
     showAnswerParse() {
-      return function(item) {
-        let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } =
-          this.config?.evaluateResultSetting || {};
-        let arr = [
-          "EVALUATE_RADIO_BLOCK",
-          "EVALUATE_CHECKBOX_BLOCK",
-          "EVALUATE_SELECT",
-          "EVALUATE_INPUT"
-        ];
+      return function (item) {
+        let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } = this.config?.evaluateResultSetting || {};
+        let arr = ['EVALUATE_RADIO_BLOCK', 'EVALUATE_CHECKBOX_BLOCK', 'EVALUATE_SELECT', 'EVALUATE_INPUT'];
         let maxScore = item?.scoreConfigs || 0;
         let isShow = evaluateAnswer && this.isFinished && arr.includes(item.type) && maxScore;
-        if (
-          !evaluateStartTime ||
-          !evaluateTime ||
-          (checkAnswerMode && checkAnswerMode == 1)
-        )
-          return isShow;
+        if (!evaluateStartTime || !evaluateTime || (checkAnswerMode && checkAnswerMode == 1)) return isShow;
         if (!vexutils.isValidDate(new Date(evaluateStartTime))) return isShow;
         // 答案解析时间 考试时间结束后
-        let endTime = moment(evaluateStartTime).add(evaluateTime, "minutes");
-        let isRang = endTime.diff(moment(), "seconds", true);
+        let endTime = moment(evaluateStartTime).add(evaluateTime, 'minutes');
+        let isRang = endTime.diff(moment(), 'seconds', true);
         return isShow && isRang <= 0;
       };
     },
     tipMsg() {
-      return this.type === "customList" ? "保存" : "提交";
+      return this.type === 'customList' ? '保存' : '提交';
     },
     formKey() {
-      return function(item) {
+      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";
+      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: {
@@ -603,29 +566,22 @@ export default create({
   },
   data() {
     return {
-      other: "",
+      other: '',
       form: {},
       submitForm: {},
       rules: {},
       config: {},
       formArray: [],
       mapVisible: false,
-      mapLocation: "",
+      mapLocation: '',
       labelSelectedList: [],
       defaultFormArray: [],
-      fontSize: "",
-      filterArr: [
-        "SUCCESS_TIP",
-        "CALLBACK_INTERFACE",
-        "SPREAD_PARAMS",
-        "REDIRECT",
-        "FRONT_ADDRESS",
-        "RETURN_PATH"
-      ],
+      fontSize: '',
+      filterArr: ['SUCCESS_TIP', 'CALLBACK_INTERFACE', 'SPREAD_PARAMS', 'REDIRECT', 'FRONT_ADDRESS', 'RETURN_PATH'],
       spinning: true,
       indicator: <a-icon type="loading" style="font-size: 24px" spin />,
       totalScore: undefined,
-      shareId: "",
+      shareId: '',
       currentTime: moment(),
       showEvaluatePage: false,
       showEvaluateSettingWrap: true,
@@ -678,26 +634,26 @@ export default create({
       if (data.isNotFilled) {
         this.spinning = false;
         this.hasFrontAddress = false;
-        this.setNoData(true, '未查询到量表填写记录')
+        this.setNoData(true, '未查询到量表填写记录');
         return;
       }
       if (data.isLackCustomer) {
         let _this = this;
         // 校验用户环境
         this.$info({
-          title: "已设置填写次数限制",
-          content: "请在包含用户信息的环境中打开此量表",
+          title: '已设置填写次数限制',
+          content: '请在包含用户信息的环境中打开此量表',
           onOk() {
-            _this.$emit("onCloseSetting");
+            _this.$emit('onCloseSetting');
           }
         });
       }
       this.config = map;
 
-      if ("evaluateResultConfig" in map && utils.isJSON(map.evaluateResultConfig)) {
+      if ('evaluateResultConfig' in map && utils.isJSON(map.evaluateResultConfig)) {
         this.config.evaluateResultConfig = JSON.parse(map.evaluateResultConfig);
       }
-      if ("evaluateResultSetting" in map && utils.isJSON(map.evaluateResultSetting)) {
+      if ('evaluateResultSetting' in map && utils.isJSON(map.evaluateResultSetting)) {
         this.config.evaluateResultSetting = JSON.parse(map.evaluateResultSetting);
         // 随机测评
         if (this.config?.randomId && this.config.evaluateResultSetting) {
@@ -728,7 +684,7 @@ export default create({
     },
     handleFrontAddress(list) {
       if (!list || !list.length) return;
-      let matchItem = list.find(item => item.type === "FRONT_ADDRESS");
+      let matchItem = list.find(item => item.type === 'FRONT_ADDRESS');
       if (!matchItem || !Object.keys(matchItem).length) return;
       let setting;
       if (matchItem.setting && utils.isJSON(matchItem.setting)) {
@@ -741,16 +697,16 @@ export default create({
       let { frontAddress } = setting;
       if (frontAddress) {
         let urlHref = window.location.href;
-        let preStr = "?";
-        if (frontAddress.includes("?")) {
-          preStr = "&";
+        let preStr = '?';
+        if (frontAddress.includes('?')) {
+          preStr = '&';
         }
         let curUrl = `${frontAddress}${preStr}redirect_url=${encodeURIComponent(urlHref)}`;
         return curUrl;
       }
     },
     handleBtnParamsEvaluate(params) {
-      let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
+      let defaultVariable = ['evaname', 'evadesc', 'evast', 'evadur', 'evaan'];
       let res = {};
       for (let key in params) {
         let value = params[key];
@@ -772,49 +728,48 @@ export default create({
         query = this.paramsEvaluate;
       }
       let obj = {
-        evaluateName: "evaname",
-        evaluateExplain: "evadesc",
-        evaluateStartTime: "evast",
-        evaluateTime: "evadur",
-        evaluateAnswer: "evaan"
+        evaluateName: 'evaname',
+        evaluateExplain: 'evadesc',
+        evaluateStartTime: 'evast',
+        evaluateTime: 'evadur',
+        evaluateAnswer: 'evaan'
       };
       for (let key in evaluateResultSetting) {
         let value = evaluateResultSetting[key];
-        let isParseKey =
-          value && key != "evaluateAnswer" && typeof value === "string" && value.includes("${");
+        let isParseKey = value && key != 'evaluateAnswer' && typeof value === 'string' && value.includes('${');
         if (isParseKey) {
           let parseValue = value.replace(/\$\{([^}]+)\}/g, (_v, $1) => {
             let param;
-            if ($1.startsWith("form.")) {
-              param = query[$1.split(".")[1]];
+            if ($1.startsWith('form.')) {
+              param = query[$1.split('.')[1]];
             }
-            return param || "";
+            return param || '';
           });
           this.$set(evaluateResultSetting, key, parseValue);
         } else {
           let val = query[obj[key]];
-          if (key == "evaluateAnswer") {
-            val = val === "true" || val == 1 ? true : false;
+          if (key == 'evaluateAnswer') {
+            val = val === 'true' || val == 1 ? true : false;
           }
           query[obj[key]] && this.$set(evaluateResultSetting, key, val);
         }
       }
       // 部分evaluateResultSetting 但是却有url
       if (this.hasDefault) {
-        let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
+        let defaultVariable = ['evaname', 'evadesc', 'evast', 'evadur', 'evaan'];
         let defObj = {
-          evaname: "evaluateName",
-          evadesc: "evaluateExplain",
-          evast: "evaluateStartTime",
-          evadur: "evaluateTime",
-          evaan: "evaluateAnswer"
+          evaname: 'evaluateName',
+          evadesc: 'evaluateExplain',
+          evast: 'evaluateStartTime',
+          evadur: 'evaluateTime',
+          evaan: 'evaluateAnswer'
         };
         defaultVariable.forEach(item => {
           let key = defObj[item];
           if (!evaluateResultSetting[key]) {
             let val = query[item];
-            if (item == "evaan") {
-              val = val === "true" || val == 1 ? true : false;
+            if (item == 'evaan') {
+              val = val === 'true' || val == 1 ? true : false;
             }
             query[item] && this.$set(evaluateResultSetting, key, val);
           }
@@ -824,7 +779,7 @@ export default create({
     },
     handleQueryParams() {
       let params = {};
-      for (let [key, value] of new URLSearchParams(window.location.hash.split("?")[1]).entries()) {
+      for (let [key, value] of new URLSearchParams(window.location.hash.split('?')[1]).entries()) {
         params[key] = decodeURIComponent(value);
       }
       return params;
@@ -837,8 +792,8 @@ export default create({
         // 无默认值 不显示考试入口页面
         if (!this.hasDefault) return false;
         // 有默认值   显示考试入口页面
-        if (!("evaluateResultSetting" in this.config)) {
-          this.$set(this.config, "evaluateResultSetting", {});
+        if (!('evaluateResultSetting' in this.config)) {
+          this.$set(this.config, 'evaluateResultSetting', {});
         }
         this.setDefaultEvaluate(this.config.evaluateResultSetting);
         this.showEvaluatePage = true;
@@ -870,20 +825,20 @@ export default create({
         query = this.paramsEvaluate;
       }
       if (query.evaname) {
-        this.$set(evaluateResultSetting, "evaluateName", query.evaname);
+        this.$set(evaluateResultSetting, 'evaluateName', query.evaname);
       }
       if (query.evadesc) {
-        this.$set(evaluateResultSetting, "evaluateExplain", query.evadesc);
+        this.$set(evaluateResultSetting, 'evaluateExplain', query.evadesc);
       }
       if (query.evast) {
-        this.$set(evaluateResultSetting, "evaluateStartTime", query.evast);
+        this.$set(evaluateResultSetting, 'evaluateStartTime', query.evast);
       }
       if (query.evadur) {
-        this.$set(evaluateResultSetting, "evaluateTime", query.evadur);
+        this.$set(evaluateResultSetting, 'evaluateTime', query.evadur);
       }
       if (query.evaan) {
-        let evaan = query.evaan === "true" || query.evaan == 1 ? true : false;
-        this.$set(evaluateResultSetting, "evaluateAnswer", evaan);
+        let evaan = query.evaan === 'true' || query.evaan == 1 ? true : false;
+        this.$set(evaluateResultSetting, 'evaluateAnswer', evaan);
       }
 
       this.setEvaluateStartTime(evaluateResultSetting);
@@ -892,10 +847,7 @@ export default create({
     setEvaluateStartTime(evaluateResultSetting) {
       let evaluateStartTime = evaluateResultSetting?.evaluateStartTime;
       if (!evaluateStartTime) return;
-      if (
-        !vexutils.isValidDate(new Date(evaluateStartTime)) &&
-        vexutils.isValidDate(new Date(Number(evaluateStartTime)))
-      ) {
+      if (!vexutils.isValidDate(new Date(evaluateStartTime)) && vexutils.isValidDate(new Date(Number(evaluateStartTime)))) {
         evaluateResultSetting.evaluateStartTime = Number(evaluateStartTime);
       }
     },
@@ -913,7 +865,7 @@ export default create({
           if (item.setting?.defValType == 3) {
             let urlKey = item.setting?.outDefaultValue?.urlKey;
             if (urlKey) {
-              let list = urlKey.split(",");
+              let list = urlKey.split(',');
               if (list.length > 1) {
                 let val = list
                   .map(l => {
@@ -927,24 +879,24 @@ export default create({
                 let val = this.getQueryVariable(list[0]);
                 if (val) {
                   val = decodeURIComponent(val);
-                  defValue = item.type == "CHECKBOX_BLOCK" ? val.split() : val;
+                  defValue = item.type == 'CHECKBOX_BLOCK' ? val.split() : val;
                 }
               }
             }
           }
         }
         switch (type) {
-          case "LOCATION":
-            formData[key] = defValue || "";
+          case 'LOCATION':
+            formData[key] = defValue || '';
             break;
-          case "SEARCH_CASCADE":
+          case 'SEARCH_CASCADE':
             formData[key] = defValue || [];
             break;
-          case "ADDRESS":
-            formData[key] = defValue || "";
+          case 'ADDRESS':
+            formData[key] = defValue || '';
             this.defaultAddress = defValue || {};
             break;
-          case "LABEL":
+          case 'LABEL':
             formData[key] = defValue || {};
             if (vexutils.isObject(defValue)) {
               this.labelSelectedList = defValue?.labels || [];
@@ -954,20 +906,20 @@ export default create({
               this.labelSelectedList = [];
             }
             break;
-          case "TITLE":
+          case 'TITLE':
             formData[key] = item.title;
             break;
-          case "IMGCARD":
-            formData[key] = item.setting?.imgUrl || "";
+          case 'IMGCARD':
+            formData[key] = item.setting?.imgUrl || '';
             break;
-          case "UPFILE":
-          case "UPPICTURE":
+          case 'UPFILE':
+          case 'UPPICTURE':
             formData[key] = defValue || [];
             break;
           // 自定义列表特殊处理
-          case "CHECKBOX_BLOCK":
-            if (defValue && !Array.isArray(defValue) && this.type === "customList") {
-              formData[key] = defValue.split(",").filter(ii => !!ii);
+          case 'CHECKBOX_BLOCK':
+            if (defValue && !Array.isArray(defValue) && this.type === 'customList') {
+              formData[key] = defValue.split(',').filter(ii => !!ii);
             } else {
               val = defValue || item.setting.defaultValue;
               if (vexutils.isJSON(val)) {
@@ -991,9 +943,9 @@ export default create({
     compileSpreadParams(spreadParams) {
       return spreadParams.domains.map(v => {
         let obj = {};
-        if (v.valueType == "1") {
+        if (v.valueType == '1') {
           obj[v.name] = v.value;
-        } else if (v.valueType == "2") {
+        } else if (v.valueType == '2') {
           obj[v.name] = this.getQueryVariable(v.value);
         }
         return obj;
@@ -1002,7 +954,7 @@ export default create({
     // 获取url链接参数
     getQueryVariable(variable) {
       let query = {};
-      if (this.source == "layout") {
+      if (this.source == 'layout') {
         // 按钮传参
         query = this.params;
       } else {
@@ -1016,36 +968,35 @@ export default create({
       let i = 1;
       const results = list.map(item => {
         const key = this.formKey(item);
-        let title = (key || "").replace(/\n/g, "");
-        this.$set(item, "showTitle", item.title);
+        let title = (key || '').replace(/\n/g, '');
+        this.$set(item, 'showTitle', item.title);
         // 表单校验rule prop如果有 . 会报错, 替换成 ~-~
-        if (title.includes(".")) {
-          let newTitle = title.replace(/\./g, "~-~");
-          this.$set(item, "title", newTitle);
+        if (title.includes('.')) {
+          let newTitle = title.replace(/\./g, '~-~');
+          this.$set(item, 'title', newTitle);
         }
-        this.$set(item, "isShow", true);
+        this.$set(item, 'isShow', true);
         Object.keys(item).forEach(key => {
           if (utils.isJSON(item[key])) {
-            if (item.type != "LOCATION") {
+            if (item.type != 'LOCATION') {
               item[key] = JSON.parse(item[key]);
             }
           }
         });
-        const notIndexArr = ["LINEBAR", "TITLE", "PROMPT", "IMGCARD", "RICH_TEXT"];
+        const notIndexArr = ['LINEBAR', 'TITLE', 'PROMPT', 'IMGCARD', 'RICH_TEXT'];
         if (notIndexArr.indexOf(item.type) < 0 && !item.hide) {
-          this.$set(item, "softcode", i++);
+          this.$set(item, 'softcode', i++);
         }
 
-
         // "RADIO_BLOCK", "CHECKBOX_BLOCK" 将取值value改为key
         if (this.isChoice(item.type)) {
           this.handleFormatOptions(item.options, item.type);
-          if (item.type != "SEARCH_CASCADE") {
+          if (item.type != 'SEARCH_CASCADE') {
             if (item.dbValue) {
-              this.nextLogicEvent(item.dbValue, item, results);
+              this.nextLogicEvent(item.dbValue, item, results, true);
             } else {
               if (item.setting.defaultValue) {
-                this.nextLogicEvent(item.setting.defaultValue, item, results);
+                this.nextLogicEvent(item.setting.defaultValue, item, results, true);
               }
             }
           }
@@ -1054,22 +1005,15 @@ export default create({
       });
       return results.map(item => {
         // 题目关联
-        let relationLogicObj = utils.isString(item.relationLogic)
-          ? JSON.parse(item.relationLogic)
-          : item.relationLogic;
+        let relationLogicObj = utils.isString(item.relationLogic) ? JSON.parse(item.relationLogic) : item.relationLogic;
         this.handleRelationLogic(list, relationLogicObj);
 
         // 跳题逻辑
         this.handLenextLogic(item);
-        
+
         // 自定义列表特殊处理
-        if (
-          item.type === "CHECKBOX_BLOCK" &&
-          item.dbValue &&
-          !Array.isArray(item.dbValue) &&
-          this.type === "customList"
-        ) {
-          item.dbValue = item.dbValue.split(",").filter(ii => !!ii);
+        if (item.type === 'CHECKBOX_BLOCK' && item.dbValue && !Array.isArray(item.dbValue) && this.type === 'customList') {
+          item.dbValue = item.dbValue.split(',').filter(ii => !!ii);
         }
         return item;
       });
@@ -1123,7 +1067,7 @@ export default create({
       return matchOption.key;
     },
     isRadioOrCheckBox(options, type) {
-      let typeArr = ["RADIO_BLOCK", "CHECKBOX_BLOCK"];
+      let typeArr = ['RADIO_BLOCK', 'CHECKBOX_BLOCK'];
       if (!typeArr.includes(type)) return;
       if (!options) return;
       if (options && utils.isJSON(options)) {
@@ -1137,7 +1081,7 @@ export default create({
       if (!isChoice) return;
 
       options.forEach((item, i) => {
-        if (item.key !== "other") {
+        if (item.key !== 'other') {
           item.key = i + 1;
         }
         if (item.prefix || item.suffix) {
@@ -1151,89 +1095,89 @@ export default create({
       formArray.forEach(item => {
         let newTitle = this.formKey(item);
         // 表单校验rule prop如果有 . 会报错, 替换成 ~-~
-        if (newTitle.includes(".")) {
-          newTitle = newTitle.replace(/\./g, "~-~");
+        if (newTitle.includes('.')) {
+          newTitle = newTitle.replace(/\./g, '~-~');
         }
-        rules[newTitle] = [{ required: item.required, message: "必填", trigger: "change" }];
-        if (item.type == "MOBILE" && item.validation) {
+        rules[newTitle] = [{ required: item.required, message: '必填', trigger: 'change' }];
+        if (item.type == 'MOBILE' && item.validation) {
           rules[newTitle].push({
             pattern: /^1[3456789]\d{9}$/,
-            message: "格式错误",
-            trigger: "blur"
+            message: '格式错误',
+            trigger: 'blur'
           });
-        } else if (item.type == "ID_CARD" && item.validation) {
+        } else if (item.type == 'ID_CARD' && item.validation) {
           rules[newTitle].push({
             pattern: /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,
-            message: "格式错误",
-            trigger: "blur"
+            message: '格式错误',
+            trigger: 'blur'
           });
-        } else if (item.type == "ADDRESS" && item.required) {
+        } else if (item.type == 'ADDRESS' && item.required) {
           if (this.handleAddressType(item)) {
             rules[newTitle].push({
               validator: this.checkAdress,
-              trigger: "change"
+              trigger: 'change'
             });
           }
-        } else if (item.type == "LABEL" && item.required) {
+        } else if (item.type == 'LABEL' && item.required) {
           rules[newTitle].push({
             validator: this.checkLabel,
-            trigger: "change"
+            trigger: 'change'
           });
-        } else if (item.type == "DATETIME" && this.type == "customList") {
+        } else if (item.type == 'DATETIME' && this.type == 'customList') {
           // 自定义列表特殊处理日期时间 最大值
           // dateMaxType 1当前日期时间 2指定日期时间 3其他日期时间字段
           let dateMaxType = this.handleDateMaxType(item);
           if (!dateMaxType) return;
           let obj = {
-            1: "checkDateMaxCur",
-            2: "checkDateMaxSet",
-            3: "checkDateMaxOther"
+            1: 'checkDateMaxCur',
+            2: 'checkDateMaxSet',
+            3: 'checkDateMaxOther'
           };
           let methodName = obj[dateMaxType];
           rules[newTitle].push({
             validator: (rule, value, callback) => this[methodName](rule, value, callback, item),
-            trigger: "change"
+            trigger: 'change'
           });
-        } else if (item.type === "RADIO_BLOCK") {
+        } else if (item.type === 'RADIO_BLOCK') {
           this.choiceComObj[this.formKey(item)] = {};
           rules[newTitle].push({
             validator: (rule, value, callback) => this.checkRadio(rule, value, callback, item),
-            trigger: "change"
+            trigger: 'change'
           });
-        } else if (item.type === "CHECKBOX_BLOCK") {
+        } else if (item.type === 'CHECKBOX_BLOCK') {
           this.choiceComObj[this.formKey(item)] = {};
           rules[newTitle].push({
             validator: (rule, value, callback) => this.checkCheckbox(rule, value, callback, item),
-            trigger: "change"
+            trigger: 'change'
           });
         }
       });
       return rules;
     },
     handleAddressType(item) {
-      let setObj = { addressType: "province-city-district-address" };
+      let setObj = { addressType: 'province-city-district-address' };
       if (utils.isJSON(item.setting)) {
         setObj = JSON.parse(item.setting);
       } else {
         setObj = item.setting;
       }
-      let isAdress = setObj.addressType.includes("address");
+      let isAdress = setObj.addressType.includes('address');
       return isAdress;
     },
     checkAdress(rule, value, callback) {
       let { address } = value || {};
       if (!address) {
-        return callback(new Error("必填"));
+        return callback(new Error('必填'));
       }
       callback();
     },
     checkLabel(rule, value, callback) {
       if (!value || !Object.keys(value).length) {
-        return callback(new Error("必填"));
+        return callback(new Error('必填'));
       }
       let { labelStr, labels = [] } = value;
       if (!labelStr || !labels.length) {
-        return callback(new Error("必填"));
+        return callback(new Error('必填'));
       }
       callback();
     },
@@ -1250,12 +1194,12 @@ export default create({
       let { dateType } = item.setting;
       if (!dateType) return callback();
       let dateMaxValue = this.currentTime;
-      if (dateType == "time") {
-        dateMaxValue = this.currentTime.format("HH:mm:ss");
+      if (dateType == 'time') {
+        dateMaxValue = this.currentTime.format('HH:mm:ss');
       }
       let isMax = this.handleMax(dateType, value, dateMaxValue);
       if (!isMax) {
-        return callback(new Error("最大不能超过当前日期时间"));
+        return callback(new Error('最大不能超过当前日期时间'));
       }
       callback();
     },
@@ -1266,7 +1210,7 @@ export default create({
       if (!dateMaxValue || !dateType) return callback();
       let isMax = this.handleMax(dateType, value, dateMaxValue);
       if (!isMax) {
-        return callback(new Error("最大不能超过指定日期时间"));
+        return callback(new Error('最大不能超过指定日期时间'));
       }
       callback();
     },
@@ -1288,7 +1232,7 @@ export default create({
     checkRadio(rule, value, callback, item) {
       if (!value) return callback();
       let { options } = item;
-      if (!options.length || value === "other") return callback();
+      if (!options.length || value === 'other') return callback();
       const key = this.formKey(item);
       let { optionsPreSuffixObj = {} } = this.choiceComObj[key] || {};
       let matchItem = options.find((o, i) => {
@@ -1317,7 +1261,7 @@ export default create({
       let { optionsPreSuffixObj = {} } = this.choiceComObj[key] || {};
       for (; i < len; i++) {
         v = value[i];
-        if (v === "other") continue;
+        if (v === 'other') continue;
         let matchItem = options.find((o, j) => {
           if (j + 1 === v) {
             return true;
@@ -1336,13 +1280,13 @@ export default create({
       callback();
     },
     handleMax(dateType, value, dateMaxValue) {
-      let curValue = "";
-      let tempValue = "";
-      if (dateType == "time") {
-        let curYMD = this.currentTime.format("YYYY MM DD ");
+      let curValue = '';
+      let tempValue = '';
+      if (dateType == 'time') {
+        let curYMD = this.currentTime.format('YYYY MM DD ');
         curValue = moment(curYMD + dateMaxValue).valueOf();
         tempValue = moment(curYMD + value).valueOf();
-      } else if (dateType == "date") {
+      } else if (dateType == 'date') {
         curValue = moment(dateMaxValue).valueOf();
         tempValue = moment(value).valueOf();
       } else {
@@ -1359,7 +1303,7 @@ export default create({
         const valObj = JSON.parse(val);
         return valObj.address || valObj.name;
       }
-      return "";
+      return '';
     },
     handleSelectLocation(e, item) {
       const { locationProp, isInit } = e;
@@ -1369,24 +1313,24 @@ export default create({
       this.mapVisible = isInit || false;
     },
     isInput(type) {
-      return type == "INPUT" || type == "ID_CARD" || type == "MOBILE" || type == "EVALUATE_INPUT";
+      return type == 'INPUT' || type == 'ID_CARD' || type == 'MOBILE' || type == 'EVALUATE_INPUT';
     },
     isChoice(type) {
       return (
-        type == "SELECT" ||
-        type == "RADIO_BLOCK" ||
-        type == "CHECKBOX_BLOCK" ||
-        type == "SEARCH_CASCADE" ||
-        type == "EVALUATE_RADIO_BLOCK" ||
-        type == "EVALUATE_CHECKBOX_BLOCK" ||
-        type == "EVALUATE_SELECT"
+        type == 'SELECT' ||
+        type == 'RADIO_BLOCK' ||
+        type == 'CHECKBOX_BLOCK' ||
+        type == 'SEARCH_CASCADE' ||
+        type == 'EVALUATE_RADIO_BLOCK' ||
+        type == 'EVALUATE_CHECKBOX_BLOCK' ||
+        type == 'EVALUATE_SELECT'
       );
     },
     isTime(type) {
-      return type == "DATE" || type == "TIME" || type == "DATETIME";
+      return type == 'DATE' || type == 'TIME' || type == 'DATETIME';
     },
     isUpload(type) {
-      return type == "UPFILE" || type == "UPPICTURE";
+      return type == 'UPFILE' || type == 'UPPICTURE';
     },
     writeGuage(showCountdown) {
       this.showEvaluateSettingWrap = false;
@@ -1399,26 +1343,25 @@ export default create({
       this.banSubmit = true;
       this.submitMethod();
       this.$warning({
-        title: "温馨提示",
-        content: "测评时间到了，结束测评！",
-        okText: "确定",
-        onOk: () => {
-        }
+        title: '温馨提示',
+        content: '测评时间到了，结束测评！',
+        okText: '确定',
+        onOk: () => {}
       });
     },
-    async showEvaTipModal(item){
+    async showEvaTipModal(item) {
       if (this.evatipMap[item.id]) {
         this.evatipConfirm(this.evatipMap[item.id]);
         return;
       }
-      let key = 'getSubjectAnswer'
+      let key = 'getSubjectAnswer';
       const fn = this.scaleApiConfig?.[key] || null;
-      if(!fn || typeof fn !== 'function') {
-        this.$message.error(`${key} Is not a function`)
-        return
+      if (!fn || typeof fn !== 'function') {
+        this.$message.error(`${key} Is not a function`);
+        return;
       }
-      let obj = await fn(item.id)
-      if(!obj) return;
+      let obj = await fn(item.id);
+      if (!obj) return;
       if (!this.evatipMap[item.id]) {
         this.evatipMap[item.id] = obj;
         this.evatipConfirm(obj);
@@ -1437,19 +1380,19 @@ export default create({
         </div>
       );
       this.$confirm({
-        title: "提示",
+        title: '提示',
         icon: () => null,
         content,
-        okText: "确定",
-        cancelText: "关闭",
+        okText: '确定',
+        cancelText: '关闭',
         onOk() {},
         onCancel() {},
-        class: "evatip-modal-wrap"
+        class: 'evatip-modal-wrap'
       });
     },
     // 选择组件
     handleChoice(choiceValue, formItem) {
-      let { value = "", list = [] } = choiceValue;
+      let { value = '', list = [] } = choiceValue;
       this.nextLogicEvent(value, formItem, this.formArray);
       this.handleDynamicDataRelation(list, formItem, this.formArray);
     },
@@ -1465,38 +1408,84 @@ export default create({
         const key = this.formKey(matchEle);
         if (matchEle) {
           if (!list.length) {
-            this.form[key] = "";
+            this.form[key] = '';
           } else {
-            let relationFieldList = list.map(v => v[item.relationField] || "/") || "";
-            this.form[key] = relationFieldList.join(",");
+            let relationFieldList = list.map(v => v[item.relationField] || '/') || '';
+            this.form[key] = relationFieldList.join(',');
           }
         }
       });
     },
+    // 设置的logic condition 最大next_subject
+    handleLogicMaxNext(condition = []) {
+      const arr = condition.map(({ next_subject }) => (next_subject == 'end' ? 9999 : +(next_subject || 9999)));
+      const max = Math.max.call(null, ...arr);
+      return max;
+    },
+    // 当前formItem 下一个触发logicCodition item 的seq
+    handleLogicList(formItem, formArray) {
+      const { seq } = formItem;
+      let list = formArray.map(item => {
+        if (item.seq > seq && item.isShow && item.__isLogic__) return item;
+        return false;
+      });
+      let nextItemMax = 0;
+      let i = 0,
+        len = list.length,
+        item;
+      for (; i < len; i++) {
+        item = list[i];
+        let curVal = this.form[this.formKey(item)];
+        if (!curVal) continue;
+        if (Array.isArray(curVal)) {
+          if (!curVal.length) continue;
+        }
+        const { nextLogic, seq, __isLogic__, __lastSeq__ } = item;
+        if (!nextLogic.next_logic_is || !nextLogic.condition.length) continue;
+        if (__lastSeq__) {
+          nextItemMax = __lastSeq__;
+          break;
+        }
+      }
+      return nextItemMax;
+    },
     // 跳题逻辑
-    nextLogicEvent(choiceValue, formItem, formArray = []) {
+    nextLogicEvent(choiceValue, formItem, formArray = [], isInit) {
       const { nextLogic, seq } = formItem;
-      if(!nextLogic) return;
-      if (nextLogic.next_logic_is) {
+      if (!nextLogic) return;
+      if (nextLogic.next_logic_is && nextLogic.condition.length) {
+        let nextMax = 9999,
+          nextItemMax = 0;
+        if (!isInit) {
+          nextMax = this.handleLogicMaxNext(nextLogic.condition);
+          nextItemMax = this.handleLogicList(formItem, formArray);
+        }
         nextLogic.condition.some(con => {
           const { value, next_subject } = con;
-          const lastSeq = next_subject == "end" ? 9999 : next_subject;
-          if (nextLogic.next_logic == "condition") {
+          const lastSeq = next_subject == 'end' ? 9999 : next_subject;
+          if (nextItemMax && nextItemMax > seq && nextItemMax < nextMax) {
+            nextMax = nextItemMax;
+          }
+          if (nextLogic.next_logic == 'condition') {
             let hasValue = false;
             if (Array.isArray(choiceValue)) {
               hasValue = choiceValue.includes(value);
             } else {
               hasValue = choiceValue === value;
             }
+
+            formItem.__isLogic__ = hasValue;
+            formItem.__lastSeq__ = seq + 1;
+
             if (hasValue) {
               formArray.forEach(item => {
                 if (item.seq > seq && item.seq < lastSeq) {
                   item.isShow = false;
                   // 跳过时 清空已填内容
                   const key = this.formKey(item);
-                  this.form[key] && (this.form[key] = "");
-                } else {
-                  item.isShow = true;
+                  this.form[key] && (this.form[key] = '');
+                } else if (item.seq >= lastSeq && item.seq < nextMax) {
+                  this.$set(item, 'isShow', true);
                 }
               });
               return true;
@@ -1507,15 +1496,19 @@ export default create({
                 }
               });
             }
-          } else if (nextLogic.next_logic == "uncondition") {
+          } else if (nextLogic.next_logic == 'uncondition') {
+            let res = utils.isEmpty(choiceValue);
+
+            formItem.__isLogic__ = !res;
+            formItem.__lastSeq__ = seq + 1;
+
             formArray.forEach(item => {
               const key = this.formKey(item);
               if (item.seq > seq && item.seq < lastSeq) {
-                let res = utils.isEmpty(choiceValue);
                 item.isShow = res;
                 // 跳过时 清空已填内容
                 if (!res) {
-                  this.form[key] && (this.form[key] = "");
+                  this.form[key] && (this.form[key] = '');
                 }
               }
             });
@@ -1534,15 +1527,10 @@ export default create({
         if (formItem.setting && utils.isJSON(formItem.setting)) {
           setting = JSON.parse(formItem.setting);
         }
-        relationLogicObj = utils.isString(setting.callbackCondition)
-          ? JSON.parse(setting.callbackCondition)
-          : setting.callbackCondition;
-        if (!relationLogicObj || !relationLogicObj.condition || !relationLogicObj.condition.length)
-          return true;
+        relationLogicObj = utils.isString(setting.callbackCondition) ? JSON.parse(setting.callbackCondition) : setting.callbackCondition;
+        if (!relationLogicObj || !relationLogicObj.condition || !relationLogicObj.condition.length) return true;
       } else {
-        relationLogicObj = utils.isString(formItem.relationLogic)
-          ? JSON.parse(formItem.relationLogic)
-          : formItem.relationLogic;
+        relationLogicObj = utils.isString(formItem.relationLogic) ? JSON.parse(formItem.relationLogic) : formItem.relationLogic;
       }
       if (!relationLogicObj || !Object.keys(relationLogicObj).length) return true;
       const { relation_logic_is, condition, relation_logic } = relationLogicObj;
@@ -1555,9 +1543,9 @@ export default create({
             return c.value.includes(form[key]);
           }
         });
-        if (relation_logic == "OR") {
+        if (relation_logic == 'OR') {
           formItem.isShow = results.some(el => el);
-        } else if (relation_logic == "AND") {
+        } else if (relation_logic == 'AND') {
           formItem.isShow = results.every(el => el);
         } else {
           formItem.isShow = results[0];
@@ -1569,14 +1557,14 @@ export default create({
     radioChange(val, item, obj) {
       const key = this.formKey(item);
       this.form[key] = val;
-      item.type === "RADIO_BLOCK" && this.$set(this.choiceComObj, key, obj);
+      item.type === 'RADIO_BLOCK' && this.$set(this.choiceComObj, key, obj);
       this.nextLogicEvent(val, item, this.formArray);
     },
     // 多选组件回调
     checkboxChange(val, item, obj) {
       const key = this.formKey(item);
       this.form[key] = val;
-      item.type === "CHECKBOX_BLOCK" && this.$set(this.choiceComObj, key, obj);
+      item.type === 'CHECKBOX_BLOCK' && this.$set(this.choiceComObj, key, obj);
       this.nextLogicEvent(val, item, this.formArray);
     },
     // 标签组件回调
@@ -1586,13 +1574,13 @@ export default create({
     },
     // 视频组件回调
     vodFileList(list, item) {
-       const key = this.formKey(item);
+      const key = this.formKey(item);
       this.form[key] = list;
     },
     handleGetLabelSubmit(labelSelectedList) {
       if (!labelSelectedList || !labelSelectedList.length)
         return {
-          labelStr: "",
+          labelStr: '',
           labels: []
         };
       const selectedList = labelSelectedList || [];
@@ -1605,7 +1593,7 @@ export default create({
       });
       this.labelSelectedList = selectedList;
       return {
-        labelStr: labelStrList.join(","),
+        labelStr: labelStrList.join(','),
         labels: labels
       };
     },
@@ -1630,51 +1618,48 @@ export default create({
       // 不包含测评组件，点击提交，弹出二次确认对话框，确认要提交吗？
       let hasEvaluate = this.formArray.find(item => this.isEvaluation(item.type));
       if (!hasEvaluate) {
-        this.confirmSubmit("确认要提交吗？");
+        this.confirmSubmit('确认要提交吗？');
         return;
       }
 
       // 包含测评组件，不包含考试时长，点击提交，弹出二次确认对话框，确认要结束测评吗？
       // 判断有无测评配置 并且在测评时间内
       let { evaluateResultSetting } = this.config;
-      if (
-        !evaluateResultSetting ||
-        (!Object.keys(evaluateResultSetting).length && !this.showEvaluateEntry)
-      ) {
-        this.confirmSubmit("确认要结束测评吗？");
+      if (!evaluateResultSetting || (!Object.keys(evaluateResultSetting).length && !this.showEvaluateEntry)) {
+        this.confirmSubmit('确认要结束测评吗？');
         return;
       }
 
       // 表单内嵌量表, 没有开始答题, 不需要调用保存接口
-      if (this.openType == "formIframe" && this.showEvaluateEntry) {
-        this.$emit("submitNoRequest");
+      if (this.openType == 'formIframe' && this.showEvaluateEntry) {
+        this.$emit('submitNoRequest');
         return;
       }
 
       // 无倒计时
       let countdownDom = this.$refs.evaluateCountdown;
-      if(!countdownDom?.showEvaluateCountdown) {
-        this.confirmSubmit("确认要结束测评吗？");
+      if (!countdownDom?.showEvaluateCountdown) {
+        this.confirmSubmit('确认要结束测评吗？');
         return;
       }
 
       // 在倒计时内
-      let message = "确认要提前结束测评吗？";
+      let message = '确认要提前结束测评吗？';
       let setAnswered = this.$refs.evaluateCountdown?.setAnswered;
       let totalLen = this.$refs.evaluateCountdown?.totalLen;
       // 存在未解答题目
       if (setAnswered < totalLen) {
-        message = "存在未解答的题目，确定要提前结束吗？";
+        message = '存在未解答的题目，确定要提前结束吗？';
       }
       this.confirmSubmit(message);
     },
     confirmSubmit(message) {
       let _this = this;
       this.$confirm({
-        title: "温馨提示",
+        title: '温馨提示',
         content: message,
-        okText: "确定",
-        cancelText: "取消",
+        okText: '确定',
+        cancelText: '取消',
         onOk: () => {
           _this.onSubmitForm();
         },
@@ -1682,9 +1667,9 @@ export default create({
       });
     },
     onSubmitForm() {
-      this.$refs["ruleForm"].validate((valid, keys) => {
+      this.$refs['ruleForm'].validate((valid, keys) => {
         if (valid) {
-         this.submitMethod()
+          this.submitMethod();
         } else {
           if (Object.keys(keys).length > 0) {
             let key = Object.keys(keys)[0];
@@ -1701,28 +1686,22 @@ export default create({
       });
     },
     submitMethod() {
-      const hasSpreadParams = this.defaultFormArray.find(v => v.type === "SPREAD_PARAMS");
+      const hasSpreadParams = this.defaultFormArray.find(v => v.type === 'SPREAD_PARAMS');
       if (hasSpreadParams) {
         if (utils.isJSON(hasSpreadParams.setting)) {
           hasSpreadParams.setting = JSON.parse(hasSpreadParams.setting);
         }
         let spreadKey = this.formKey(hasSpreadParams);
-        this.submitForm[spreadKey] = this.compileSpreadParams(
-          hasSpreadParams.setting.spreadParams
-        );
+        this.submitForm[spreadKey] = this.compileSpreadParams(hasSpreadParams.setting.spreadParams);
       }
       // 自定义列表新增时多选特殊处理
-      let checkBoxKey = this.defaultFormArray.find(ii => ii.type == "CHECKBOX_BLOCK");
-      if (
-        checkBoxKey &&
-        Array.isArray(this.form[checkBoxKey.title]) &&
-        this.type === "customList"
-      ) {
-        this.form[checkBoxKey.title] = this.form[checkBoxKey.title].join(",");
+      let checkBoxKey = this.defaultFormArray.find(ii => ii.type == 'CHECKBOX_BLOCK');
+      if (checkBoxKey && Array.isArray(this.form[checkBoxKey.title]) && this.type === 'customList') {
+        this.form[checkBoxKey.title] = this.form[checkBoxKey.title].join(',');
       }
       const scoreJson = this.handleScoreJson();
       let params;
-      if (this.type === "customList") {
+      if (this.type === 'customList') {
         params = {
           definedListId: this.ids.guage_id,
           dbId: this.ids.db_id,
@@ -1739,12 +1718,10 @@ export default create({
       if (this.shareId) {
         params.shareId = this.shareId;
       }
-      const tipSetting = this.defaultFormArray.find(item => item.type === "SUCCESS_TIP");
+      const tipSetting = this.defaultFormArray.find(item => item.type === 'SUCCESS_TIP');
       if (tipSetting) {
         // 提交保存成功提示设置
-        const tip = utils.isJSON(tipSetting.setting)
-          ? JSON.parse(tipSetting.setting)
-          : tipSetting.setting;
+        const tip = utils.isJSON(tipSetting.setting) ? JSON.parse(tipSetting.setting) : tipSetting.setting;
         params.tipSetting = JSON.stringify({
           tipMode: tip.tipMode,
           tipType: tip.tipType,
@@ -1752,7 +1729,7 @@ export default create({
           tipApi: tip.tipApi
         });
       }
-      let hasCallbackItem = this.defaultFormArray.find(v => v.type === "CALLBACK_INTERFACE");
+      let hasCallbackItem = this.defaultFormArray.find(v => v.type === 'CALLBACK_INTERFACE');
       let isCallback = false;
       if (hasCallbackItem) {
         isCallback = this.showEvent(hasCallbackItem, true);
@@ -1761,8 +1738,7 @@ export default create({
        * NOTE:
        * 提交数据往外推
        */
-      this.$emit("onSubmit", params, hasCallbackItem, isCallback);
-
+      this.$emit('onSubmit', params, hasCallbackItem, isCallback);
     },
     handleScoreJson() {
       let tempObj = Object.assign({}, this.form, this.submitForm);
@@ -1774,50 +1750,39 @@ export default create({
         if (key && itemTemp) {
           let keyTemp;
           if (itemTemp && itemTemp.databaseTitle) keyTemp = itemTemp.databaseTitle;
-          if (
-            this.type == "customList" &&
-            itemTemp &&
-            itemTemp.setting &&
-            itemTemp.setting.startToStop != 1 &&
-            curValue &&
-            itemTemp.type == "DATETIME"
-          ) {
-            if (itemTemp.setting && itemTemp.setting.dateType == "time" && curValue)
-              curValue = moment().format("YYYY-MM-DD ") + curValue;
-            if (itemTemp.setting && itemTemp.setting.dateType == "date" && curValue)
-              curValue =
-                moment(curValue).format("YYYY-MM-DD ") + moment().format("HH:mm:ss");
+          if (this.type == 'customList' && itemTemp && itemTemp.setting && itemTemp.setting.startToStop != 1 && curValue && itemTemp.type == 'DATETIME') {
+            if (itemTemp.setting && itemTemp.setting.dateType == 'time' && curValue) curValue = moment().format('YYYY-MM-DD ') + curValue;
+            if (itemTemp.setting && itemTemp.setting.dateType == 'date' && curValue) curValue = moment(curValue).format('YYYY-MM-DD ') + moment().format('HH:mm:ss');
           }
 
           // 处理choice选项 将key替换为value
-          let isChoice = ["RADIO_BLOCK", "CHECKBOX_BLOCK"].includes(itemTemp.type);
+          let isChoice = ['RADIO_BLOCK', 'CHECKBOX_BLOCK'].includes(itemTemp.type);
           if (isChoice) {
             let { options } = itemTemp;
             let obj = this.choiceComObj[key];
-            if (itemTemp.type === "RADIO_BLOCK" && curValue) {
+            if (itemTemp.type === 'RADIO_BLOCK' && curValue) {
               curValue = this.handleChoiceItem(curValue, options, obj);
             }
-            if (itemTemp.type === "CHECKBOX_BLOCK" && curValue?.length) {
+            if (itemTemp.type === 'CHECKBOX_BLOCK' && curValue?.length) {
               let resArr = this.handleCheckboxParams(curValue, options, obj);
               curValue = resArr;
             }
           }
 
-          if (key.includes("~-~")) {
-            let newKey = keyTemp ? keyTemp.replace(/~-~/g, ".") : key.replace(/~-~/g, ".");
+          if (key.includes('~-~')) {
+            let newKey = keyTemp ? keyTemp.replace(/~-~/g, '.') : key.replace(/~-~/g, '.');
             res[newKey] = curValue;
           } else {
             res[keyTemp || key] = !curValue ? null : curValue;
           }
-          
         } else {
           res[key] = curValue;
         }
       }
-      console.log("res", res);
+      console.log('res', res);
       return res;
     },
-     handleCheckboxParams(value, options, obj) {
+    handleCheckboxParams(value, options, obj) {
       let res = [];
       let i = 0,
         len = value.length,
@@ -1841,8 +1806,8 @@ export default create({
     },
     handleChoiceItem(value, options, obj) {
       let { othersText, optionsPreSuffixObj = {} } = obj || {};
-      if (value === "other") {
-        return othersText || "其他";
+      if (value === 'other') {
+        return othersText || '其他';
       }
       let matchItem = options.find((o, i) => {
         if (i + 1 === value) {
@@ -1850,9 +1815,9 @@ export default create({
         }
         return false;
       });
-      if(!matchItem) return;
+      if (!matchItem) return;
       if (!matchItem.prefix && !matchItem.suffix) return matchItem.value;
-      let resValue = optionsPreSuffixObj[value] || "";
+      let resValue = optionsPreSuffixObj[value] || '';
       if (matchItem.prefix) {
         resValue = matchItem.prefix + resValue;
       } else {
@@ -1864,7 +1829,7 @@ export default create({
       this.$refs.ruleForm.resetFields();
     },
     cancel() {
-      this.$emit("onCloseSetting");
+      this.$emit('onCloseSetting');
     },
     handleEvaluationScore(ele) {
       let { minScore = 0, maxScore = 0, scoreType } = ele.scoreConfigs || {};