diff --git a/.DS_Store b/.DS_Store
index f307a0f..49d1a25 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/wenjuan-h5/config/api.js b/wenjuan-h5/config/api.js
index 1bd08c4..22286ac 100644
--- a/wenjuan-h5/config/api.js
+++ b/wenjuan-h5/config/api.js
@@ -6,14 +6,14 @@
 
 
 
-// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
-// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api'
+const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server'
+const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api'
 // const DOMAIN_PREFIXPING = 'http://172.16.61.123:80/cdwlMall/admin-server' 
 // const DOMAIN_PREFIX = 'http://172.16.61.123:80/cdwlMall/api'
 
-const host = `${window.location.protocol}//${window.location.host}`
-const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server`
-const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
+// const host = `${window.location.protocol}//${window.location.host}`
+// const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server`
+// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` 
 
 // const DOMAIN_PREFIXPING = `http://192.168.2.152:9003`
 // const DOMAIN_PREFIX = 'http://192.168.2.152:9007'
@@ -42,9 +42,9 @@ const TERMINAL = 1
 
 module.exports = {
 	//问卷查询接口
-		wenjuanList: WX_API_BASEPING + '/cereQuestionnaireTable/queryById', 
-		//问卷提交接口
-		wenjuanUp: WX_API_BASE + '/cereQuestionnaireAnswering/add', 
+	wenjuanList: WX_API_BASEPING + '/cereQuestionnaireTable/queryById',
+	//问卷提交接口
+	wenjuanUp: WX_API_BASE + '/cereQuestionnaireAnswering/add',
 	//问卷解析token
-	jietoken: WX_API_BASE  + '/cereQuestionnaireAnswering/get/token', 
+	jietoken: WX_API_BASE + '/cereQuestionnaireAnswering/get/token',
 }
diff --git a/wenjuan-h5/pages_category_page1/question/question copy.vue b/wenjuan-h5/pages_category_page1/question/question copy.vue
new file mode 100644
index 0000000..70c32e6
--- /dev/null
+++ b/wenjuan-h5/pages_category_page1/question/question copy.vue
@@ -0,0 +1,999 @@
+<template>
+	<view class="questionnaire">
+
+		<!-- 单选问题 -->
+		<view style="padding:20px;background-color: #f6f6f6;">
+			<view>
+				<h2
+					style="color: #000;overflow: hidden; text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;word-break: break-all;text-align:center">
+					{{ wenjuan.title }}
+				</h2>
+				<!-- <h5 style="padding: 10px 0;color: #000;">请您认真作答以下题目</h5> -->
+				<view class="" style="padding: 10px 0; height: 200px;">
+					<image :src="this.$hostUrl + wenjuan.coverImage" mode="scaleToFill"
+						style="width:100%;height: 100%;border-radius: 10px;"></image>
+				</view>
+			</view>
+			<view style="padding: 15px;background-color: #fff;border-radius: 10px;">
+				<view>
+					<!-- <u-parse :content="wenjuan.remarks"></u-parse> -->
+					<rich-text :nodes="wenjuan.remarks"></rich-text>
+					<!-- {{wenjuan.remarks}} -->
+					<!-- <view>
+						<view style="display:flex;padding:10px 0;justify-content: space-between;">
+							<view style="display:flex;">
+								{{wenjuan.createUser}}
+							</view>
+							<view>
+								{{wenjuan.createTime}}
+							</view>
+						</view>
+					</view> -->
+					<!-- <view>预计答题时间:{{this.wenjuan.estimatedTime}}分钟</view> -->
+				</view>
+			</view>
+			<view class="question" v-for="(item, index) in wenjuan.question" style="">
+				<p class="question-title"
+					style="font-weight:600;overflow: hidden; text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;word-break: break-all;">
+					<span v-if="item.required == '必填'" style="color: red;">*</span>{{ index }}.<span
+						style="color:#0FBB59;padding:0 3px;">({{ item.type }})</span>
+					{{ item.title }}
+				</p>
+				<view>
+
+					<!-- <radio-group @change="radioChange" v-model="item.choose" 
+						v-if="item.type =='单选'" >
+						<label :class="item.choose == val ?'option green':'option gary' " :key="val.answer" v-for="(val, idx) in item.options">
+							<view>
+								<radio :value="val.answer"  activeBackgroundColor="#E5FFF0" 
+									activeBorderColor="#4FCF86" iconColor="#0FBB59" />
+							</view>
+							<view>{{val.answer}}</view>
+						</label>
+					</radio-group> -->
+					<u-radio-group v-model="item.choose" v-if="item.type == '单选'" style="width: 100%;">
+						<view v-if="item.layoutType != 2">
+							<u-radio v-for="(val, idx) in item.options" style="width: 100%;"
+								:class="val.answer == item.choose ? 'option green' : 'option gary'" :name="val.answer"
+								:disabled="item.disabled" :key="idx" :label-disabled="false" active-color="#4FCF86">
+								{{ val.answer }}
+							</u-radio>
+						</view>
+						<view v-else-if="item.layoutType == 2" class="myMultiple">
+							<div v-for="(val, idx) in item.options"
+								:class="['myOption gary', { optionActive: myChoose.answer == val.answer }]" :key="idx"
+								@click="chooseAnswerOne(item.options, val, idx)">
+								<p class="chooseTag" v-if="myChoose.answer == val.answer"><u-icon name="checkbox-mark"
+										color="#fff" size="8pt"></u-icon></p>
+								{{ val.answer }}
+							</div>
+						</view>
+					</u-radio-group>
+
+					<u-checkbox-group v-model="item.choose" v-if="item.type == '多选'" style="width: 100%;">
+						{{item}}
+						<view v-if="item.layoutType != 2">
+							<u-checkbox v-for="(val, idx) in item.options" style="width: 100%;"
+								:class="val.disabled ? 'option green' : 'option gary'" v-model="val.disabled"
+								:label-disabled="false" :name="val.answer" :key="idx"
+								active-color="#4FCF86">{{ val.answer }}</u-checkbox>
+						</view>
+						<view v-else-if="item.layoutType == 2" class="myMultiple">
+							<div v-for="(val, index) in item.options"
+								:class="['myOption gary', { optionActive: val.disabled == true }]" :key="index"
+								@click="chooseAnswerMore(val, index,item)">
+								<p class="chooseTag" v-if="val.disabled == true"><u-icon name="checkbox-mark"
+										color="#fff" size="8pt"></u-icon></p>
+								{{ val.answer }}
+							</div>
+						</view>
+					</u-checkbox-group>
+					<!-- <checkbox-group @change="checkboxChange(index,$event,item,idx)"
+					v-model="item.choose" 
+						>
+						
+						<label :class="item.choose == val.answer ?'option green':'option gary' "  >
+							<view style="margin-bottom:5px;">
+								
+								<checkbox :name="val.answer" activeBackgroundColor="#E5FFF0"
+									activeBorderColor="#4FCF86" iconColor="#0FBB59" />
+									<span>{{val.answer}}</span	>
+							</view>
+							
+						</label>
+					</checkbox-group> -->
+					<view v-if="item.type == '文本'">
+						<u-input type="textarea" v-model="item.choose" placeholder="请输入" :border="true"></u-input>
+					</view>
+				</view>
+			</view>
+
+			<!-- 文本填写问题 -->
+			<view class="">
+				<!--    <p class="question-title">您的建议：</p >
+		    <textarea v-model="suggestion"></textarea> -->
+				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" validate-on-rule-change="false"
+					style="background-color:#fff;border-radius: 10px;">
+					<u-form-item label="姓名" prop="name" borderBottom ref="item1" v-if="wenjuan.needName == '必填'"
+						style="padding:10px 20px 0;">
+						<u-input v-model="model1.name" placeholder="请输入姓名"></u-input>
+					</u-form-item>
+					<u-form-item label="电话" prop="phone" borderBottom v-if="wenjuan.needPhone == '必填'"
+						style="padding: 0 20px;">
+						<u-input v-model="model1.phone" placeholder="请输入电话"></u-input>
+					</u-form-item>
+					<u-form-item label="性别" prop="sexl" borderBottom v-if="wenjuan.needGender == '必填'"
+						style="padding: 0 20px ;">
+						<!-- <u-input v-model="model1.sexl"  placeholder="请输入性别"></u-input> -->
+						<u-radio-group v-model="model1.sexl">
+							<u-radio active-color="#0FBB59" @change="radioChange" v-for="(item, index) in SexList"
+								:key="index" :name="item.name" :disabled="item.disabled">
+								{{ item.name }}
+							</u-radio>
+						</u-radio-group>
+					</u-form-item>
+
+
+					<view v-if="wenjuan.needOpinion == '必填'" style="padding:0 20px 10px 20px;">
+						<view style="margin-bottom:10px;">意见</view>
+
+						<u-input v-model="model1.opinion" type="textarea" :border="true" :maxlength="maxLength" />
+						<div class="char-count" style="font-size:12px;">
+							{{ currentLength }} / {{ maxLength }}
+						</div>
+					</view>
+
+				</u-form>
+
+			</view>
+
+			<button class="submit-btn" @click="submit">提交问卷</button>
+		</view>
+		<u-mask :show="show">
+			<view class="warp">
+				<view class="rect" @tap.stop>
+					<image src="../../static/images/tijiao.png" style="position: absolute;top:40%;width:80%;left:10%"
+						mode="aspectFit"></image>
+				</view>
+			</view>
+		</u-mask>
+
+
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	const NET = require('@/utils/request')
+	const API = require('@/config/api')
+	export default {
+		data() {
+			return {
+				show: false,
+				maxLength: 500, // 假设最大字数为500
+				suggestion: '',
+				model1: {
+					name: '',
+					phone: '',
+					sexl: '',
+					opinion: '',
+					socialSecurityCardNumber: ''
+				},
+				wenjuan: {
+
+				},
+				wentile: [],
+				rules: {
+					name: [{
+						type: 'string',
+						required: true,
+						message: '请填写姓名',
+						trigger: ['blur', 'change']
+					}],
+					phone: [{
+							required: true,
+							message: '请输入电话'
+						},
+						{
+							type: 'number',
+							message: '必须为数字值'
+						}
+					],
+				},
+
+				current: [],
+				pageTime: null,
+				duoxuan: [],
+				danAnswers: [],
+				selectedAnswers: [],
+				panduanId: [],
+				wenjuanIds: '',
+				scoreList: [],
+				SexList: [{
+						name: '男',
+						disabled: false
+					},
+					{
+						name: '女',
+						disabled: false
+					},
+				],
+				timeLeft: null,
+				token: '',
+				myChoose: {},
+				myChooseItem: [
+
+				],
+				panduan: false
+			};
+		},
+		computed: {
+			currentLength() {
+				return this.model1.opinion.length;
+			}
+		},
+		onLoad(options) {
+
+			if (options.ids != '') {
+				if (options.src && options.token) {
+
+					this.token = options.token
+					let obj = {
+						token: options.token
+					}
+					NET.request(API.jietoken, obj, 'get').then(res => {
+						if (typeof res.data == 'string') {
+
+							if (JSON.parse(res.data).phone) {
+								this.model1.phone = Number(JSON.parse(res.data).phone)
+							}
+							if (JSON.parse(res.data).aac003Mask) {
+								this.model1.name = JSON.parse(res.data).aac003Mask
+							}
+							if (JSON.parse(res.data).aac004) {
+								this.model1.sexl = JSON.parse(res.data).aac004
+								this.panduan = true
+							}
+							if (JSON.parse(res.data).aac002Mask) {
+								this.model1.socialSecurityCardNumber = JSON.parse(res.data).aac002Mask
+							}
+						}
+
+					})
+
+					// if (options.token != undefined) {}
+
+				} else if (options.phone != undefined) {
+					this.model1.phone = options.phone
+				}
+
+				this.wenjuanIds = options.ids
+				NET.request(API.wenjuanList, {
+					id: options.ids,
+					// reviewStatus: '3',
+				}, 'post').then(res => {
+					if (res.data.id) {
+						this.wenjuan = res.data
+						this.wenjuan.question = JSON.parse(res.data.question)
+						//检查this.wenjuan.question这个list的每个里面是否有maxChoose参数，没有的话就加一个
+						this.wenjuan.question.forEach(item => {
+							if (!item.maxChoose) {
+								item.maxChoose = 0
+							}
+						})
+
+
+						this.timeLeft = parseInt(this.wenjuan.estimatedTime, 10) * 60; // 将分钟转换为秒
+						this.updateCountdownDisplay()
+
+						if (res.data.reviewStatus == '5' || res.data.reviewStatus == '4') {
+							uni.reLaunch({
+								url: `/pages_category_page1/question/succe?flag=3`
+							})
+						}
+					} else {
+						uni.reLaunch({
+							url: `/pages_category_page1/question/succe?flag=1`
+						})
+					}
+
+					// if (res.data.cereQuestionManagements.length > 0) {
+					// 	for (let i = 0; i < res.data.cereQuestionManagements.length; i++) {
+					// 		this.$set(res.data.cereQuestionManagements[i], 'value', [])
+					// 	}
+					// }
+
+					// this.wentile = res.data.cereQuestionManagements
+
+					// this.wenjuan.cereQuestionManagements.map(item => {
+
+					// 	item.optionSettings = JSON.parse(item.optionSettings)
+					// 	item.score = JSON.parse(item.score)
+					// })
+
+				})
+			} else {
+				uni.reLaunch({
+					url: `/pages_category_page1/question/succe?flag=1`
+				})
+			}
+			// 设置倒计时定时器
+			// const countdownInterval = setInterval(() => {
+			//   if (this.timeLeft > 0) {
+			//     this.timeLeft--;
+			//     this.updateCountdownDisplay();
+			//   } else {
+			//     clearInterval(countdownInterval);
+			// 	location.reload(true);
+			//     // console.log('倒计时结束');
+			//     // 这里可以添加倒计时结束时的处理代码
+			//   }
+			// }, 1000); // 每秒更新一次
+			this.pageTime = this.getCurrentTimestamp()
+
+		},
+		watch: {},
+		methods: {
+			// 获取时间
+			currentTime() {
+				let date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1; // 月份从0~11，所以加一
+				let day = date.getDate();
+				let hours = date.getHours();
+				let minutes = date.getMinutes();
+				let seconds = date.getSeconds();
+
+				// 为月、日、小时、分钟和秒添加前导零（如果需要）
+				month = month < 10 ? '0' + month : month;
+				day = day < 10 ? '0' + day : day;
+				hours = hours < 10 ? '0' + hours : hours;
+				minutes = minutes < 10 ? '0' + minutes : minutes;
+				seconds = seconds < 10 ? '0' + seconds : seconds;
+
+				// 返回格式化的日期和时间字符串
+				return `${year}-${month}-${day} ${hours}:${minutes}`;
+			},
+			updateCountdownDisplay() {
+				const minutes = Math.floor(this.timeLeft / 60);
+				const seconds = this.timeLeft % 60;
+				// console.log(`${minutes} 分 ${seconds} 秒`);
+				// 这里可以替换为更新DOM元素的代码
+			},
+			// formatTime(seconds) {
+			//   const minutes = Math.floor(seconds / 60);
+			//   const remainingSeconds = seconds % 60;
+			//   return `${minutes}分${remainingSeconds < 10 ? '0' : ''}${remainingSeconds}秒`;
+			// },
+			getCurrentTimestamp() {
+				let Times = Date.now();
+				return Times // 或者 new Date().getTime();
+			},
+			checkRequiredQuestions(qust) {
+				for (let key in qust) {
+
+					let question = qust[key];
+					if (question.required === '必填') {
+						if (question.type === '文本' || question.type === '单选') {
+							if (question.choose === '') {
+
+								this.$refs.uToast.show({
+									title: '请填写所有必填题目',
+								})
+
+								return false; // 返回false表示有未填写的必填题目
+							}
+						} else if (question.type === '多选') {
+
+
+							let hasEnabledOption = question.options.some(option => option.disabled);
+
+							if (!hasEnabledOption) {
+								this.$refs.uToast.show({
+									title: '请填写所有必填题目',
+								})
+
+								return false; // 返回false表示有未填写的必填题目
+							}
+						}
+					}
+				}
+				return true; // 返回true表示所有必填题目都已填写
+			},
+			submit() {
+				let putTime = this.getCurrentTimestamp() - this.pageTime
+				putTime = (putTime / 1000).toFixed(2)
+				if (!this.checkRequiredQuestions(this.wenjuan.question)) {
+					return
+				}
+				if (this.model1.name == '' && this.wenjuan.needName == '必填') {
+					this.$refs.uToast.show({
+						title: '请输入姓名',
+					})
+					return;
+				}
+				if (this.wenjuan.needName == '不填' && this.token == '') {
+
+					this.model1.name = '匿名'
+
+				}
+				if (this.model1.phone == '' && this.wenjuan.needPhone == '必填') {
+					this.$refs.uToast.show({
+						title: '电话号码不能为空'
+					});
+					return;
+				}
+				if (this.wenjuan.needPhone == '必填' && this.isChineseOrPunctuation(this.model1.phone)) {
+					this.$refs.uToast.show({
+						title: '请输入电话且不能包含汉字或标点特殊符号',
+					})
+					return;
+				}
+
+				// if(this.wenjuan.needPhone =='不填' && this.wenjuan.fillingConditions == '可重复填写'){
+				//  this.model1.phone  = ''
+				// }
+
+				if (this.model1.sexl != '男' && this.model1.sexl != '女' && this.wenjuan.needGender == '必填') {
+					this.$refs.uToast.show({
+						title: '请选择性别',
+					})
+					return;
+				}
+				if (this.wenjuan.needGender == '不填' && this.panduan == false) {
+
+					this.model1.sexl = '未知'
+
+				}
+				if (this.model1.opinion == '' && this.wenjuan.needOpinion == '必填') {
+					this.$refs.uToast.show({
+						title: '请输入意见',
+					})
+					return;
+				}
+
+
+
+				// JSON.stringify(danAnswers)
+				// let array = this.danAnswers.concat(this.selectedAnswers)
+				// obj.answerOptions = JSON.stringify(array)
+				var arr = []
+				// for (let i = 0; i < this.wentile.length; i++) {
+				// 	var info = {
+				// 		id: "",
+				// 		value: [],
+				// 		cores:0,
+				// 	}
+				// 	if (this.wentile[i].questionType == '单选' || this.wentile[i].questionType == '文本'  ) {
+
+				// 			info.id = this.wentile[i].id
+				// 			info.value = this.wentile[i].value
+				// 			let index =this.wentile[i].value
+				// 			if(this.wentile[i].score){
+
+				// 				for (const key in this.wentile[i].score) {
+				// 				  if (this.wentile[i].score.hasOwnProperty(key)) { // 确保只获取对象自身的属性，而不是继承的属性
+
+				// 					if(key == index){
+				// 						info.cores = this.wentile[i].score[key]; // 设置 info.cores 为当前键对应的值
+				// 						      break; // 如果找到了匹配的键，可以提前退出循环
+				// 					}
+				// 				  }
+				// 				}
+				// 			}
+				// 			// console.log(this.wentile[i].cores[index])
+				// 			// info.cores.this.wentile[i].value = 
+
+				// 			arr.push(info)
+
+
+
+				// 		// if (this.wentile[i].value != '' && this.wentile[i].value != null && this.wentile[i].value !=
+				// 		// 	undefined) {
+				// 		// 	info.id = this.wentile[i].id
+				// 		// 	info.value = this.wentile[i].value
+				// 		// 	let index =this.wentile[i].value
+				// 		// 	if(this.wentile[i].score){
+
+				// 		// 		for (const key in this.wentile[i].score) {
+				// 		// 		  if (this.wentile[i].score.hasOwnProperty(key)) { // 确保只获取对象自身的属性，而不是继承的属性
+
+				// 		// 			if(key == index){
+				// 		// 				info.cores = this.wentile[i].score[key]; // 设置 info.cores 为当前键对应的值
+				// 		// 				      break; // 如果找到了匹配的键，可以提前退出循环
+				// 		// 			}
+				// 		// 		  }
+				// 		// 		}
+				// 		// 	}
+				// 		// 	// console.log(this.wentile[i].cores[index])
+				// 		// 	// info.cores.this.wentile[i].value = 
+
+				// 		// 	arr.push(info)
+
+				// 		// }
+				// 	} else {
+				// 		if (this.wentile[i].value.length > 0) {
+				// 			info.id = this.wentile[i].id
+				// 			info.value = this.wentile[i].value
+				// 				let index =this.wentile[i].value
+				// 				   console.log(this.wentile[i].score);
+				// 				if(this.wentile[i].score){
+
+				// 					for (const key in this.wentile[i].score) {
+				// 					  if (this.wentile[i].score.hasOwnProperty(key)) { // 确保只获取对象自身的属性，而不是继承的属性
+				// 							console.log('1111111111111111111',key,index)
+				// 							for(let j=0;j<index.length;j++){
+				// 								if(key == index[j]){
+				// 									console.log(info.cores,this.wentile[i].score[key])
+				// 									info.cores += this.wentile[i].score[key]; // 设置 info.cores 为当前键对应的值
+
+				// 								}
+				// 							}
+
+				// 					  }
+				// 					}
+				// 				}
+				// 			arr.push(info)
+
+				// 		}
+				// 	}
+
+
+				// }
+				console.log(this.wenjuan)
+
+				// let obj = {
+				// 	questionnaireId: this.wenjuanIds,
+				// 	userName: this.model1.name,
+				// 	contactNumber: this.model1.phone,
+				// 	gender: this.model1.sexl,
+				// 	responseTime: putTime,
+				// 	opinion:this.model1.opinion,
+				// 	createTime: this.currentTime(),
+				// 	answerOptions: {},
+				// 	answeringScore: '',
+				// 	questionnaireScore: null,
+
+				// }
+				//  obj.answeringScore = []
+
+				// for(let i=0;i<arr.length;i++){
+				// 	console.log()
+				// 	if(arr[i].cores ==null){
+				// 		obj.answerOptions[i+1] = arr[i].value
+				// 	}else{
+				// 		obj.questionnaireScore +=arr[i].cores
+				// 		obj.answeringScore.push(arr[i].cores)
+				// 		if(typeof arr[i].value !='string'){
+
+				// 			arr[i].value.sort((a, b) => a - b)
+				// 			obj.answerOptions[i+1] = arr[i].value.join(',')
+				// 		}else{
+				// 			obj.answerOptions[i+1]=arr[i].value
+				// 		}
+				// 	}
+
+
+				// }
+				// obj.answerOptions= JSON.stringify(obj.answerOptions)
+				// obj.answeringScore = obj.answeringScore.join(',')
+
+				var obj = {
+					...this.wenjuan
+				}
+
+
+				for (var key in obj.question) {
+					console.log(obj.question[key])
+					if (obj.question[key].type == '多选') {
+						obj.question[key].choose = []
+						obj.question[key].options.map(res => {
+							if (res.disabled) {
+								obj.question[key].choose.push(res.answer)
+							}
+
+						})
+						obj.question[key].choose = obj.question[key].choose.join(',')
+					}
+				}
+				const result = Object.keys(obj.question).reduce((acc, key) => {
+					const question = obj.question[key];
+					const chooseAnswers = question.choose.split(","); // 处理多选的情况
+					const indexes = chooseAnswers.map((choose) => {
+						const optionIndex = question.options.findIndex(
+							(option) => option.answer === choose
+						);
+						return optionIndex >= 0 ? optionIndex + 1 : null; // 序号从1开始
+					});
+
+					acc[key] = indexes.filter((index) => index !== null).join(","); // 只保留有效序号
+					return acc;
+				}, {});
+
+				// 计算总分数
+				const totalScore = Object.keys(obj.question).reduce((sum, key) => {
+					const question = obj.question[key]
+					if (question.type === "单选" || question.type === "多选") {
+						const chooseAnswers = question.choose.split(","); // 多选时拆分答案
+						chooseAnswers.forEach((choose) => {
+							const matchedOption = question.options.find(
+								(option) => option.answer === choose
+							);
+							if (matchedOption) {
+								sum += parseFloat(matchedOption.score || 0); // 累加分数
+							}
+						});
+					}
+					return sum;
+				}, 0);
+
+				// console.log(obj.question,totalScore,result)
+				// return
+				obj.questionnaireId = this.wenjuanIds
+				obj.userName = this.model1.name
+				obj.contactNumber = this.model1.phone
+				obj.gender = this.model1.sexl
+				obj.responseTime = putTime
+				obj.answerOptions = JSON.stringify(result)
+				obj.createTime = this.currentTime()
+				obj.opinion = this.model1.opinion
+				obj.questionnaireScore = totalScore
+
+				// let obj = {
+				// 	questionnaireId: this.wenjuanIds,
+				// 	userName: this.model1.name,
+				// 	contactNumber: this.model1.phone,
+				// 	gender: this.model1.sexl,
+				// 	responseTime: putTime,
+				// 	opinion:this.model1.opinion,
+				// 	createTime: this.currentTime(),
+				// 	answerOptions: {},
+				// 	answeringScore: '',
+				// 	questionnaireScore: null,
+
+				// }
+				obj.question = JSON.stringify(obj.question)
+				let tijiaoObj = {
+					questionnaireId: this.wenjuanIds,
+					userName: this.model1.name,
+					contactNumber: this.model1.phone,
+					gender: this.model1.sexl,
+					responseTime: putTime,
+					answerOptions: JSON.stringify(result),
+					socialSecurityCardNumber: this.model1.socialSecurityCardNumber,
+					createTime: this.currentTime(),
+					opinion: this.model1.opinion,
+					questionnaireScore: totalScore,
+					question: obj.question
+				}
+
+				console.log(tijiaoObj)
+
+				NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => {
+					// this.show =true
+
+					if (res.data == 'false') {
+						uni.reLaunch({
+							url: `/pages_category_page1/question/succe?chonfu=true`
+						})
+					} else {
+						uni.reLaunch({
+							url: `/pages_category_page1/question/succe?ids=${this.wenjuanIds}`
+						})
+					}
+
+				})
+
+			},
+
+			isChineseOrPunctuation(str) {
+				const regex = /[^\d]/;
+				return regex.test(str);
+			},
+
+
+			// radioChange(index, e, item, idx) {
+			// 	console.log(index, e, item, idx)
+
+			// 	// item.value = idx;
+			// 	// this.$forceUpdate();
+
+			// },
+			radioChange(ind) {
+				// console.log(index, e, item, idx)
+				// console.error(this.items)
+				// for (let i = 0; i < this.items.length; i++) {
+				// 	if (this.items[i].value === evt.detail.value) {
+				// 		this.current = i;
+				// 		break;
+				// 	}
+				// }
+				// item.value = idx;
+				// this.$forceUpdate();
+
+			},
+			checkboxChange(index, e, item, idx) {
+
+				// 	const index1 = item.value.indexOf(idx)
+				// 	if (index1 !== -1) {
+				// 		item.value.splice(index1, 1);
+				// 	} else {
+				// 		item.value.push(idx)
+				// 	}
+				// 	this.$forceUpdate();
+			},
+			chooseAnswerOne(options, chooseItem, idx) {
+
+				options.forEach(item => {
+					item.disabled = false
+				})
+
+				for (let key in this.wenjuan.question) {
+					this.wenjuan.question[key].options.map(res => {
+						if (res.answer == chooseItem.answer) {
+							this.wenjuan.question[key].choose = chooseItem.answer
+						}
+					})
+
+
+				}
+
+				this.myChoose = {
+					...chooseItem
+				}
+				chooseItem.disabled = true
+			},
+			chooseAnswerMore(chooseItem, idx, item) {
+				if (item.maxChoose && item.maxChoose > 0) {
+					// 获取当前题目的已选中选项数量
+					const selectedCount = item.options.filter(option => option.disabled).length;
+					// 如果已选中到达 maxChoose，并且当前项未被选中，则不允许选择
+					if (selectedCount >= item.maxChoose && !chooseItem.disabled) {
+						uni.showToast({
+							title: `最多只能选择 ${item.maxChoose} 个选项`,
+							icon: 'none',
+							duration: 2000
+						});
+						return;
+					}
+				}
+
+
+
+				if (chooseItem.disabled) {
+					chooseItem.disabled = false
+					for (let key in this.wenjuan.question) {
+						this.wenjuan.question[key].options.map(res => {
+							if (res.answer == chooseItem.answer) {
+								this.wenjuan.question[key].choose = ''
+							}
+						})
+					}
+				} else {
+					for (let key in this.wenjuan.question) {
+						this.wenjuan.question[key].options.map(res => {
+							if (res.answer == chooseItem.answer) {
+								this.wenjuan.question[key].choose = chooseItem.answer
+							}
+						})
+					}
+					chooseItem.disabled = true
+				}
+			},
+			chooseAnswer(item) {
+				console.log(1111);
+			}
+			// chooseAnswerMore(chooseItem, idx) {
+			// 	// 获取所有已选中的选项数量
+
+			// 	if (chooseItem.disabled) {
+			// 		chooseItem.disabled = false
+			// 		for (let key in this.wenjuan.question) {
+			// 			this.wenjuan.question[key].options.map(res => {
+			// 				if (res.answer == chooseItem.answer) {
+			// 					this.wenjuan.question[key].choose = ''
+			// 				}
+			// 			})
+			// 		}
+			// 	} else {
+			// 		for (let key in this.wenjuan.question) {
+			// 			this.wenjuan.question[key].options.map(res => {
+			// 				if (res.answer == chooseItem.answer) {
+			// 					this.wenjuan.question[key].choose = chooseItem.answer
+			// 				}
+			// 			})
+			// 		}
+			// 		chooseItem.disabled = true
+			// 	}
+			// }
+
+		}
+	};
+</script>
+
+<style>
+	/* 整体页面背景渐变颜色设置 */
+	body {
+		background: linear-gradient(to bottom, #e9f2f8, #d0e0ea);
+		font-family: Arial, sans-serif;
+		line-height: 1.6;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: flex-start;
+		margin: 0;
+		padding: 0;
+	}
+
+	.question {
+		background-color: white;
+		padding: 15px;
+		margin: 10px 0;
+		border-radius: 10px;
+	}
+
+	/* 问卷容器样式，确保宽度自适应且不超出屏幕，设置内边距和背景等 */
+	.questionnaire {
+		width: 100%;
+		max-width: 600px;
+		flex-grow: 1;
+		margin: auto;
+		/* padding: 30px; */
+		background-color: white;
+		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+		border-radius: 5px;
+		box-sizing: border-box;
+	}
+
+	/* 页面标题样式，设置背景色、文字颜色、宽度及内边距等 */
+	h3 {
+		text-align: center;
+		color: #000;
+		/* background-color: #007BFF; */
+		margin: 0;
+		padding: 10px 0;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	/* 问题标题样式，设置字体大小、颜色及下边框 */
+	.question-title {
+		font-size: 18px;
+		color: #000;
+		margin-bottom: 10px;
+	}
+
+	/* 选项样式，设置列表样式及光标样式 */
+	.option {
+		list-style-type: none;
+		margin: 0;
+		cursor: pointer;
+		display: flex;
+		align-items: center;
+		margin-bottom: 10px;
+		color: black;
+		padding: 10px 20px;
+		border-radius: 3px;
+		transition: background-color 0.3s ease;
+		margin-right: 10px;
+		font-size: 15px;
+		font-weight: 500;
+
+		.u-radio__label {
+			color: #000000;
+			font-size: 15px;
+			font-weight: 500;
+		}
+	}
+
+	.myOption {
+		margin: 0;
+		cursor: pointer;
+		display: flex;
+		align-items: center;
+		margin-bottom: 10px;
+		padding: 15px 20px;
+		border-radius: 3px;
+		transition: background-color 0.3s ease;
+		margin-right: 10px;
+		font-size: 16px;
+		color: #000;
+		font-family: 'Alibaba PuHuiTi 2.0-55 Regular';
+		letter-spacing: 1px;
+		overflow: hidden;
+		position: relative;
+
+		.chooseTag {
+			position: absolute;
+			top: 0;
+			right: 0;
+			width: 20px;
+			height: 20px;
+			background-color: #0fbb59;
+			border-radius: 0 0 0 20px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			.u-icon__icon {
+				margin-left: 4px;
+				margin-bottom: 2px;
+			}
+		}
+	}
+
+	.green {
+		background-color: #cff4de;
+
+		.u-radio__label {
+			color: #12ad55;
+		}
+	}
+
+	.gary {
+
+		background-color: #f5f5f5;
+
+	}
+
+	.optionActive {
+		background-color: #cff4de;
+		color: #12ad55;
+	}
+
+
+	/* 文本域样式，设置宽度、高度、边框及内边距 */
+	textarea {
+		width: 100%;
+		height: 100px;
+		border: 1px solid #ccc;
+		border-radius: 3px;
+		padding: 10px;
+		resize: vertical;
+		box-sizing: border-box;
+	}
+
+	/* 提交按钮样式，设置背景色、颜色、边框、内边距、光标及过渡效果 */
+	.submit-btn {
+		background-color: #3F9B6A;
+		color: white;
+		border: none;
+		padding: 0px 20px;
+		border-radius: 3px;
+		cursor: pointer;
+		margin-top: 20px;
+		transition: background-color 0.3s ease;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	/* 提交按钮悬停效果，改变背景色 */
+	.submit-btn:hover {
+		background-color: #3F9B6A;
+	}
+
+	.uni-checkbox-input {
+		width: 15px;
+		height: 15px;
+	}
+
+	.uni-radio-input {
+		width: 15px;
+		height: 15px;
+	}
+
+	::v-deep .u-radio__label {
+		white-space: normal !important;
+		/* 允许文本换行 */
+		word-break: break-all !important;
+		/* 当内容过长时，自动换行 */
+	}
+
+	::v-deep .myMultiple {
+		display: flex;
+		width: 100%;
+		flex-wrap: wrap;
+
+	}
+</style>
\ No newline at end of file
diff --git a/wenjuan-h5/pages_category_page1/question/question.vue b/wenjuan-h5/pages_category_page1/question/question.vue
index 3733494..3ac7862 100644
--- a/wenjuan-h5/pages_category_page1/question/question.vue
+++ b/wenjuan-h5/pages_category_page1/question/question.vue
@@ -6,11 +6,11 @@
 			<view>
 				<h2
 					style="color: #000;overflow: hidden; text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;word-break: break-all;text-align:center">
-					{{wenjuan.title}}
+					{{ wenjuan.title }}
 				</h2>
 				<!-- <h5 style="padding: 10px 0;color: #000;">请您认真作答以下题目</h5> -->
 				<view class="" style="padding: 10px 0; height: 200px;">
-					<image :src="this.$hostUrl+wenjuan.coverImage" mode="scaleToFill"
+					<image :src="this.$hostUrl + wenjuan.coverImage" mode="scaleToFill"
 						style="width:100%;height: 100%;border-radius: 10px;"></image>
 				</view>
 			</view>
@@ -32,15 +32,15 @@
 					<!-- <view>预计答题时间:{{this.wenjuan.estimatedTime}}分钟</view> -->
 				</view>
 			</view>
-			<view class="question" v-for="(item,index) in wenjuan.question" style="">
+			<view class="question" v-for="(item, index) in wenjuan.question" style="">
 				<p class="question-title"
 					style="font-weight:600;overflow: hidden; text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;word-break: break-all;">
-					<span v-if="item.required=='必填'" style="color: red;">*</span>{{index}}.<span
-						style="color:#0FBB59;padding:0 3px;">({{item.type}})</span>
-					{{item.title}}
+					<span v-if="item.required == '必填'" style="color: red;">*</span>{{ index }}.<span
+						style="color:#0FBB59;padding:0 3px;">({{ item.type }})</span>
+					{{ item.title }}
 				</p>
 				<view>
-					
+
 					<!-- <radio-group @change="radioChange" v-model="item.choose" 
 						v-if="item.type =='单选'" >
 						<label :class="item.choose == val ?'option green':'option gary' " :key="val.answer" v-for="(val, idx) in item.options">
@@ -51,37 +51,39 @@
 							<view>{{val.answer}}</view>
 						</label>
 					</radio-group> -->
-					<u-radio-group v-model="item.choose" v-if="item.type =='单选'" style="width: 100%;">
-						<view v-if="item.layoutType!=2">
+					<u-radio-group v-model="item.choose" v-if="item.type == '单选'" style="width: 100%;">
+						<view v-if="item.layoutType != 2">
 							<u-radio v-for="(val, idx) in item.options" style="width: 100%;"
-								:class="val.answer == item.choose ?'option green':'option gary' " :name="val.answer"
+								:class="val.answer == item.choose ? 'option green' : 'option gary'" :name="val.answer"
 								:disabled="item.disabled" :key="idx" :label-disabled="false" active-color="#4FCF86">
-								{{val.answer}}
+								{{ val.answer }}
 							</u-radio>
 						</view>
-						<view v-else-if="item.layoutType==2" class="myMultiple">
+						<view v-else-if="item.layoutType == 2" class="myMultiple">
 							<div v-for="(val, idx) in item.options"
-								:class="['myOption gary',{optionActive:myChoose.answer == val.answer}]" :key="idx"
-								 @click="chooseAnswerOne(item.options,val,idx)">
-								 <p class="chooseTag" v-if="myChoose.answer == val.answer"><u-icon name="checkbox-mark" color="#fff" size="8pt" ></u-icon></p>
-								{{val.answer}}
+								:class="['myOption gary', { optionActive: myChoose.answer == val.answer }]" :key="idx"
+								@click="chooseAnswerOne(item.options, val, idx)">
+								<p class="chooseTag" v-if="myChoose.answer == val.answer"><u-icon name="checkbox-mark"
+										color="#fff" size="8pt"></u-icon></p>
+								{{ val.answer }}
 							</div>
 						</view>
 					</u-radio-group>
-					
-					<u-checkbox-group v-model="item.choose" v-if="item.type =='多选'" style="width: 100%;">
-						<view v-if="item.layoutType!=2">
+
+					<u-checkbox-group v-model="item.choose" v-if="item.type == '多选'" style="width: 100%;">
+						<view v-if="item.layoutType != 2">
 							<u-checkbox v-for="(val, idx) in item.options" style="width: 100%;"
-								:class="val.disabled ?'option green':'option gary' " v-model="val.disabled"
+								:class="val.disabled ? 'option green' : 'option gary'" v-model="val.disabled"
 								:label-disabled="false" :name="val.answer" :key="idx" active-color="#4FCF86"
-								@click="chooseAnswer(val)">{{val.answer}}</u-checkbox>
+								@click="chooseAnswer(val)">{{ val.answer }}</u-checkbox>
 						</view>
-						<view v-else-if="item.layoutType==2" class="myMultiple">
+						<view v-else-if="item.layoutType == 2" class="myMultiple">
 							<div v-for="(val, index) in item.options"
-								:class="['myOption gary',{optionActive:val.disabled==true}]"
-								:key="index"  @click="chooseAnswerMore(val,index)">
-								 <p class="chooseTag" v-if="val.disabled==true"><u-icon name="checkbox-mark" color="#fff" size="8pt" ></u-icon></p>
-								{{val.answer}}
+								:class="['myOption gary', { optionActive: val.disabled == true }]" :key="index"
+								@click="chooseAnswerMore(val, index)">
+								<p class="chooseTag" v-if="val.disabled == true"><u-icon name="checkbox-mark"
+										color="#fff" size="8pt"></u-icon></p>
+								{{ val.answer }}
 							</div>
 						</view>
 					</u-checkbox-group>
@@ -99,7 +101,7 @@
 							
 						</label>
 					</checkbox-group> -->
-					<view v-if="item.type =='文本'">
+					<view v-if="item.type == '文本'">
 						<u-input type="textarea" v-model="item.choose" placeholder="请输入" :border="true"></u-input>
 					</view>
 				</view>
@@ -111,27 +113,27 @@
 		    <textarea v-model="suggestion"></textarea> -->
 				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" validate-on-rule-change="false"
 					style="background-color:#fff;border-radius: 10px;">
-					<u-form-item label="姓名" prop="name" borderBottom ref="item1" v-if="wenjuan.needName =='必填'"
+					<u-form-item label="姓名" prop="name" borderBottom ref="item1" v-if="wenjuan.needName == '必填'"
 						style="padding:10px 20px 0;">
 						<u-input v-model="model1.name" placeholder="请输入姓名"></u-input>
 					</u-form-item>
-					<u-form-item label="电话" prop="phone" borderBottom v-if="wenjuan.needPhone =='必填'"
+					<u-form-item label="电话" prop="phone" borderBottom v-if="wenjuan.needPhone == '必填'"
 						style="padding: 0 20px;">
 						<u-input v-model="model1.phone" placeholder="请输入电话"></u-input>
 					</u-form-item>
-					<u-form-item label="性别" prop="sexl" borderBottom v-if="wenjuan.needGender =='必填'"
+					<u-form-item label="性别" prop="sexl" borderBottom v-if="wenjuan.needGender == '必填'"
 						style="padding: 0 20px ;">
 						<!-- <u-input v-model="model1.sexl"  placeholder="请输入性别"></u-input> -->
 						<u-radio-group v-model="model1.sexl">
 							<u-radio active-color="#0FBB59" @change="radioChange" v-for="(item, index) in SexList"
 								:key="index" :name="item.name" :disabled="item.disabled">
-								{{item.name}}
+								{{ item.name }}
 							</u-radio>
 						</u-radio-group>
 					</u-form-item>
 
 
-					<view v-if="wenjuan.needOpinion =='必填'" style="padding:0 20px 10px 20px;">
+					<view v-if="wenjuan.needOpinion == '必填'" style="padding:0 20px 10px 20px;">
 						<view style="margin-bottom:10px;">意见</view>
 
 						<u-input v-model="model1.opinion" type="textarea" :border="true" :maxlength="maxLength" />
@@ -174,7 +176,7 @@
 					phone: '',
 					sexl: '',
 					opinion: '',
-					socialSecurityCardNumber:''
+					socialSecurityCardNumber: ''
 				},
 				wenjuan: {
 
@@ -219,9 +221,9 @@
 				token: '',
 				myChoose: {},
 				myChooseItem: [
-					
+
 				],
-				panduan:false
+				panduan: false
 			};
 		},
 		computed: {
@@ -240,7 +242,7 @@
 					}
 					NET.request(API.jietoken, obj, 'get').then(res => {
 						if (typeof res.data == 'string') {
-							
+
 							if (JSON.parse(res.data).phone) {
 								this.model1.phone = Number(JSON.parse(res.data).phone)
 							}
@@ -251,7 +253,7 @@
 								this.model1.sexl = JSON.parse(res.data).aac004
 								this.panduan = true
 							}
-								if (JSON.parse(res.data).aac002Mask) {
+							if (JSON.parse(res.data).aac002Mask) {
 								this.model1.socialSecurityCardNumber = JSON.parse(res.data).aac002Mask
 							}
 						}
@@ -272,7 +274,13 @@
 					if (res.data.id) {
 						this.wenjuan = res.data
 						this.wenjuan.question = JSON.parse(res.data.question)
-						
+						//检查this.wenjuan.question这个list的每个里面是否有maxChoose参数，没有的话就加一个
+						this.wenjuan.question.forEach(item => {
+							if (!item.maxChoose) {
+								item.maxChoose = 0
+							}
+						})
+
 
 						this.timeLeft = parseInt(this.wenjuan.estimatedTime, 10) * 60; // 将分钟转换为秒
 						this.updateCountdownDisplay()
@@ -368,7 +376,7 @@
 					if (question.required === '必填') {
 						if (question.type === '文本' || question.type === '单选') {
 							if (question.choose === '') {
-								
+
 								this.$refs.uToast.show({
 									title: '请填写所有必填题目',
 								})
@@ -384,7 +392,7 @@
 								this.$refs.uToast.show({
 									title: '请填写所有必填题目',
 								})
-								
+
 								return false; // 返回false表示有未填写的必填题目
 							}
 						}
@@ -393,15 +401,11 @@
 				return true; // 返回true表示所有必填题目都已填写
 			},
 			submit() {
-
 				let putTime = this.getCurrentTimestamp() - this.pageTime
 				putTime = (putTime / 1000).toFixed(2)
-
 				if (!this.checkRequiredQuestions(this.wenjuan.question)) {
 					return
 				}
-
-
 				if (this.model1.name == '' && this.wenjuan.needName == '必填') {
 					this.$refs.uToast.show({
 						title: '请输入姓名',
@@ -429,7 +433,7 @@
 				// if(this.wenjuan.needPhone =='不填' && this.wenjuan.fillingConditions == '可重复填写'){
 				//  this.model1.phone  = ''
 				// }
-				
+
 				if (this.model1.sexl != '男' && this.model1.sexl != '女' && this.wenjuan.needGender == '必填') {
 					this.$refs.uToast.show({
 						title: '请选择性别',
@@ -656,7 +660,7 @@
 					gender: this.model1.sexl,
 					responseTime: putTime,
 					answerOptions: JSON.stringify(result),
-					socialSecurityCardNumber:this.model1.socialSecurityCardNumber,
+					socialSecurityCardNumber: this.model1.socialSecurityCardNumber,
 					createTime: this.currentTime(),
 					opinion: this.model1.opinion,
 					questionnaireScore: totalScore,
@@ -719,47 +723,47 @@
 				// 	this.$forceUpdate();
 			},
 			chooseAnswerOne(options, chooseItem, idx) {
-				
+
 				options.forEach(item => {
 					item.disabled = false
 				})
-				
+
 				for (let key in this.wenjuan.question) {
-					 this.wenjuan.question[key].options.map(res=>{
-						 if (res.answer == chooseItem.answer) {
-						 	this.wenjuan.question[key].choose = chooseItem.answer
-						 }
-					 })
-					
-					
+					this.wenjuan.question[key].options.map(res => {
+						if (res.answer == chooseItem.answer) {
+							this.wenjuan.question[key].choose = chooseItem.answer
+						}
+					})
+
+
 				}
-				
+
 				this.myChoose = {
 					...chooseItem
 				}
 				chooseItem.disabled = true
 			},
 			chooseAnswerMore(chooseItem, idx) {
-				
-				if(chooseItem.disabled){
-									chooseItem.disabled=false
-									for (let key in this.wenjuan.question) {
-										 this.wenjuan.question[key].options.map(res=>{
-											 if (res.answer == chooseItem.answer) {
-											 	this.wenjuan.question[key].choose = ''
-											 }
-										 })
-									}
-								}else{
-									for (let key in this.wenjuan.question) {
-										 this.wenjuan.question[key].options.map(res=>{
-											 if (res.answer == chooseItem.answer) {
-											 	this.wenjuan.question[key].choose = chooseItem.answer
-											 }
-										 })
-									}
-									chooseItem.disabled=true
-								}
+
+				if (chooseItem.disabled) {
+					chooseItem.disabled = false
+					for (let key in this.wenjuan.question) {
+						this.wenjuan.question[key].options.map(res => {
+							if (res.answer == chooseItem.answer) {
+								this.wenjuan.question[key].choose = ''
+							}
+						})
+					}
+				} else {
+					for (let key in this.wenjuan.question) {
+						this.wenjuan.question[key].options.map(res => {
+							if (res.answer == chooseItem.answer) {
+								this.wenjuan.question[key].choose = chooseItem.answer
+							}
+						})
+					}
+					chooseItem.disabled = true
+				}
 
 			}
 
@@ -794,7 +798,7 @@
 		width: 100%;
 		max-width: 600px;
 		flex-grow: 1;
-		margin:auto;
+		margin: auto;
 		/* padding: 30px; */
 		background-color: white;
 		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
@@ -834,13 +838,15 @@
 		transition: background-color 0.3s ease;
 		margin-right: 10px;
 		font-size: 15px;
-		font-weight:500;
-		.u-radio__label{
-			color: #000000 ;
+		font-weight: 500;
+
+		.u-radio__label {
+			color: #000000;
 			font-size: 15px;
-			font-weight:500;
+			font-weight: 500;
 		}
 	}
+
 	.myOption {
 		margin: 0;
 		cursor: pointer;
@@ -857,7 +863,8 @@
 		letter-spacing: 1px;
 		overflow: hidden;
 		position: relative;
-		.chooseTag{
+
+		.chooseTag {
 			position: absolute;
 			top: 0;
 			right: 0;
@@ -868,23 +875,26 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			.u-icon__icon{
+
+			.u-icon__icon {
 				margin-left: 4px;
 				margin-bottom: 2px;
 			}
 		}
 	}
+
 	.green {
 		background-color: #cff4de;
-		.u-radio__label{
-			color: #12ad55 ;
+
+		.u-radio__label {
+			color: #12ad55;
 		}
 	}
 
 	.gary {
 
 		background-color: #f5f5f5;
-		
+
 	}
 
 	.optionActive {
diff --git a/wenjuan-pc/.env.development b/wenjuan-pc/.env.development
index 1465f9b..11e1d0a 100644
--- a/wenjuan-pc/.env.development
+++ b/wenjuan-pc/.env.development
@@ -5,12 +5,14 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dev-api'
 #  VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.120:9003'
 #  VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.120:9007'
- VUE_APP_DOMAIN_PREFIX_1='https://h5.028wlkj.com/cdwlMall/admin-server/'
- VUE_APP_DOMAIN_PREFIX_2='https://h5.028wlkj.com/cdwlMall/meserver/api'
+#  VUE_APP_DOMAIN_PREFIX_1='https://h5.028wlkj.com/cdwlMall/admin-server/'
+#  VUE_APP_DOMAIN_PREFIX_2='https://h5.028wlkj.com/cdwlMall/meserver/api'
 # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.48/meserver/admin-server/'
 # VUE_APP_DOMAIN_PREFIX_2='http://172.16.61.48/meserver/api'
 #VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.123:80/cdwlMall/admin-server/'
 #VUE_APP_DOMAIN_PREFIX_2='http://172.16.61.123:80/cdwlMall/api'
+VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/meserver/admin-server'
+VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
 # 开发环境
 # 演示环境
 # VUE_APP_DOMAIN_PREFIX = '/api'
diff --git a/wenjuan-pc/src/utils/request.js b/wenjuan-pc/src/utils/request.js
index 9caf459..efa79e2 100644
--- a/wenjuan-pc/src/utils/request.js
+++ b/wenjuan-pc/src/utils/request.js
@@ -53,7 +53,7 @@ service.interceptors.response.use(
     if (response.config.responseType === 'blob') {
       return response.data
     }
-    if (res.code !== '' && res.code !== 200) {
+    if (res.code !== '' && res.code !== 200&& res.code !== "200") {
       Message({
         message: res.message || 'Error',
         type: 'error',
diff --git a/wenjuan-pc/src/views/investigation/index.vue b/wenjuan-pc/src/views/investigation/index.vue
index 69fc760..6688ca7 100644
--- a/wenjuan-pc/src/views/investigation/index.vue
+++ b/wenjuan-pc/src/views/investigation/index.vue
@@ -3,8 +3,7 @@
     <div class="zhuti">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>问卷调查</span> <span style="padding:0 5px;">></span> <span
-          style="color:#000000e6"
-        >问卷管理</span></div>
+            style="color:#000000e6">问卷管理</span></div>
       </div>
       <!-- 线上 -->
       <div v-if="!tongjiBox">
@@ -35,33 +34,25 @@
           <div>
             <el-button :disabled="isbutton" style="background-color: #3F9B6A;color: #fff" @click="onSubmit">查询
             </el-button>
-            <el-button
-              class="buttonHover"
-              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-              @click="resetting"
-            >重置
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="resetting">重置
             </el-button>
           </div>
         </div>
         <div style="margin-bottom: 20px;">
           <div>
-            <el-button
-              style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
-              icon="el-icon-circle-plus-outline"
-              @click="addggXin"
-            >新增</el-button>
+            <el-button style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
+              icon="el-icon-circle-plus-outline" @click="addggXin">新增</el-button>
           </div>
         </div>
         <!-- 表格 -->
 
-        <el-table
-          :data="tableData.slice((currentPageList - 1) * pageSize, currentPageList * pageSize)"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          tooltip-effect="dark custom-tooltip-effect"
-        >
+        <el-table :data="tableData.slice((currentPageList - 1) * pageSize, currentPageList * pageSize)"
+          :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }"
+          tooltip-effect="dark custom-tooltip-effect">
           <el-table-column label="序号" min-width="80">
             <template slot-scope="scope">
-              {{ scope.$index +1 }}
+              {{ scope.$index + 1 }}
             </template>
           </el-table-column>
           <!-- <el-table-column label="问卷编号" min-width="150" prop="id">
@@ -74,43 +65,31 @@
           <el-table-column prop="createTime" label="创建时间" min-width="180" />
           <el-table-column prop="reviewStatus" label="状态" min-width="120">
             <template slot-scope="scope">
-              {{ scope.row.reviewStatus == '1'?'待提交':scope.row.reviewStatus == '2'?'待审核':scope.row.reviewStatus == '3'?'已通过':scope.row.reviewStatus == '4'?'不通过':'已禁用' }}
+              {{ scope.row.reviewStatus == '1' ? '待提交' : scope.row.reviewStatus == '2' ? '待审核' : scope.row.reviewStatus
+                ==
+                '3' ? '已通过' : scope.row.reviewStatus == '4' ?'不通过':'已禁用' }}
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="280">
             <template slot-scope="scope">
-              <div class="tableBtn greens" @click="details(0,scope.row)">查看</div>
-              <div v-if="scope.row.reviewStatus =='1'" class="tableBtn greens" @click="bianls(scope.row)">编辑</div>
-              <div v-if="scope.row.reviewStatus =='1'" class="tableBtn greens" @click="fabu('2',scope.row)">提交审核</div>
-              <div v-if="scope.row.reviewStatus =='3'" class="tableBtn greens" @click="downs(scope.row)">禁用</div>
-              <div
-                v-if="scope.row.reviewStatus =='3' || scope.row.reviewStatus =='5'"
-                class="tableBtn greens"
-                @click="tongji(scope.row)"
-              >统计</div>
-              <div v-if="scope.row.reviewStatus =='1'" class="tableBtn greens" @click="delwen(scope.row)">删除</div>
-              <div
-                v-if="scope.row.reviewStatus =='3' || scope.row.reviewStatus =='1'"
-                class="tableBtn greens"
-                @click="yulan(scope.row)"
-              >预览</div>
+              <div class="tableBtn greens" @click="details(0, scope.row)">查看</div>
+              <div v-if="scope.row.reviewStatus == '1'" class="tableBtn greens" @click="bianls(scope.row)">编辑</div>
+              <div v-if="scope.row.reviewStatus == '1'" class="tableBtn greens" @click="fabu('2', scope.row)">提交审核</div>
+              <div v-if="scope.row.reviewStatus == '3'" class="tableBtn greens" @click="downs(scope.row)">禁用</div>
+              <div v-if="scope.row.reviewStatus == '3' || scope.row.reviewStatus == '5'" class="tableBtn greens"
+                @click="tongji(scope.row)">统计</div>
+              <div v-if="scope.row.reviewStatus == '1'" class="tableBtn greens" @click="delwen(scope.row)">删除</div>
+              <div v-if="scope.row.reviewStatus == '3' || scope.row.reviewStatus == '1'" class="tableBtn greens"
+                @click="yulan(scope.row)">预览</div>
               <!-- <div @click="addbuss(3,scope.row)" class="tableBtn greens">终止</div> -->
             </template>
           </el-table-column>
         </el-table>
         <div style="display: flex;justify-content: space-between;margin-top: 10px;">
           <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{ total }}</span> 条</div>
-          <el-pagination
-            :current-page="currentPageList"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="pageSize"
-            background
-            small
-            layout="prev, pager, next"
-            :total="total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination :current-page="currentPageList" :page-sizes="[10, 20, 50, 100]" :page-size="pageSize"
+            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
         </div>
         <!--       <div class="fenye">
           <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPageList"
@@ -122,53 +101,34 @@
       <div v-if="tongjiBox">
         <div>
           <div style="display: flex;">
-            <img
-              :src="this.$hostUrl + secondData.coverImage"
-              alt=""
-              style="width:150px;height:100px;margin-right: 15px;border-radius:10px;"
-            >
+            <img :src="this.$hostUrl + secondData.coverImage" alt=""
+              style="width:150px;height:100px;margin-right: 15px;border-radius:10px;">
             <div>
-              <div style="font-weight: 600;overflow: hidden; text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;word-break: break-all;">{{ secondData.title }}</div>
+              <div
+                style="font-weight: 600;overflow: hidden; text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;word-break: break-all;">
+                {{ secondData.title }}</div>
               <div style="padding:20px 0;">答卷数量：{{ total1 || 0 }}</div>
               <div>起止时间：{{ secondData.startDate }} 至 {{ secondData.endDate }}</div>
             </div>
           </div>
           <div>
-            <el-tabs
-              v-model="tongjiTabs"
-              @tab-click="tongjiClick"
-            >
+            <el-tabs v-model="tongjiTabs" @tab-click="tongjiClick">
               <el-tab-pane label="作答情况" name="qingK">
                 <div v-loading="loading" style="width: 100%">
                   <div style="display: flex;align-items: center;margin-bottom: 20px;">
-                    <el-date-picker
-                      v-model="tongjiMsg.plan_Time"
-                      style="width: 30%;margin-right: 20px;"
-                      value-format="yyyy-MM-dd"
-                      type="daterange"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                      align="right"
-                    />
-                    <el-input
-                      v-model="tongjiMsg.userName"
-                      style="width:30%;margin-right: 20px;"
-                      placeholder="搜索提交人"
-                    />
+                    <el-date-picker v-model="tongjiMsg.plan_Time" style="width: 30%;margin-right: 20px;"
+                      value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期"
+                      end-placeholder="结束日期" align="right" />
+                    <el-input v-model="tongjiMsg.userName" style="width:30%;margin-right: 20px;" placeholder="搜索提交人" />
                     <el-button style="background-color: #3F9B6A;color: #fff" @click="tongjiSubmit">查询
                     </el-button>
-                    <el-button
-                      class="buttonHover"
+                    <el-button class="buttonHover"
                       style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                      @click="tongjiSubmitret"
-                    >重置
+                      @click="tongjiSubmitret">重置
                     </el-button>
                   </div>
-                  <el-table
-                    :data="tongjiSshu.slice((currentPage1 - 1) * pageSize, currentPage1 * pageSize)"
-                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                  >
+                  <el-table :data="tongjiSshu.slice((currentPage1 - 1) * pageSize, currentPage1 * pageSize)"
+                    :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }">
                     <el-table-column label="序号" min-width="100">
                       <template slot-scope="scope">
                         {{ scope.$index + 1 }}
@@ -190,29 +150,18 @@
 
                   </el-table>
                   <div class="fenye">
-                    <el-pagination
-                      :hide-on-single-page="flag1"
-                      background
-                      small
-                      size="mini"
-                      :current-page="currentPage1"
-                      :page-sizes="[10, 20, 50, 100]"
-                      layout="prev, pager, next,total"
-                      :total="total1"
-                      @current-change="handleCurrentChange1"
-                    />
+                    <el-pagination :hide-on-single-page="flag1" background small size="mini"
+                      :current-page="currentPage1" :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total"
+                      :total="total1" @current-change="handleCurrentChange1" />
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane
-                label="数据统计"
-                name="shuju"
-              >
+              <el-tab-pane label="数据统计" name="shuju">
                 <div v-loading="shujuloading" style="padding:20px;">
-                  <div style="margin-bottom: 20px;font-size: 18px;">数据概况 <span>截止{{ tongjiTu.statisticalTime }}</span></div>
+                  <div style="margin-bottom: 20px;font-size: 18px;">数据概况 <span>截止{{ tongjiTu.statisticalTime }}</span>
+                  </div>
                   <div
-                    style="display: flex;padding:20px 30px;width: 100%;justify-content: space-around;border: 1px solid #dddfe5;"
-                  >
+                    style="display: flex;padding:20px 30px;width: 100%;justify-content: space-around;border: 1px solid #dddfe5;">
                     <div style="text-align: center;">
                       <div style="margin-bottom:10px;">今日新增</div>
                       <div style="font-size:16px;">{{ tongjiTu.todayNumber || 0 }}</div>
@@ -229,16 +178,8 @@
                   </div>
                   <div style="margin: 20px 0;font-size: 18px;">题目统计</div>
                   <!-- {{tuwent}} -->
-                  <dynamic-chart-table
-                    v-for="(item,index) in tuwent"
-                    v-show="item.type !='文本'"
-                    :ref="'chat'+index"
-                    :key="index"
-                    :title="item.title"
-                    :table-data="tongjiTu"
-                    :tixingtype="item.type"
-                    :index="index"
-                  />
+                  <dynamic-chart-table v-for="(item, index) in tuwent" v-show="item.type != '文本'" :ref="'chat' + index"
+                    :key="index" :title="item.title" :table-data="tongjiTu" :tixingtype="item.type" :index="index" />
 
                   <!-- <tiaoxing :title="item.tikuTitle" :tableData="tongjiTu.cereQuestionManagements" v-if="item.questionType=='多选'" v-for="(item,index) in tongjiTu.cereQuestionManagements"> -->
 
@@ -250,23 +191,13 @@
           </div>
 
           <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-            <el-button
-              class="buttonHover"
-              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-              @click="tongjiBoxFan"
-            >返回</el-button>
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="tongjiBoxFan">返回</el-button>
 
           </div>
         </div>
-        <el-dialog
-          :visible.sync="daxiangBox"
-          custom-class="tongyong_css"
-          style="padding: 0;"
-          width="60%"
-          center
-          :close-on-click-modal="false"
-          append-to-body
-        >
+        <el-dialog :visible.sync="daxiangBox" custom-class="tongyong_css" style="padding: 0;" width="60%" center
+          :close-on-click-modal="false" append-to-body>
           <div style="padding:20px;">
             <div style="font-size: 14px;padding-bottom: 20px;color: #000;">答卷详情</div>
             <div style="display:flex;border-top: 1px solid #dddfe5;">
@@ -276,16 +207,16 @@
                   <div style="margin-bottom:15px;">提交人：<span style="color:#000">{{ daxiangData.userName }}</span></div>
                   <div style="margin-bottom:15px;">手机号：<span style="color:#000">{{ daxiangData.contactNumber }}</span>
                   </div>
-                  <div style="margin-bottom:15px;">作答时长：<span
-                    style="color:#000"
-                  >{{ secondsToMinutesAndSeconds(daxiangData.responseTime) }}</span> </div>
+                  <div style="margin-bottom:15px;">作答时长：<span style="color:#000">{{
+                    secondsToMinutesAndSeconds(daxiangData.responseTime) }}</span> </div>
                   <div style="margin-bottom:15px;">提交时间：<span style="color:#000">{{ daxiangData.createTime }}</span>
                   </div>
-                  <div style="margin-bottom:15px;">填写条件：<span style="color:#000">{{ secondData.fillingConditions }}</span>
+                  <div style="margin-bottom:15px;">填写条件：<span style="color:#000">{{ secondData.fillingConditions
+                      }}</span>
+                  </div>
+                  <div style="margin-bottom:15px;">问卷分数：<span style="color:#000">{{ daxiangData.questionnaireScore
+                      }}</span>
                   </div>
-                  <div style="margin-bottom:15px;">问卷分数：<span
-                    style="color:#000"
-                  >{{ daxiangData.questionnaireScore }}</span> </div>
                   <div>用户意见：<span style="color:#000" />{{ daxiangData.opinion }} </div>
                 </div>
               </div>
@@ -293,38 +224,26 @@
                 <div style="margin-bottom:20px;">答卷详情</div>
                 <div>
 
-                  <div v-for="(item,index) in daxiangData.question" class="question">
-                    <p class="question-title"><span
-                                                v-if="item.required=='必填'"
-                                                style="color: red;"
-                                              >*</span>{{ index }}.<span style="">({{ item.type }})</span>
+                  <div v-for="(item, index) in daxiangData.question" class="question">
+                    <p class="question-title"><span v-if="item.required == '必填'" style="color: red;">*</span>{{ index
+                      }}.<span style="">({{ item.type }})</span>
                       {{ item.title }}
                     </p>
                     <div>
-                      <el-radio-group
-                        v-for="(val, idx) in item.options"
-                        v-if="item.type =='单选'"
-                        :key="idx"
-                        v-model="item.choose"
-                        style="display: flex;flex-direction: column;"
-                      >
+                      <el-radio-group v-for="(val, idx) in item.options" v-if="item.type == '单选'" :key="idx"
+                        v-model="item.choose" style="display: flex;flex-direction: column;">
                         <el-radio disabled :label="val.answer">{{ val.answer }}</el-radio>
 
                       </el-radio-group>
 
-                      <el-checkbox-group
-                        v-for="(val, idx) in item.options"
-                        v-if="item.type =='多选'"
-                        :key="idx"
-                        v-model="val.disabled"
-                        style="display: flex;flex-direction: column;"
-                      >
+                      <el-checkbox-group v-for="(val, idx) in item.options" v-if="item.type == '多选'" :key="idx"
+                        v-model="val.disabled" style="display: flex;flex-direction: column;">
 
                         <el-checkbox :label="val.answer" disabled>{{ val.answer }}</el-checkbox>
 
                       </el-checkbox-group>
 
-                      <div v-if="item.type =='文本'" style="display: flex;flex-direction: column;">
+                      <div v-if="item.type == '文本'" style="display: flex;flex-direction: column;">
                         {{ item.choose }}
 
                       </div>
@@ -339,20 +258,14 @@
       </div>
     </div>
     <!-- 详情框 -->
-    <el-dialog
-      :visible.sync="detbox"
-      custom-class="tongyong_css"
-      style="padding: 0;"
-      width="65%"
-      center
-      :close-on-click-modal="false"
-      :show-close="false"
-    >
+    <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0;" width="65%" center
+      :close-on-click-modal="false" :show-close="false">
       <div style="padding:20px;">
         <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
         <div>
           <div style="padding: 10px 0  20px 0;">基本信息</div>
-          <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle" :content-style="contentStyle">
+          <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle"
+            :content-style="contentStyle">
             <el-descriptions-item :span="2">
               <template slot="label">
                 问卷标题
@@ -363,7 +276,10 @@
               <template slot="label">
                 状态
               </template>
-              {{ secondData.reviewStatus == '1'?'待提交':secondData.reviewStatus == '2'?'待审核':secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'已禁用' }}
+              {{ secondData.reviewStatus == '1' ? '待提交' : secondData.reviewStatus == '2' ? '待审核' :
+                secondData.reviewStatus
+                  ==
+                  '3' ? '审核通过' : secondData.reviewStatus == '4' ?'不通过':'已禁用' }}
             </el-descriptions-item>
 
             <el-descriptions-item>
@@ -414,22 +330,12 @@
           <div v-html="secondData.remarks" />
           <div style="padding: 20px 0;">问卷封面</div>
           <div>
-            <el-image
-              style="width: 280px; height: 200px"
-              :src="this.$hostUrl + secondData.coverImage"
-              fit="fill"
-            />
+            <el-image style="width: 280px; height: 200px" :src="this.$hostUrl + secondData.coverImage" fit="fill" />
             <!-- <img :src="secondData.coverImage" alt="" style="width:25%" /> -->
           </div>
-          <div v-if="secondData.filler=='会员'" style="padding: 20px 0 ;">参与答卷奖励</div>
-          <el-descriptions
-            v-if="secondData.filler=='会员'"
-            class="margin-top"
-            :column="3"
-            border
-            :label-style="labelStyle"
-            :content-style="contentStyle"
-          >
+          <div v-if="secondData.filler == '会员'" style="padding: 20px 0 ;">参与答卷奖励</div>
+          <el-descriptions v-if="secondData.filler == '会员'" class="margin-top" :column="3" border
+            :label-style="labelStyle" :content-style="contentStyle">
             <el-descriptions-item>
               <template slot="label">
                 提交问卷后
@@ -444,13 +350,11 @@
             </el-descriptions-item>
           </el-descriptions>
           <div style="padding: 20px 0 ;">问卷题目</div>
-          <el-table
-            :data="wenData"
-            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          >
+          <el-table :data="wenData"
+            :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }">
             <el-table-column label="序号" min-width="100">
               <template slot-scope="scope">
-                {{ scope.$index +1 }}
+                {{ scope.$index + 1 }}
               </template>
             </el-table-column>
             <el-table-column label="题目" min-width="300" prop="title" :show-overflow-tooltip="true" />
@@ -458,8 +362,8 @@
             <el-table-column label="是否必填" prop="required" min-width="80" />
             <el-table-column label="选项" min-width="120">
               <template slot-scope="scope">
-                <div v-for="(value, index) in scope.row.options " v-if="scope.row.type !='文本'" :key="index">
-                  {{ index +1 }}：{{ value.answer }}
+                <div v-for="(value, index) in scope.row.options " v-if="scope.row.type != '文本'" :key="index">
+                  {{ index + 1 }}：{{ value.answer }}
                 </div>
                 <div v-else>
                   -
@@ -470,7 +374,8 @@
 
           </el-table>
           <div style="padding: 20px 0 ;">系统信息</div>
-          <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle" :content-style="contentStyle">
+          <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle"
+            :content-style="contentStyle">
             <el-descriptions-item>
               <template slot="label">
                 创建人
@@ -491,12 +396,16 @@
             </el-descriptions-item>
           </el-descriptions>
           <div style="padding: 20px 0 ;">审核信息</div>
-          <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle" :content-style="contentStyle">
+          <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle"
+            :content-style="contentStyle">
             <el-descriptions-item>
               <template slot="label">
                 审核状态
               </template>
-              {{ secondData.reviewStatus == '1'?'待提交':secondData.reviewStatus == '2'?'待审核':secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'已禁用' }}
+              {{ secondData.reviewStatus == '1' ? '待提交' : secondData.reviewStatus == '2' ? '待审核' :
+                secondData.reviewStatus
+                  ==
+                  '3' ? '审核通过' : secondData.reviewStatus == '4' ?'不通过':'已禁用' }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -509,31 +418,18 @@
         </div>
 
         <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-          <el-button
-            class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-            @click="detbox = false "
-          >返回</el-button>
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="detbox = false">返回</el-button>
         </div>
       </div>
 
     </el-dialog>
 
     <!-- 新增 -->
-    <el-dialog
-      :visible.sync="ggXin"
-      custom-class="tongyong_css"
-      style="padding: 0;"
-      width="60%"
-      class="dialog_css_Xq"
-      center
-      :close-on-click-modal="false"
-      :show-close="false"
-    >
-      <div
-        style="padding:20px;max-height: calc(100vh - 200px);
-  overflow-y: auto;"
-      >
+    <el-dialog :visible.sync="ggXin" custom-class="tongyong_css" style="padding: 0;" width="60%" class="dialog_css_Xq"
+      center :close-on-click-modal="false" :show-close="false">
+      <div style="padding:20px;max-height: calc(100vh - 200px);
+  overflow-y: auto;">
         <div style="font-size: 14px;padding-bottom: 20px;color: #000;">新建问卷</div>
         <div>
           <el-tabs v-model="xiangTabs">
@@ -541,32 +437,18 @@
               <div style="width: 100%">
                 <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
                   <div
-                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;"
-                  >
+                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;">
                     <div>基本信息</div>
                   </div>
 
-                  <el-form
-                    ref="inlineform"
-                    :model="formInline"
-                    :rules="rules"
-                    label-width="155px"
-                    style="padding:20px;"
-                  >
+                  <el-form ref="inlineform" :model="formInline" :rules="rules" label-width="155px"
+                    style="padding:20px;">
                     <el-form-item label="问卷标题" prop="title">
                       <el-input v-model="formInline.title" maxlength="50" />
                     </el-form-item>
                     <el-form-item label="问卷起止时间" prop="">
-                      <el-date-picker
-                        v-model="Xin_Time"
-                        style="width: 100%;"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        align="right"
-                      >
+                      <el-date-picker v-model="Xin_Time" style="width: 100%;" value-format="yyyy-MM-dd" type="daterange"
+                        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
                         :picker-options="pickerOptions">
                       </el-date-picker>
                     </el-form-item>
@@ -613,7 +495,8 @@
 
                       <div style="position: relative;">
 
-                        <upimg :limit="1" :file-size="1" :is-show-tip="true" :value="formInline.coverImage" @input="e=>input(e,'1')" />
+                        <upimg :limit="1" :file-size="1" :is-show-tip="true" :value="formInline.coverImage"
+                          @input="e => input(e, '1')" />
                         <!-- <div style="position: absolute;left:160px;height:80px;">()</div> -->
                         <!-- @input="e=>input(e,'ing')" @input="input" -->
                       </div>
@@ -645,11 +528,10 @@
                     </el-form-item>
                   </el-form>
                 </div>
-                <div v-if="formInline.filler=='会员'">
+                <div v-if="formInline.filler == '会员'">
                   <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
                     <div
-                      style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;"
-                    >
+                      style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;">
                       <div>参与答卷奖励</div>
                     </div>
                     <el-form ref="form" :model="formInline" label-width="140px" style="padding:20px;">
@@ -685,8 +567,7 @@
               <div style="width: 100%">
                 <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
                   <div
-                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;"
-                  >
+                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;">
                     <div>问卷内容</div>
                     <div>
                       <div class="greens tableBtn" @click="addTikuShow">新增</div>
@@ -696,11 +577,9 @@
                   </div>
 
                   <div style="padding:20px;">
-                    <el-table
-                      :data="wenConstData"
-                      :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                      class="xddTable"
-                    >
+                    <el-table :data="wenConstData"
+                      :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }"
+                      class="xddTable">
                       <el-table-column label="序号" min-width="100">
                         <template slot-scope="scope">
                           {{ scope.$index + 1 }}
@@ -709,16 +588,18 @@
                       <el-table-column label="题目" min-width="300" prop="tikuTitle" show-overflow-tooltip />
                       <el-table-column label="题型" min-width="80" prop="questionType" />
                       <el-table-column label="是否必填" prop="isRequired" min-width="120" />
-                      <el-table-column label=""  min-width="120" >
+                      <el-table-column label="" min-width="120">
                         <template #default="scope">
-                          <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="moveUp(scope.$index)" v-if="scope.$index!=0">↑</span>
-                          <span style="cursor: pointer; color: #3F9B6A;" @click="moveDown(scope.$index)" v-if="scope.$index != (wenConstData.length-1)">↓</span>
+                          <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="moveUp(scope.$index)"
+                            v-if="scope.$index != 0">↑</span>
+                          <span style="cursor: pointer; color: #3F9B6A;" @click="moveDown(scope.$index)"
+                            v-if="scope.$index != (wenConstData.length - 1)">↓</span>
                         </template>
                       </el-table-column>
                       <el-table-column label="操作" min-width="80">
                         <template slot-scope="scope">
                           <!-- <div class="tableBtn greens">编辑</div> -->
-                          <div class="tableBtn greens" @click="delWenCon('1',scope.$index)">删除</div>
+                          <div class="tableBtn greens" @click="delWenCon('1', scope.$index)">删除</div>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -737,16 +618,8 @@
 
             </span> -->
       </div>
-      <el-dialog
-        :visible.sync="tikuBox"
-        custom-class="tongyong_css"
-        style="padding: 0;"
-        width="60%"
-        center
-        :close-on-click-modal="false"
-        append-to-body
-        @close="tikuquxiao(1)"
-      >
+      <el-dialog :visible.sync="tikuBox" custom-class="tongyong_css" style="padding: 0;" width="60%" center
+        :close-on-click-modal="false" append-to-body @close="tikuquxiao(1)">
         <div style="padding:20px;">
           <div style="padding:20px;">
             <div style="display: flex;justify-content: space-between;margin-bottom: 20px;">
@@ -771,30 +644,23 @@
                 <el-input v-model="timuMsg" style="width:50%;margin-right: 15px;" placeholder="请输入题目" />
                 <el-button style="background-color: #3F9B6A;color: #fff" placeholder="请输入题目" @click="tikusous">查询
                 </el-button>
-                <el-button
-                  class="buttonHover"
-                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                  @click="tikuclose"
-                >重置
+                <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                  @click="tikuclose">重置
                 </el-button>
               </div>
             </div>
             <!-- v-infinite-scroll="load" -->
             <div style="padding:20px;overflow-y: auto;height:495px;">
 
-              <el-table
-                ref="ziyuanData"
+              <el-table ref="ziyuanData"
                 :data="tikuziyuan.slice((currentPageListTi - 1) * pageSizeTi, currentPageListTi * pageSizeTi)"
-                :row-key="row=>row.id"
-                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                tooltip-effect="dark"
-                @selection-change="handleSelectionChange"
-                @toggleRowSelection="hangSelchange"
-              >
+                :row-key="row => row.id"
+                :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }"
+                tooltip-effect="dark" @selection-change="handleSelectionChange" @toggleRowSelection="hangSelchange">
                 <el-table-column type="selection" width="55" :reserve-selection="true" />
                 <el-table-column label="序号" min-width="100">
                   <template slot-scope="scope">
-                    {{ scope.$index +1 }}
+                    {{ scope.$index + 1 }}
                   </template>
                 </el-table-column>
                 <el-table-column label="题目" min-width="400" prop="tikuTitle" />
@@ -808,17 +674,9 @@
               </el-table>
               <div style="display: flex;justify-content: space-between;margin-top: 10px;">
                 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{ totalTi }}</span> 条</div>
-                <el-pagination
-                  :current-page="currentPageListTi"
-                  :page-sizes="[10, 20, 50, 100]"
-                  :page-size="pageSizeTi"
-                  background
-                  small
-                  layout="prev, pager, next"
-                  :total="totalTi"
-                  @size-change="handleSizeChangeTi"
-                  @current-change="handleCurrentChangeTi"
-                />
+                <el-pagination :current-page="currentPageListTi" :page-sizes="[10, 20, 50, 100]" :page-size="pageSizeTi"
+                  background small layout="prev, pager, next" :total="totalTi" @size-change="handleSizeChangeTi"
+                  @current-change="handleCurrentChangeTi" />
               </div>
             </div>
           </div>
@@ -826,25 +684,13 @@
             <el-button style="background-color: #3F9B6A;color: #fff" @click="tiSelQue(1)">确定</el-button>
           </div>
         </div>
-        <el-dialog
-          :visible.sync="timuXiang"
-          custom-class="tongyong_css"
-          style="padding: 0;"
-          width="50%"
-          center
-          :close-on-click-modal="false"
-          append-to-body
-        >
+        <el-dialog :visible.sync="timuXiang" custom-class="tongyong_css" style="padding: 0;" width="50%" center
+          :close-on-click-modal="false" append-to-body>
           <div style="padding:20px;">
             <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
             <div>
-              <el-descriptions
-                class="margin-top"
-                :column="1"
-                border
-                :label-style="labelStyle"
-                :content-style="contentStyle"
-              >
+              <el-descriptions class="margin-top" :column="1" border :label-style="labelStyle"
+                :content-style="contentStyle">
                 <el-descriptions-item>
                   <template slot="label">
                     题目
@@ -864,13 +710,8 @@
                   {{ timuData.questionBank }}
                 </el-descriptions-item>
               </el-descriptions>
-              <el-descriptions
-                class="margin-top"
-                :column="1"
-                border
-                :label-style="labelStyle"
-                :content-style="contentStyle"
-              >
+              <el-descriptions class="margin-top" :column="1" border :label-style="labelStyle"
+                :content-style="contentStyle">
                 <el-descriptions-item>
                   <template slot="label">
                     默认是否必填
@@ -889,26 +730,15 @@
               </el-descriptions>
             </div>
             <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-              <el-button
-                class="buttonHover"
-                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                @click="timuXiang = false"
-              >返回</el-button>
+              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                @click="timuXiang = false">返回</el-button>
             </div>
           </div>
 
         </el-dialog>
       </el-dialog>
-      <el-dialog
-        :visible.sync="tikuAdd"
-        custom-class="tongyong_css"
-        style="padding: 0;"
-        width="60%"
-        center
-        :close-on-click-modal="false"
-        append-to-body
-        @close="quxiao(1)"
-      >
+      <el-dialog :visible.sync="tikuAdd" custom-class="tongyong_css" style="padding: 0;" width="60%" center
+        :close-on-click-modal="false" append-to-body @close="quxiao(1)">
         <div style="padding:20px;">
           <div style="font-size: 14px;padding-bottom: 20px;color: #000;">
             新增题目
@@ -925,6 +755,10 @@
                   <el-option label="文本" value="文本" />
                 </el-select>
               </el-form-item>
+
+              <el-form-item v-if="zhong.questionType == '多选'" label="最多可选" prop="maxChoose">
+                <el-input-number v-model="zhong.maxChoose" :min="0" :max="options.length" /> 0为不限制填写数量
+              </el-form-item>
               <el-form-item label="隶属题库" prop="questionBank">
                 <el-select v-model="zhong.questionBank" placeholder="请选择">
                   <el-option label="用户端题库" value="用户端题库" />
@@ -950,11 +784,9 @@
                 </el-radio-group>
               </el-form-item>
 
-              <el-form-item v-if="zhong.questionType !='文本'" label="选项" prop="optionSettings">
-                <el-table
-                  :data="options"
-                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                >
+              <el-form-item v-if="zhong.questionType != '文本'" label="选项" prop="optionSettings">
+                <el-table :data="options"
+                  :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }">
                   <el-table-column prop="index" label="序号" width="180">
                     <template #default="scope">
                       {{ scope.$index + 1 }}
@@ -967,21 +799,18 @@
                   </el-table-column>
                   <el-table-column prop="name" label="分数">
                     <template #default="scope">
-                      <el-input
-                        v-model.number="scope.row.num"
-                        :min="0"
-                        :max="100"
-                        :readonly="scope.row.readonly"
-                        @input="validateScore(scope.row)"
-                      />
+                      <el-input v-model.number="scope.row.num" :min="0" :max="100" :readonly="scope.row.readonly"
+                        @input="validateScore(scope.row)" />
                     </template>
                   </el-table-column>
-				   <el-table-column label=""  min-width="120" >
-				                      <template #default="{$index}">
-				                        <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="answerMoveUp($index)" v-if="$index!=0">↑</span>
-				                        <span style="cursor: pointer; color: #3F9B6A;" @click="answerMoveDown($index)" v-if="$index != (options.length-1)">↓</span>
-				                      </template>
-				                    </el-table-column>
+                   <el-table-column label=""  min-width="120">
+                                        <template #default="{ $index }">
+                                            <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;"
+                        @click="answerMoveUp($index)" v-if="$index != 0">↑</span>
+                                            <span style="cursor: pointer; color: #3F9B6A;"
+                        @click="answerMoveDown($index)" v-if="$index != (options.length - 1)">↓</span>
+                                          </template>
+                                      </el-table-column>
                   <el-table-column label="操作">
                     <template #default="scope">
                       <div class="tableBtn greens" @click="deleteOption(scope.$index)">删除</div>
@@ -1000,30 +829,18 @@
       </el-dialog>
       <template #footer>
         <div style="display: flex; justify-content: flex-end; align-items: center;">
-          <el-button
-            class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-            @click="closeFn(1)"
-          >返回</el-button>
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="closeFn(1)">返回</el-button>
           <el-button style="background-color: #3F9B6A;color: #fff" @click="addCheck(2)">确认</el-button>
 
         </div>
       </template>
     </el-dialog>
     <!-- 编辑 -->
-    <el-dialog
-      :visible.sync="bainjiBox"
-      custom-class="tongyong_css"
-      style="padding: 0;"
-      width="60%"
-      center
-      :close-on-click-modal="false"
-      :show-close="false"
-    >
-      <div
-        style="padding:20px;max-height: calc(100vh - 300px);
-  overflow-y: auto;"
-      >
+    <el-dialog :visible.sync="bainjiBox" custom-class="tongyong_css" style="padding: 0;" width="60%" center
+      :close-on-click-modal="false" :show-close="false">
+      <div style="padding:20px;max-height: calc(100vh - 300px);
+  overflow-y: auto;">
         <div style="font-size: 14px;padding-bottom: 20px;color: #000;">编辑问卷</div>
         <div>
           <el-tabs v-model="bianjiTabs" @tab-click="">
@@ -1031,8 +848,7 @@
               <div style="width: 100%">
                 <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
                   <div
-                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;"
-                  >
+                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;">
                     <div>基本信息</div>
                   </div>
                   <el-form ref="bianform" :model="secondData" :rules="rules" label-width="155px" style="padding:20px;">
@@ -1040,17 +856,9 @@
                       <el-input v-model="secondData.title" maxlength="50" />
                     </el-form-item>
                     <el-form-item label="问卷起止时间">
-                      <el-date-picker
-                        v-model="plan_Time"
-                        style="width: 100%;"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                        align="right"
-                        :picker-options="pickerOptions"
-                      />
+                      <el-date-picker v-model="plan_Time" style="width: 100%;" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                        align="right" :picker-options="pickerOptions" />
                     </el-form-item>
                     <el-form-item label="发布端口" prop="publishPort">
                       <el-select v-model="secondData.publishPort" placeholder="请选择">
@@ -1090,7 +898,8 @@
                     </el-form-item>
 
                     <el-form-item label="问卷封面" prop="coverImage">
-                      <upimg :value="secondData.coverImage" :limit="1" :file-size="1" :is-show-tip="false" @input="e=>input(e,'2')" />
+                      <upimg :value="secondData.coverImage" :limit="1" :file-size="1" :is-show-tip="false"
+                        @input="e => input(e, '2')" />
                     </el-form-item>
                     <el-form-item label="姓名" prop="needName">
                       <el-radio-group v-model="secondData.needName" style="margin-top:13px;">
@@ -1119,10 +928,10 @@
                     </el-form-item>
                   </el-form>
                 </div>
-                <div v-if="secondData.filler=='会员'" style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
+                <div v-if="secondData.filler == '会员'"
+                  style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
                   <div
-                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;"
-                  >
+                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;">
                     <div>参与答卷奖励</div>
                   </div>
                   <el-form ref="form" :model="secondData" label-width="140px" style="padding:20px;">
@@ -1157,8 +966,7 @@
               <div style="width: 100%">
                 <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
                   <div
-                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;"
-                  >
+                    style="padding:10px 20px;border-bottom:1px solid #DCDFE6;display:flex;justify-content: space-between;">
                     <div>问卷内容</div>
                     <div>
                       <div class="greens tableBtn" @click="tikuAdd = true">新增</div>
@@ -1168,11 +976,9 @@
                   </div>
 
                   <div style="padding:20px;">
-                    <el-table
-                      :data="secondDataTi"
-                      :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                      class="xddTable"
-                    >
+                    <el-table :data="secondDataTi"
+                      :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }"
+                      class="xddTable">
                       <el-table-column label="序号" min-width="100">
                         <template slot-scope="scope">
                           {{ scope.$index + 1 }}
@@ -1181,15 +987,17 @@
                       <el-table-column label="题目" min-width="150" prop="tikuTitle" show-overflow-tooltip />
                       <el-table-column label="题型" min-width="80" prop="questionType" />
                       <el-table-column label="是否必填" prop="isRequired" min-width="120" />
-                      <el-table-column label=""  min-width="120" >
+                      <el-table-column label="" min-width="120">
                         <template #default="scope">
-                          <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="moveUp2(scope.$index)" v-if="scope.$index!=0">↑</span>
-                          <span style="cursor: pointer; color: #3F9B6A;" @click="moveDown2(scope.$index)" v-if="scope.$index != (secondDataTi.length-1)">↓</span>
+                          <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;"
+                            @click="moveUp2(scope.$index)" v-if="scope.$index != 0">↑</span>
+                          <span style="cursor: pointer; color: #3F9B6A;" @click="moveDown2(scope.$index)"
+                            v-if="scope.$index != (secondDataTi.length - 1)">↓</span>
                         </template>
                       </el-table-column>
                       <el-table-column label="操作" min-width="80">
                         <template slot-scope="scope">
-                          <div class="tableBtn greens" @click="delWenCon('2',scope.$index)">删除</div>
+                          <div class="tableBtn greens" @click="delWenCon('2', scope.$index)">删除</div>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -1202,16 +1010,8 @@
         </div>
 
       </div>
-      <el-dialog
-        :visible.sync="tikuBox"
-        custom-class="tongyong_css"
-        style="padding: 0;"
-        width="60%"
-        center
-        :close-on-click-modal="false"
-        append-to-body
-        @close="tikuquxiao(2)"
-      >
+      <el-dialog :visible.sync="tikuBox" custom-class="tongyong_css" style="padding: 0;" width="60%" center
+        :close-on-click-modal="false" append-to-body @close="tikuquxiao(2)">
         <div style="padding:20px;">
 
           <div style="padding:20px;">
@@ -1235,29 +1035,22 @@
                 <el-input v-model="timuMsg" style="width:50%;margin-right: 15px;" />
                 <el-button style="background-color: #3F9B6A;color: #fff" @click="tikusous">查询
                 </el-button>
-                <el-button
-                  class="buttonHover"
-                  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                  @click="tikuclose"
-                >重置
+                <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                  @click="tikuclose">重置
                 </el-button>
               </div>
             </div>
             <div style="padding:20px;overflow-y: auto;height:495px">
 
-              <el-table
-                ref="ziyuanData"
+              <el-table ref="ziyuanData"
                 :data="tikuziyuan.slice((currentPageListTi - 1) * pageSizeTi, currentPageListTi * pageSizeTi)"
-                :row-key="row=>row.id"
-                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                tooltip-effect="dark"
-                @selection-change="handleSelectionChange"
-                @toggleRowSelection="hangSelchange"
-              >
+                :row-key="row => row.id"
+                :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }"
+                tooltip-effect="dark" @selection-change="handleSelectionChange" @toggleRowSelection="hangSelchange">
                 <el-table-column type="selection" width="55" :reserve-selection="true" />
                 <el-table-column label="序号" min-width="100">
                   <template slot-scope="scope">
-                    {{ scope.$index +1 }}
+                    {{ scope.$index + 1 }}
                   </template>
                 </el-table-column>
                 <el-table-column label="题目" min-width="400" prop="tikuTitle" show-overflow-tooltip />
@@ -1270,17 +1063,9 @@
               </el-table>
               <div style="display: flex;justify-content: space-between;margin-top: 10px;">
                 <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{ totalTi }}</span> 条</div>
-                <el-pagination
-                  :current-page="currentPageListTi"
-                  :page-sizes="[10, 20, 50, 100]"
-                  :page-size="pageSizeTi"
-                  background
-                  small
-                  layout="prev, pager, next"
-                  :total="totalTi"
-                  @size-change="handleSizeChangeTi"
-                  @current-change="handleCurrentChangeTi"
-                />
+                <el-pagination :current-page="currentPageListTi" :page-sizes="[10, 20, 50, 100]" :page-size="pageSizeTi"
+                  background small layout="prev, pager, next" :total="totalTi" @size-change="handleSizeChangeTi"
+                  @current-change="handleCurrentChangeTi" />
               </div>
             </div>
 
@@ -1289,25 +1074,13 @@
             <el-button style="background-color: #3F9B6A;color: #fff" @click="tiSelQue(2)">确定</el-button>
           </div>
         </div>
-        <el-dialog
-          :visible.sync="timuXiang"
-          custom-class="tongyong_css"
-          style="padding: 0;"
-          width="50%"
-          center
-          :close-on-click-modal="false"
-          append-to-body
-        >
+        <el-dialog :visible.sync="timuXiang" custom-class="tongyong_css" style="padding: 0;" width="50%" center
+          :close-on-click-modal="false" append-to-body>
           <div style="padding:20px;">
             <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
             <div>
-              <el-descriptions
-                class="margin-top"
-                :column="1"
-                border
-                :label-style="labelStyle"
-                :content-style="contentStyle"
-              >
+              <el-descriptions class="margin-top" :column="1" border :label-style="labelStyle"
+                :content-style="contentStyle">
                 <el-descriptions-item>
                   <template slot="label">
                     题目
@@ -1327,13 +1100,8 @@
                   {{ timuData.questionBank }}
                 </el-descriptions-item>
               </el-descriptions>
-              <el-descriptions
-                class="margin-top"
-                :column="1"
-                border
-                :label-style="labelStyle"
-                :content-style="contentStyle"
-              >
+              <el-descriptions class="margin-top" :column="1" border :label-style="labelStyle"
+                :content-style="contentStyle">
                 <el-descriptions-item>
                   <template slot="label">
                     默认是否必填
@@ -1353,26 +1121,15 @@
               </el-descriptions>
             </div>
             <div style="padding-top:20px;display:flex;justify-content: flex-end;">
-              <el-button
-                class="buttonHover"
-                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                @click="timuXiang = false"
-              >返回</el-button>
+              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                @click="timuXiang = false">返回</el-button>
             </div>
           </div>
 
         </el-dialog>
       </el-dialog>
-      <el-dialog
-        :visible.sync="tikuAdd"
-        custom-class="tongyong_css"
-        style="padding: 0;"
-        width="60%"
-        center
-        :close-on-click-modal="false"
-        append-to-body
-        @close="quxiao(2)"
-      >
+      <el-dialog :visible.sync="tikuAdd" custom-class="tongyong_css" style="padding: 0;" width="60%" center
+        :close-on-click-modal="false" append-to-body @close="quxiao(2)">
         <div style="padding:20px;">
           <div style="font-size: 14px;padding-bottom: 20px;color: #000;">
             新增题目
@@ -1389,6 +1146,9 @@
                   <el-option label="文本" value="文本" />
                 </el-select>
               </el-form-item>
+              <el-form-item v-if="zhong.questionType == '多选'" label="最多可选" prop="maxChoose">
+                <el-input-number v-model="zhong.maxChoose" :min="0" :max="options.length" /> 0为不限制填写数量
+              </el-form-item>
               <el-form-item label="隶属题库">
                 <el-select v-model="zhong.questionBank" placeholder="请选择">
                   <el-option label="用户端题库" value="用户端题库" />
@@ -1408,11 +1168,9 @@
                   <el-radio label="非必填">非必填</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item v-if="zhong.questionType !='文本'" label="选项" prop="optionSettings">
-                <el-table
-                  :data="options"
-                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                >
+              <el-form-item v-if="zhong.questionType != '文本'" label="选项" prop="optionSettings">
+                <el-table :data="options"
+                  :header-cell-style="{ fontSize: '14px', color: '#0009', fontWeight: 'normal', backgroundColor: '#F2F3F5' }">
                   <el-table-column prop="index" label="序号" width="180">
                     <template #default="scope">
                       {{ scope.$index + 1 }}
@@ -1425,21 +1183,18 @@
                   </el-table-column>
                   <el-table-column prop="name" label="分数">
                     <template #default="scope">
-                      <el-input
-                        v-model.number="scope.row.num"
-                        :min="0"
-                        :max="100"
-                        :readonly="scope.row.readonly"
-                        @input="validateScore(scope.row)"
-                      />
+                      <el-input v-model.number="scope.row.num" :min="0" :max="100" :readonly="scope.row.readonly"
+                        @input="validateScore(scope.row)" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column label=""  min-width="120">
+                    <template #default="{ $index }">
+                      <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="answerMoveUp($index)"
+                        v-if="$index != 0">↑</span>
+                      <span style="cursor: pointer; color: #3F9B6A;" @click="answerMoveDown($index)"
+                        v-if="$index != (options.length - 1)">↓</span>
                     </template>
                   </el-table-column>
-				  <el-table-column label=""  min-width="120" >
-				                      <template #default="{$index}">
-				                        <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="answerMoveUp($index)" v-if="$index!=0">↑</span>
-				                        <span style="cursor: pointer; color: #3F9B6A;" @click="answerMoveDown($index)" v-if="$index != (options.length-1)">↓</span>
-				                      </template>
-				                    </el-table-column>
                   <el-table-column label="操作">
                     <template #default="scope">
                       <div class="tableBtn greens" @click="deleteOption(scope.$index)">删除</div>
@@ -1458,11 +1213,8 @@
       </el-dialog>
       <template #footer>
         <div style="display: flex; justify-content: flex-end; align-items: center;">
-          <el-button
-            class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-            @click="closeFn(2)"
-          >返回</el-button>
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="closeFn(2)">返回</el-button>
           <el-button style="background-color: #3F9B6A;color: #fff" @click="bianCheck">确认</el-button>
         </div>
       </template>
@@ -1470,19 +1222,13 @@
 
     <!-- 禁用 -->
 
-    <el-dialog
-      :visible.sync="downShow"
-      custom-class="tongyong_css"
-      style="padding: 0;"
-      width="50%"
-      center
-      :close-on-click-modal="false"
-      append-to-body
-    >
+    <el-dialog :visible.sync="downShow" custom-class="tongyong_css" style="padding: 0;" width="50%" center
+      :close-on-click-modal="false" append-to-body>
       <div style="padding:20px;">
         <div style="font-size: 14px;padding-bottom: 20px;color: #000;">禁用</div>
         <div style="padding:30px 0px  0px">
-          <el-form ref="opinionForm" :model="opinionDel" :rules="pinForm" label-width="120px" style="position: relative">
+          <el-form ref="opinionForm" :model="opinionDel" :rules="pinForm" label-width="120px"
+            style="position: relative">
             <el-form-item label="禁用原因" class="grid-content bg-purple" prop="name">
               <el-input v-model="opinionDel.opinionDelisting" type="textarea" placeholder="请输入禁用原因" />
             </el-form-item>
@@ -1490,20 +1236,13 @@
           </el-form>
         </div>
         <div style="display:flex;justify-content: flex-end;padding:20px;">
-          <el-button style="background-color: #3F9B6A;color: #fff;" @click="downShow=false">取消</el-button>
+          <el-button style="background-color: #3F9B6A;color: #fff;" @click="downShow = false">取消</el-button>
           <el-button style="background-color: #3F9B6A;color: #fff;" @click="downShowCheck">确定</el-button>
         </div>
       </div>
     </el-dialog>
-    <el-dialog
-      :visible.sync="yulanShow"
-      custom-class="tongyong_css"
-      style="padding: 0;"
-      width="43%"
-      center
-      :close-on-click-modal="false"
-      append-to-body
-    >
+    <el-dialog :visible.sync="yulanShow" custom-class="tongyong_css" style="padding: 0;" width="43%" center
+      :close-on-click-modal="false" append-to-body>
       <div style="padding:20px;">
         <div style="font-size: 14px;padding-bottom: 20px;color: #000;">预览</div>
         <div style="margin:auto;width:50%;height:600px;overflow-y: auto;overflow-x: hidden;">
@@ -1531,54 +1270,44 @@
                 </div> -->
               </div>
             </div>
-            <div v-for="(item,index) in secondData.question" class="question">             
+            <div v-for="(item, index) in secondData.question" class="question">
               <p class="question-title">
                 <span v-if="item.required == '必填'" style="color: red;">*</span>
                 {{ index }}.<span style="">({{ item.type }})</span>
                 {{ item.title }}
               </p>
               <div>
-                
-
-                <el-radio-group
-                  v-for="(val, idx) in item.options"
-                  v-if="item.type =='单选'&&item.layoutType!=2"
-                  :key="idx"
-                  style="display: content;flex-direction: column;width:100%;margin:0 0 4px 0"
-                >
+
+
+                <el-radio-group v-for="(val, idx) in item.options" v-if="item.type == '单选' && item.layoutType != 2"
+                  :key="idx" style="display: content;flex-direction: column;width:100%;margin:0 0 4px 0">
                   <el-radio disabled>
-                    <snap
-                      style=" white-space: normal !important;
-  word-break: break-all !important;"
-                    >
+                    <snap style=" white-space: normal !important;
+  word-break: break-all !important;">
                       {{ val.answer }}
-                    </snap> 
+                    </snap>
                   </el-radio>
 
                 </el-radio-group>
-                <div v-if="item.type =='单选'&&item.layoutType==2" style="display: flex;width: 100%;flex-wrap: wrap;">
-                 <div class="answerItem" v-for="(val, idx) in item.options" :key="idx">{{ val.answer }}</div>
+                <div v-if="item.type == '单选' && item.layoutType == 2"
+                  style="display: flex;width: 100%;flex-wrap: wrap;">
+                  <div class="answerItem" v-for="(val, idx) in item.options" :key="idx">{{ val.answer }}</div>
                 </div>
-                <el-checkbox-group
-                  v-for="(val, idx) in item.options"
-                  v-if="item.type =='多选'&&item.layoutType!=2"
-                  :key="idx"
-                  style="display: content;flex-direction: column;width:100%;margin:0 0 4px 0"
-                >
+                <el-checkbox-group v-for="(val, idx) in item.options" v-if="item.type == '多选' && item.layoutType != 2"
+                  :key="idx" style="display: content;flex-direction: column;width:100%;margin:0 0 4px 0">
                   <el-checkbox disabled>
-                    <snap
-                      style=" white-space: normal !important;
-  word-break: break-all !important;"
-                    >
+                    <snap style=" white-space: normal !important;
+  word-break: break-all !important;">
                       {{ val.answer }}
                     </snap>
                   </el-checkbox>
                 </el-checkbox-group>
-                
-                <div v-if="item.type =='多选'&&item.layoutType==2" style="display: flex;width: 100%;flex-wrap: wrap;">
-                 <div class="answerItem" v-for="(val, idx) in item.options" :key="idx">{{ val.answer }}</div>
+
+                <div v-if="item.type == '多选' && item.layoutType == 2"
+                  style="display: flex;width: 100%;flex-wrap: wrap;">
+                  <div class="answerItem" v-for="(val, idx) in item.options" :key="idx">{{ val.answer }}</div>
                 </div>
-                <div v-if="item.type =='文本'">
+                <div v-if="item.type == '文本'">
                   <el-input v-model="model1.name" placeholder="请输入" disabled style="width:80%" />
 
                 </div>
@@ -1612,12 +1341,8 @@
               <!--    <p class="question-title">您的建议：</p >
                  <textarea v-model="suggestion"></textarea> -->
               <el-form label-position="right" :model="model1" style="background-color:#fff;border-radius: 10px;">
-                <el-form-item
-                  v-if="secondData.needName == '必填'"
-                  label="姓名"
-                  prop="name"
-                  style="padding:10px 10px 0 10px;"
-                >
+                <el-form-item v-if="secondData.needName == '必填'" label="姓名" prop="name"
+                  style="padding:10px 10px 0 10px;">
                   <el-input v-model="model1.name" placeholder="请输入姓名" disabled style="width:80%" />
                 </el-form-item>
                 <el-form-item v-if="secondData.needPhone == '必填'" label="电话" prop="phone" style="padding: 0 10px;">
@@ -1626,19 +1351,9 @@
                 <el-form-item v-if="secondData.needGender == '必填'" label="性别" prop="sex" style="padding: 0 10px ;">
                   <el-input v-model="model1.sex" placeholder="请输入性别" disabled style="width:80%" />
                 </el-form-item>
-                <el-form-item
-                  v-if="secondData.needOpinion == '必填'"
-                  label="意见"
-                  prop="yij"
-                  style="padding:0 10px 10px 10px;"
-                >
-                  <el-input
-                    v-model="model1.yij"
-                    type="textarea"
-                    placeholder="请输入内容"
-                    disabled
-                    style="width:80%"
-                  />
+                <el-form-item v-if="secondData.needOpinion == '必填'" label="意见" prop="yij"
+                  style="padding:0 10px 10px 10px;">
+                  <el-input v-model="model1.yij" type="textarea" placeholder="请输入内容" disabled style="width:80%" />
                 </el-form-item>
               </el-form>
 
@@ -1652,7 +1367,7 @@
           问卷作答地址：{{ wenjuanUrl }} <span style="color:#3F9B6A" @click="copyUrl(wenjuanUrl)">复制</span>
         </div>
         <div style="display:flex;justify-content: flex-end;padding:20px;">
-          <el-button style="background-color: #3F9B6A;color: #fff;" @click="yulanShow=false">取消</el-button>
+          <el-button style="background-color: #3F9B6A;color: #fff;" @click="yulanShow = false">取消</el-button>
 
         </div>
       </div>
@@ -1686,7 +1401,7 @@ export default {
     tiaoxing,
     wangEditor
   },
-  data () {
+  data() {
     return {
 
       tableHeight: 600, // 设置为你想要的表格高度，单位是像素
@@ -1756,7 +1471,8 @@ export default {
         tikuTitle: '',
         questionType: '',
         questionBank: '用户端题库',
-        layoutType:1,
+        layoutType: 1,
+        maxChoose: 0,
         isRequired: '必填',
         questionDescription: '',
         optionSettings: {},
@@ -1857,7 +1573,7 @@ export default {
           required: true,
           message: '请输入创建人',
           trigger: 'blur'
-        }, ],
+        },],
       },
 
       tixrules: {
@@ -1865,7 +1581,7 @@ export default {
           required: true,
           message: '请输入题目',
           trigger: 'blur'
-        }, ],
+        },],
         questionType: [{
           required: true,
           message: '请选择题型',
@@ -1913,7 +1629,7 @@ export default {
       isbutton: false,
       currentPageList: 1,
       pickerOptions: {
-        disabledDate (time) {
+        disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7; // 禁用当前时间之前的日期
         }
       },
@@ -1925,22 +1641,22 @@ export default {
   computed: {
 
   },
-  created () {
+  created() {
     this.getAll()
   },
   methods: {
-    input (e, e1) {
+    input(e, e1) {
       // this.formInline[e1] = e
-      
+
       if (e1 == '1') {
         this.formInline.coverImage = e
       } else {
         this.secondData.coverImage = e
       }
 
-      
+
     },
-    chenge (val) {
+    chenge(val) {
       this.formSel = {
         title: '',
         questionnaireType: '',
@@ -1951,14 +1667,14 @@ export default {
       this.leixing = !this.leixing
       this.chengeTatle = val
     },
-    async getAll () {
+    async getAll() {
       const res = await TerminaGetAll(this.pageindex)
       this.tableData = res.data.content
       this.total = res.data.totalElements
     },
 
     // 新增确定按钮
-    addCheck (val) {
+    addCheck(val) {
       this.$refs.inlineform.validate((valid) => {
         if (valid) {
           if (this.Xin_Time != null) {
@@ -2028,7 +1744,7 @@ export default {
       })
     },
     // 获取时间
-    currentTime () {
+    currentTime() {
       const date = new Date();
       const year = date.getFullYear();
       let month = date.getMonth() + 1; // 月份从0~11，所以加一
@@ -2047,7 +1763,7 @@ export default {
       // 返回格式化的日期和时间字符串
       return `${year}-${month}-${day} ${hours}:${minutes}`;
     },
-    objectToArray (obj) {
+    objectToArray(obj) {
       return Object.keys(obj).map(key => {
         const item = obj[key];
         return {
@@ -2058,7 +1774,7 @@ export default {
     },
 
     // 详情
-    details (val, item) {
+    details(val, item) {
       this.detbox = true
       this.secondData = item
       if (typeof item.question === 'string') {
@@ -2075,13 +1791,13 @@ export default {
       // })
     },
 
-    addbuss (val, item) {
+    addbuss(val, item) {
       this.index = val
       this.detbox = false
       this.ggXin = true
     },
 
-    handleCurrentChange1 (val) {
+    handleCurrentChange1(val) {
       this.tongjiMsg.pageNumber = val - 1
       if (this.tongjiMsg.plan_Time.length > 0) {
         this.tongjiMsg.createTime = this.tongjiMsg.plan_Time[0]
@@ -2094,10 +1810,10 @@ export default {
             this.total1 = response.data.data.totalElements
           })
     },
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       this.pageSize = val
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       this.pageindex = {
         pageNumber: val - 1,
         pageSize: 10,
@@ -2107,10 +1823,10 @@ export default {
         this.tableData = res.data.content
       })
     },
-    handleSizeChangeTi (val) {
+    handleSizeChangeTi(val) {
       this.pageSizeTi = val
     },
-    async  handleCurrentChangeTi (val) {
+    async handleCurrentChangeTi(val) {
       const pageindex = {
         pageNumber: val - 1,
         pageSize: 10,
@@ -2125,7 +1841,7 @@ export default {
       //   this.tableData = res.data.content
       // })
     },
-    closeFn (val) {
+    closeFn(val) {
       this.bianjiTabs = 'first'
       this.xiangTabs = 'first'
       this.bianjiBox = 1
@@ -2138,7 +1854,7 @@ export default {
       }
     },
     // 详情编辑
-    async bianji () {
+    async bianji() {
       if (this.bianjiBox == 1) {
         this.bianjiBox = 2
       } else {
@@ -2151,11 +1867,11 @@ export default {
       }
     },
     // 查看合同
-    lookHetong (val) {
+    lookHetong(val) {
       this.hetongBox = true
     },
     // 查询按钮
-    async onSubmit () {
+    async onSubmit() {
       this.isbutton = true;
       const res = await TerminaGetAll(this.formSel)
       this.tableData = res.data.content
@@ -2163,7 +1879,7 @@ export default {
       this.isbutton = false;
     },
     // 重置按钮
-    resetting () {
+    resetting() {
       this.formSel = {
         title: '',
         questionnaireType: '',
@@ -2171,11 +1887,11 @@ export default {
         pageNumber: 0,
         pageSize: 10,
       },
-      this.currentPageList = 1
+        this.currentPageList = 1
       this.pageindex.pageNumber = 0
       this.getAll()
     },
-    radioClick (value) {
+    radioClick(value) {
       if (value === '不设置奖励') {
         this.jifen = '' // 积分奖励
         this.choujiang = '' // 转盘抽奖
@@ -2191,7 +1907,7 @@ export default {
         this.choujiang = '' // 转盘抽奖
       }
     },
-    async selTiku () {
+    async selTiku() {
       this.tiNum = 0
       // this.zhong = {
       //   tikuTitle:'',
@@ -2213,7 +1929,7 @@ export default {
       this.tikuziyuan = tiku.data.content
       this.totalTi = tiku.data.totalElements
     },
-    addOption () {
+    addOption() {
       const newOption = {
         index: this.options.length + 1,
         name: '',
@@ -2221,10 +1937,10 @@ export default {
       };
       this.options.push(newOption);
     },
-    deleteOption (index) {
+    deleteOption(index) {
       this.options.splice(index, 1);
     },
-    bianls (item) {
+    bianls(item) {
       this.secondData = item
       Vue.set(this.plan_Time, 0, this.secondData.startDate)
       Vue.set(this.plan_Time, 1, this.secondData.endDate)
@@ -2234,17 +1950,17 @@ export default {
 
       this.secondDataTi = item.cereQuestionManagements
       this.bainjiBox = true
-	  
+
     },
-    bianCheck () {
+    bianCheck() {
       if (this.secondData && this.secondData.cereQuestionManagements) {
         delete this.secondData.cereQuestionManagements;
       }
-	 
+
       if (typeof this.secondData.question != 'string') {
         this.secondData.question = JSON.stringify(this.secondData.question)
       }
-	  
+
       if (this.plan_Time.length != 0) {
         this.secondData.startDate = this.plan_Time[0]
         this.secondData.endDate = this.plan_Time[1]
@@ -2256,13 +1972,13 @@ export default {
       }
       this.secondData.questionId = ids.join(',')
       this.secondData.updateTime = this.currentTime()
-	
+
       TerminaEdit(this.secondData).then(res => {
         this.getAll()
         this.bainjiBox = false
       })
     },
-    tongji (item) {
+    tongji(item) {
       this.tongjiSshu = []
       this.tongjiTu = {}
       this.total1 = 0
@@ -2301,15 +2017,15 @@ export default {
             this.total1 = response.data.data.totalElements
           }
         }).catch(err => {
-        this.loading = false
-        this.$message({
-          message: '网络不好,请稍后再试',
-          type: 'error'
+          this.loading = false
+          this.$message({
+            message: '网络不好,请稍后再试',
+            type: 'error'
+          })
         })
-      })
     },
-    tongjiClick (tab, event) {
-      
+    tongjiClick(tab, event) {
+
       if (tab.index == '1') {
         this.shujuloading = true
         const postData = {
@@ -2358,15 +2074,15 @@ export default {
 
             // this.tuwent = Object.values(this.tuwent).filter(res => res.type !== '文本');
           }).catch(err => {
-          this.shujuloading = false
-          this.$message({
-            message: '网络不好,请稍后再试',
-            type: 'error'
+            this.shujuloading = false
+            this.$message({
+              message: '网络不好,请稍后再试',
+              type: 'error'
+            })
           })
-        })
       }
     },
-    xuanxiang (obj) {
+    xuanxiang(obj) {
       const result = [];
 
       for (const key in obj) {
@@ -2396,7 +2112,7 @@ export default {
 
       return result;
     },
-    daxiang (item) {
+    daxiang(item) {
       this.daxiangData = item
 
       const selectoptions = null
@@ -2423,7 +2139,7 @@ export default {
     },
 
     // 新增题库
-    Addtiku (val) {
+    Addtiku(val) {
       const that = this
 
       if (this.zhong.tikuTitle == '') {
@@ -2452,12 +2168,12 @@ export default {
           return
         }
       }
-	  let accumulator= {}
-	  let fenshu ={}
-	  this.options.forEach((item,index)=>{
-	  	accumulator[index] = item.name
-	  	fenshu[index] =  Number(item.num) || 0
-	  })
+      let accumulator = {}
+      let fenshu = {}
+      this.options.forEach((item, index) => {
+        accumulator[index] = item.name
+        fenshu[index] = Number(item.num) || 0
+      })
       // this.zhong.optionSettings = this.options.reduce((accumulator, current) => {
       //   accumulator[current.index] = current.name;
       //   return accumulator;
@@ -2467,18 +2183,18 @@ export default {
       //   accumulator[current.index] = Number(current.num);
       //   return accumulator;
       // }, {}) // 初始化累加器为空对象
-this.zhong.optionSettings = JSON.stringify(accumulator)
-this.zhong.score = JSON.stringify(fenshu)
-						
+      this.zhong.optionSettings = JSON.stringify(accumulator)
+      this.zhong.score = JSON.stringify(fenshu)
+
       // this.zhong.optionSettings = JSON.stringify(this.zhong.optionSettings)
       // this.zhong.score = JSON.stringify(this.zhong.score)
       this.zhong.createDate = this.currentTime()
 
       QuestionAdd(this.zhong).then((res) => {
         if (val == 1) {
-			
+
           that.wenConstData.push(res.data)
-		  
+
         } else {
           that.secondDataTi.push(res.data)
         }
@@ -2494,7 +2210,7 @@ this.zhong.score = JSON.stringify(fenshu)
       })
     },
     // 题库切换选择
-    async tikuchange (val) {
+    async tikuchange(val) {
       const page = {
         pageNumber: 0,
         pageSize: 10,
@@ -2505,7 +2221,7 @@ this.zhong.score = JSON.stringify(fenshu)
       this.totalTi = tiku.data.totalElements
     },
 
-    async tikusous () {
+    async tikusous() {
       const page = {
         pageNumber: 0,
         pageSize: 10,
@@ -2517,7 +2233,7 @@ this.zhong.score = JSON.stringify(fenshu)
       this.tikuziyuan = tiku.data.content
       this.totalTi = tiku.data.totalElements
     },
-    async tikuclose () {
+    async tikuclose() {
       this.tikuNie = '用户端题库'
       this.danxuan = ''
       this.timuMsg = ''
@@ -2531,14 +2247,14 @@ this.zhong.score = JSON.stringify(fenshu)
       this.tikuziyuan = tiku.data.content
       this.totalTi = tiku.data.totalElements
     },
-    gotimuxiang (item) {
+    gotimuxiang(item) {
       this.timuData = item
       if (typeof item.optionSettings !== 'object') {
         this.timuData.optionSettings = JSON.parse(item.optionSettings)
       }
       this.timuXiang = true
     },
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       // if(this.tikuNie =='用户端题库'){
       //     this.listOne = val
       // }else if(this.tikuNie =='商户端题库'){
@@ -2553,7 +2269,7 @@ this.zhong.score = JSON.stringify(fenshu)
       // this.xuanzheData = this.xuanzheData.concat(val)
       // this.xuanzheData = [...new Set(this.xuanzheData)]
     },
-    tiSelQue (val) {
+    tiSelQue(val) {
       if (val == 1) {
         // wenConstData secondDataTi
 
@@ -2567,7 +2283,7 @@ this.zhong.score = JSON.stringify(fenshu)
       } else {
         this.multipleSelection.forEach(item => {
           const isDuplicate = this.secondDataTi.some(existingItem => existingItem.id === item.id);
-		  
+
           if (!isDuplicate) {
             this.secondDataTi.push(item);
           }
@@ -2583,7 +2299,7 @@ this.zhong.score = JSON.stringify(fenshu)
       this.$refs.ziyuanData.clearSelection()
       this.tikuBox = false
     },
-    delWenCon (val, index) {
+    delWenCon(val, index) {
       if (val == '1') {
         this.xuanzheData.splice(index, 1)
         this.wenConstData.splice(index, 1)
@@ -2591,7 +2307,7 @@ this.zhong.score = JSON.stringify(fenshu)
         this.secondDataTi.splice(index, 1)
       }
     },
-    fabu (val, item) {
+    fabu(val, item) {
       const h = this.$createElement;
       this.$msgbox({
         title: '消息',
@@ -2618,11 +2334,11 @@ this.zhong.score = JSON.stringify(fenshu)
         }
       })
     },
-    downs (item) {
+    downs(item) {
       this.xiajiaId = item.id
       this.downShow = true
     },
-    async downShowCheck () {
+    async downShowCheck() {
       if (this.opinionDel.opinionDelisting == '') {
         this.$message({
           message: '请输入禁用原因',
@@ -2637,7 +2353,7 @@ this.zhong.score = JSON.stringify(fenshu)
       this.downShow = false
       this.getAll()
     },
-    delwen (item) {
+    delwen(item) {
       const h = this.$createElement;
       this.$msgbox({
         title: '消息',
@@ -2663,10 +2379,10 @@ this.zhong.score = JSON.stringify(fenshu)
         }
       })
     },
-    addyu () {
+    addyu() {
 
     },
-    parseData (obj) {
+    parseData(obj) {
       const result = [];
 
       for (const key in obj) {
@@ -2691,7 +2407,7 @@ this.zhong.score = JSON.stringify(fenshu)
 
       return result;
     },
-    yulan (item) {
+    yulan(item) {
       this.secondData = item
 
       if (typeof this.secondData.question != 'object') {
@@ -2701,9 +2417,9 @@ this.zhong.score = JSON.stringify(fenshu)
       this.wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`
 
       this.yulanShow = true
-	  
+
     },
-    addggXin () {
+    addggXin() {
       this.formInline = {
         createUser: '',
         title: '',
@@ -2734,12 +2450,13 @@ this.zhong.score = JSON.stringify(fenshu)
       this.wenConstData = []
       this.ggXin = true
     },
-    addTikuShow () {
+    addTikuShow() {
       this.zhong = {
         tikuTitle: '',
         questionType: '',
         questionBank: '用户端题库',
-        layoutType:1,
+        layoutType: 1,
+        maxChoose: 0,
         isRequired: '必填',
         questionDescription: '',
         optionSettings: {},
@@ -2748,7 +2465,7 @@ this.zhong.score = JSON.stringify(fenshu)
 
       this.tikuAdd = true
     },
-    quxiao (val) {
+    quxiao(val) {
       this.multipleSelection = []
       this.options = []
       this.$refs.tixform.resetFields()
@@ -2760,7 +2477,7 @@ this.zhong.score = JSON.stringify(fenshu)
       // }
     },
 
-    hangSelchange () {
+    hangSelchange() {
       const postList = {
         pageNumber: 0,
         pageSize: 10,
@@ -2772,7 +2489,7 @@ this.zhong.score = JSON.stringify(fenshu)
           this.total1 = response.data.data.totalElements
         })
     },
-    secondsToMinutesAndSeconds (s) {
+    secondsToMinutesAndSeconds(s) {
       if (s) {
         // 将输入的秒数转换为数值类型并取整
         s = Math.floor(Number(s));
@@ -2795,7 +2512,7 @@ this.zhong.score = JSON.stringify(fenshu)
       }
     },
 
-    tongjiSubmit () {
+    tongjiSubmit() {
       const page = {
         pageNumber: 0,
         pageSize: 10,
@@ -2814,7 +2531,7 @@ this.zhong.score = JSON.stringify(fenshu)
           this.total1 = response.data.data.totalElements
         })
     },
-    tongjiSubmitret () {
+    tongjiSubmitret() {
       this.tongjiMsg = {
         plan_Time: [],
         userName: '',
@@ -2833,7 +2550,7 @@ this.zhong.score = JSON.stringify(fenshu)
           this.total1 = response.data.data.totalElements
         })
     },
-    copyUrl (url) {
+    copyUrl(url) {
       const tempTextArea = document.createElement('textarea');
       // 设置 textarea 的值为要复制的 URL
       tempTextArea.value = url;
@@ -2850,13 +2567,13 @@ this.zhong.score = JSON.stringify(fenshu)
         type: 'success'
       })
     },
-    tongjiBoxFan () {
+    tongjiBoxFan() {
       this.tongjiBox = false
       // this.getAll()
       // location.reload();
     },
-    async load () {
-      
+    async load() {
+
       const page = {
         pageNumber: this.tiNum + 1,
         pageSize: 10,
@@ -2877,7 +2594,7 @@ this.zhong.score = JSON.stringify(fenshu)
         }, [])
       )
     },
-    getCurrentDate () {
+    getCurrentDate() {
       const now = new Date();
       const year = now.getFullYear();
       const month = String(now.getMonth() + 1).padStart(2, '0'); // 月份从0开始，所以要+1
@@ -2885,7 +2602,7 @@ this.zhong.score = JSON.stringify(fenshu)
       return `${year}-${month}-${day}`;
     },
 
-    getNextDayDate () {
+    getNextDayDate() {
       const now = new Date();
       now.setDate(now.getDate() + 1); // 设置到下一天
       const year = now.getFullYear();
@@ -2894,7 +2611,7 @@ this.zhong.score = JSON.stringify(fenshu)
       return `${year}-${month}-${day}`;
     },
 
-    validateScore (row) {
+    validateScore(row) {
       // 如果输入的不是数字或者是NaN，则重置为1
       if (isNaN(row.num) || row.num < 0) {
         row.num = 0;
@@ -2905,7 +2622,7 @@ this.zhong.score = JSON.stringify(fenshu)
       }
     },
 
-    tikuquxiao (val) {
+    tikuquxiao(val) {
       this.tikuBox = false
       this.tiNum = 0
       this.tikuNie = ''
@@ -2916,393 +2633,404 @@ this.zhong.score = JSON.stringify(fenshu)
       this.totalTi = 0
       this.$refs.ziyuanData.clearSelection()
     },
-    moveUp (index) {
-      [this.wenConstData[index],this.wenConstData[index-1]]=[this.wenConstData[index - 1],this.wenConstData[index]]
+    moveUp(index) {
+      [this.wenConstData[index], this.wenConstData[index - 1]] = [this.wenConstData[index - 1], this.wenConstData[index]]
       this.wenConstData.sort()
     },
-    moveDown (index) {
-      [this.wenConstData[index],this.wenConstData[index+1]]=[this.wenConstData[index+1],this.wenConstData[index]]
+    moveDown(index) {
+      [this.wenConstData[index], this.wenConstData[index + 1]] = [this.wenConstData[index + 1], this.wenConstData[index]]
       this.wenConstData.sort()
     },
-    moveUp2 (index) {
+    moveUp2(index) {
       s
-      [this.secondDataTi[index],this.secondDataTi[index-1]]=[this.secondDataTi[index - 1],this.secondDataTi[index]]
+      [this.secondDataTi[index], this.secondDataTi[index - 1]] = [this.secondDataTi[index - 1], this.secondDataTi[index]]
       this.secondDataTi.sort()
     },
-    moveDown2 (index) {
-      [this.secondDataTi[index],this.secondDataTi[index+1]]=[this.secondDataTi[index+1],this.secondDataTi[index]]
+    moveDown2(index) {
+      [this.secondDataTi[index], this.secondDataTi[index + 1]] = [this.secondDataTi[index + 1], this.secondDataTi[index]]
       this.secondDataTi.sort()
     },
-	 answerMoveUp (index) {      
-	      [this.options[index],this.options[index-1]]=[this.options[index - 1],this.options[index]]
-	this.options[index].index = index  - 1
-	      this.options.sort()
-	    },
-	    answerMoveDown (index) {
-	      [this.options[index],this.options[index+1]]=[this.options[index+1],this.options[index]]
-	this.options[index].index = index  + 1
-	      this.options.sort()
-	    },
+    answerMoveUp(index) {
+      [this.options[index], this.options[index - 1]] = [this.options[index - 1], this.options[index]]
+      this.options[index].index = index - 1
+      this.options.sort()
+    },
+    answerMoveDown(index) {
+      [this.options[index], this.options[index + 1]] = [this.options[index + 1], this.options[index]]
+      this.options[index].index = index + 1
+      this.options.sort()
+    },
   }
 
 }
 </script>
 
 <style scoped>
-  .zhuti {
-    padding: 0 20px 20px 20px;
-    min-height: calc(100vh - 50px - 20px);
-    background-color: #Fff;
-
-  }
+.zhuti {
+  padding: 0 20px 20px 20px;
+  min-height: calc(100vh - 50px - 20px);
+  background-color: #Fff;
 
-  .chengeXia {
-    border-bottom: 6px solid #3F9B6A;
-    padding-bottom: 4px;
-    color: #3F9B6A;
-  }
+}
 
-  /deep/ .el-form-item__content {
-    line-height: 0;
-  }
+.chengeXia {
+  border-bottom: 6px solid #3F9B6A;
+  padding-bottom: 4px;
+  color: #3F9B6A;
+}
 
-  .tableBtn {
-    display: inline-block;
-    margin-right: 10px;
-    color: #ACACAC;
-    cursor: pointer;
-  }
+/deep/ .el-form-item__content {
+  line-height: 0;
+}
 
-  .formSearch {
-    display: flex;
-    width: 100%;
-    font-size: 14px;
-    justify-content: space-between;
-  }
+.tableBtn {
+  display: inline-block;
+  margin-right: 10px;
+  color: #ACACAC;
+  cursor: pointer;
+}
 
-  .greens {
-    color: #3F9B6A;
-  }
+.formSearch {
+  display: flex;
+  width: 100%;
+  font-size: 14px;
+  justify-content: space-between;
+}
 
-  /deep/ .el-table__row {
-    font-size: 14px;
-    color: #000000e6;
-    height: 42px;
-  }
+.greens {
+  color: #3F9B6A;
+}
 
-  .fenye {
-    margin-top: 20px;
-    display: flex;
-    justify-content: flex-end;
-  }
+/deep/ .el-table__row {
+  font-size: 14px;
+  color: #000000e6;
+  height: 42px;
+}
 
-  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color: #3F9B6A;
-  }
+.fenye {
+  margin-top: 20px;
+  display: flex;
+  justify-content: flex-end;
+}
 
-  .el-row {
-    margin-bottom: 20px;
+/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #3F9B6A;
+}
 
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
+.el-row {
+  margin-bottom: 20px;
 
-  .el-col {
-    border-radius: 4px;
+  &:last-child {
+    margin-bottom: 0;
   }
+}
 
-  .bg-purple-dark {
-    background: #99a9bf;
-  }
+.el-col {
+  border-radius: 4px;
+}
 
-  .bg-purple {
-    background: #d3dce6;
-  }
+.bg-purple-dark {
+  background: #99a9bf;
+}
 
-  .bg-purple-light {
-    background: #e5e9f2;
-  }
+.bg-purple {
+  background: #d3dce6;
+}
 
-  .grid-content {
-    border-radius: 4px;
-    min-height: 36px;
-  }
+.bg-purple-light {
+  background: #e5e9f2;
+}
 
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
 
-  /deep/ .bg-purple[data-v-0e3fe4ec] {
-    background: #fff;
-    height: 50px;
-  }
+.row-bg {
+  padding: 10px 0;
+  background-color: #f9fafc;
+}
 
-  /deep/ .bg-purple[data-v-3bebae82] {
-    background: #fff;
-    height: 50px;
-  }
+/deep/ .bg-purple[data-v-0e3fe4ec] {
+  background: #fff;
+  height: 50px;
+}
 
-  ::v-deep .bg-purple {
-    background: #fff;
-    height: 50px;
-  }
+/deep/ .bg-purple[data-v-3bebae82] {
+  background: #fff;
+  height: 50px;
+}
 
-  /deep/ .el-form--label-top .el-form-item__label {
-    padding: 0;
-  }
+::v-deep .bg-purple {
+  background: #fff;
+  height: 50px;
+}
 
-  ::v-deep .el-form-item {
-    margin-bottom: 16px;
-  }
+/deep/ .el-form--label-top .el-form-item__label {
+  padding: 0;
+}
 
-  .device-form .el-form-item__label::after {
-    content: "*";
-    color: #1A1A1A;
-    margin-left: 5px;
-    font-size: 16px;
-  }
+::v-deep .el-form-item {
+  margin-bottom: 16px;
+}
 
-  ::v-deep .el-dialog__wrapper {
-    .el-dialog__header {
-      background-color: #FAFAFA;
-    }
-  }
+.device-form .el-form-item__label::after {
+  content: "*";
+  color: #1A1A1A;
+  margin-left: 5px;
+  font-size: 16px;
+}
 
-  ::v-deep .el-input__inner:focus {
-    border: #3F9B6A 1px solid;
+::v-deep .el-dialog__wrapper {
+  .el-dialog__header {
+    background-color: #FAFAFA;
   }
+}
 
-  .dialog-footer {
-    display: flex;
-    justify-content: flex-end;
-    border-top: solid rgba(209, 209, 209, 0.2) 2px;
-    padding-top: 20px;
-  }
+::v-deep .el-input__inner:focus {
+  border: #3F9B6A 1px solid;
+}
 
-  ::v-deep .el-input__inner:focus {
-    border: #3F9B6A 1px solid;
-  }
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  border-top: solid rgba(209, 209, 209, 0.2) 2px;
+  padding-top: 20px;
+}
 
-  ::v-deep .el-input__inner:hover {
-    border: #3F9B6A 1px solid;
-  }
+::v-deep .el-input__inner:focus {
+  border: #3F9B6A 1px solid;
+}
 
-  ::v-deep .el-select .el-input.is-focus .el-input__inner {
-    border-color: #3F9B6A
-  }
+::v-deep .el-input__inner:hover {
+  border: #3F9B6A 1px solid;
+}
 
-  .el-select-dropdown__item.selected {
-    color: #3F9B6A;
-  }
+::v-deep .el-select .el-input.is-focus .el-input__inner {
+  border-color: #3F9B6A
+}
 
-  .el-pagination__sizes .el-input .el-input__inner:hover {
-    border-color: #3F9B6A;
-  }
+.el-select-dropdown__item.selected {
+  color: #3F9B6A;
+}
 
-  ::v-deep .el-dialog__wrapper {
+.el-pagination__sizes .el-input .el-input__inner:hover {
+  border-color: #3F9B6A;
+}
 
-    .dialog_css {
-      margin-right: 12px;
-      margin-top: 61px !important;
+::v-deep .el-dialog__wrapper {
 
-      .el-dialog__title {
-        font-size: 16px !important;
-        font-weight: 600;
-        color: #000;
-      }
-    }
+  .dialog_css {
+    margin-right: 12px;
+    margin-top: 61px !important;
 
-    .diaslog_zhong {
-      margin-left: 25%;
-      margin-top: 61px !important;
+    .el-dialog__title {
+      font-size: 16px !important;
+      font-weight: 600;
+      color: #000;
     }
-
   }
 
-  ::v-deep .diaslog_zhong {
-    margin-left: 20%;
+  .diaslog_zhong {
+    margin-left: 25%;
     margin-top: 61px !important;
+  }
 
-    .el-dialog__header {
-      background-color: #fff;
-      border-bottom: 1px solid #EFEFEF;
+}
 
-      .el-dialog__title {
-        font-size: 14px;
-        color: #000000e6;
-      }
-    }
+::v-deep .diaslog_zhong {
+  margin-left: 20%;
+  margin-top: 61px !important;
+
+  .el-dialog__header {
+    background-color: #fff;
+    border-bottom: 1px solid #EFEFEF;
 
-    .el-dialog__body {
-      padding: 10px 30px 30px 20px
+    .el-dialog__title {
+      font-size: 14px;
+      color: #000000e6;
     }
   }
 
-  /deep/ .el-table_1_column_8 .hetong {
-    color: #7DBB9A;
-    text-decoration: underline;
+  .el-dialog__body {
+    padding: 10px 30px 30px 20px
   }
+}
 
-  /deep/ .first-column-bg {
-    background-color: #FAFAFA !important;
-  }
+/deep/ .el-table_1_column_8 .hetong {
+  color: #7DBB9A;
+  text-decoration: underline;
+}
 
-  ::v-deep .textarea {
-    width: 85%;
+/deep/ .first-column-bg {
+  background-color: #FAFAFA !important;
+}
 
-    .el-textarea__inner {
-      width: 100%;
-    }
-  }
+::v-deep .textarea {
+  width: 85%;
 
-  ::v-deep .pass_input {
+  .el-textarea__inner {
     width: 100%;
-
-    .el-input__inner {
-      border: none;
-      padding: 0;
-    }
   }
+}
 
-  ::v-deep .pass_select {
-    width: 100%;
+::v-deep .pass_input {
+  width: 100%;
 
-    .el-input__inner {
-      border: none;
-      padding: 0;
-    }
+  .el-input__inner {
+    border: none;
+    padding: 0;
+  }
+}
 
-    .el-icon-arrow-up:before {
-      content: ''
-    }
+::v-deep .pass_select {
+  width: 100%;
 
+  .el-input__inner {
+    border: none;
+    padding: 0;
   }
 
-  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-    background-color: #fff;
+  .el-icon-arrow-up:before {
+    content: ''
   }
 
-  /deep/ .el-radio__label,
-  /deep/ .el-checkbox__label {
-    white-space: normal !important;
-    word-break: break-all !important;
-  }
-</style>
-<style lang="scss" scoped>
-  ::v-deep .bian_css {
-    .el-dialog__header {
-      padding: 0px;
-    }
+}
 
-    .el-input__inner {
-      height: 18px;
-      border: 0px;
-      margin-top: 0px;
-    }
+/deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  background-color: #fff;
+}
 
-    .el-input__inner:hover {
-      border: 0px;
-    }
+/deep/ .el-radio__label,
+/deep/ .el-checkbox__label {
+  white-space: normal !important;
+  word-break: break-all !important;
+}
 
-    .el-input__inner:focus {
-      border: 0px;
-    }
+/deep/ .el-input-number__decrease,
+/deep/.el-input-number__increase {
+	height: 30px !important;
+	line-height: 32px !important;
+	margin-top: 3px;
+}
+</style>
+<style lang="scss" scoped>
+::v-deep .bian_css {
+  .el-dialog__header {
+    padding: 0px;
   }
 
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
+  .el-input__inner {
+    height: 18px;
+    border: 0px;
+    margin-top: 0px;
   }
 
-  ::v-deep .el-pagination__total {
-    position: absolute;
-    left: 33px;
+  .el-input__inner:hover {
+    border: 0px;
   }
 
-  ::v-deep .diaslog_zhong {
-    .el-dialog__body {
-      padding: 10px 20px 20px 20px;
-    }
-
-    .el-upload--picture-card {
-      width: 130px;
-      height: 130px;
-    }
+  .el-input__inner:focus {
+    border: 0px;
   }
+}
 
-  ::v-deep .el-radio-group {
-    .el-radio {
-      font-weight: 400;
-      height: 29px;
-    }
-  }
+::v-deep .buttonHover:hover {
+  color: #3f9b6a !important;
+  border-color: #c5e1d2 !important;
+  background-color: #ecf5f0 !important;
+  outline: none;
+}
 
-  ::v-deep .el-checkbox-group {
-    .el-checkbox {
-      height: 29px;
-    }
+::v-deep .el-pagination__total {
+  position: absolute;
+  left: 33px;
+}
 
-    label {
-      font-weight: 400;
-    }
+::v-deep .diaslog_zhong {
+  .el-dialog__body {
+    padding: 10px 20px 20px 20px;
   }
 
-  .questionnaire {
-    width: 100%;
-    flex-grow: 1;
-    background-color: white;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-    border-radius: 5px;
-    box-sizing: border-box;
+  .el-upload--picture-card {
+    width: 130px;
+    height: 130px;
   }
+}
 
-  .question-title {
-    // font-size: 18px;
-    color: #000;
-    margin-bottom: 10px;
+::v-deep .el-radio-group {
+  .el-radio {
+    font-weight: 400;
+    height: 29px;
   }
+}
 
-  .question {
-    background-color: white;
-    padding: 15px;
-    margin: 10px 0;
-    border-radius: 10px;
+::v-deep .el-checkbox-group {
+  .el-checkbox {
+    height: 29px;
   }
-  .answerItem{
-    width: auto;
-    padding:10px 15px;
-    margin: 0 0 5px 10px;
-    border-radius: 6px;
-    background-color: #f5f7fa;
-    display: flex;
-    align-items: center;
+
+  label {
+    font-weight: 400;
   }
+}
 
-  // ::v-deep .tongyong_css {
-  //   max-height: 850px;
+.questionnaire {
+  width: 100%;
+  flex-grow: 1;
+  background-color: white;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+  box-sizing: border-box;
+}
 
-  // }
+.question-title {
+  // font-size: 18px;
+  color: #000;
+  margin-bottom: 10px;
+}
 
-  // .tongyong_css {
-  //   max-height: calc(100vh - 200px); /* Adjust the 200px to the combined height of your header and footer */
-  //   overflow-y: auto;
-  // }
-  ::v-deep .xddTable {
-      height: 100% !important;
-    .el-table__body-wrapper{
-      overflow:auto !important;
-        height: 100% !important;
-    }
-    .el-table__body-wrapper is-scrolling-none{
-       height: 100% !important;
-    }
-    .el-table--scrollable-y .el-table__body-wrapper{
-      overflow-y:inherit !important;
-    }
+.question {
+  background-color: white;
+  padding: 15px;
+  margin: 10px 0;
+  border-radius: 10px;
+}
 
+.answerItem {
+  width: auto;
+  padding: 10px 15px;
+  margin: 0 0 5px 10px;
+  border-radius: 6px;
+  background-color: #f5f7fa;
+  display: flex;
+  align-items: center;
+}
+
+// ::v-deep .tongyong_css {
+//   max-height: 850px;
+
+// }
+
+// .tongyong_css {
+//   max-height: calc(100vh - 200px); /* Adjust the 200px to the combined height of your header and footer */
+//   overflow-y: auto;
+// }
+::v-deep .xddTable {
+  height: 100% !important;
+
+  .el-table__body-wrapper {
+    overflow: auto !important;
+    height: 100% !important;
   }
+
+  .el-table__body-wrapper is-scrolling-none {
+    height: 100% !important;
+  }
+
+  .el-table--scrollable-y .el-table__body-wrapper {
+    overflow-y: inherit !important;
+  }
+
+}
 </style>
diff --git a/wenjuan-pc/src/views/investigation/question.vue b/wenjuan-pc/src/views/investigation/question.vue
index 9086110..fff1d3b 100644
--- a/wenjuan-pc/src/views/investigation/question.vue
+++ b/wenjuan-pc/src/views/investigation/question.vue
@@ -52,17 +52,16 @@
 				</div>
 				<!-- 表格 -->
 
-				<el-table :data="
-            tableData.slice(
-              (currentPage - 1) * pageSize,
-              currentPage * pageSize
-            )
-          " :header-cell-style="{
-            fontSize: '14px',
-            color: '#0009',
-            fontWeight: 'normal',
-            backgroundColor: '#F2F3F5',
-          }" tooltip-effect="dark custom-tooltip-effect">
+				<el-table :data="tableData.slice(
+					(currentPage - 1) * pageSize,
+					currentPage * pageSize
+				)
+					" :header-cell-style="{
+						fontSize: '14px',
+						color: '#0009',
+						fontWeight: 'normal',
+						backgroundColor: '#F2F3F5',
+					}" tooltip-effect="dark custom-tooltip-effect">
 					<el-table-column label="序号" min-width="150">
 						<template slot-scope="scope">
 							{{ scope.$index + 1 }}
@@ -163,6 +162,10 @@
 								<el-option label="文本" value="文本" />
 							</el-select>
 						</el-form-item>
+						<!-- 如果formInline.questionType为多选，那么就显示最多可以选择多少个，计步器来设置，默认是 0 -->
+						 <el-form-item v-if="formInline.questionType == '多选'" label="最多可选" prop="maxChoose">
+							<el-input-number v-model="formInline.maxChoose" :min="0" :max="options.length " />0为不限制填写数量
+						</el-form-item>
 						<el-form-item label="隶属题库" prop="questionBank">
 							<el-select v-model="formInline.questionBank" placeholder="请选择">
 								<el-option label="用户端题库" value="用户端题库" />
@@ -188,11 +191,11 @@
 						</el-form-item>
 						<el-form-item v-if="formInline.questionType != '文本'" label="答案设置" prop="optionSettings">
 							<el-table :data="options" :header-cell-style="{
-                  fontSize: '14px',
-                  color: '#0009',
-                  fontWeight: 'normal',
-                  backgroundColor: '#F2F3F5',
-                }">
+								fontSize: '14px',
+								color: '#0009',
+								fontWeight: 'normal',
+								backgroundColor: '#F2F3F5',
+							}">
 								<el-table-column prop="index" label="序号" width="80">
 									<template #default="scope">
 										{{ scope.$index + 1 }}
@@ -210,12 +213,14 @@
 											:readonly="scope.row.readonly" @input="validateScore(scope.row)" />
 									</template>
 								</el-table-column>
-								<el-table-column label=""  min-width="120" >
-								                    <template #default="{$index}">
-								                      <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="answerMoveUp($index)" v-if="$index!=0">↑</span>
-								                      <span style="cursor: pointer; color: #3F9B6A;" @click="answerMoveDown($index)" v-if="$index != (options.length-1)">↓</span>
-								                    </template>
-								                  </el-table-column>
+								<el-table-column label=""  min-width="120">
+									<template #default="{ $index }">
+										<span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;"
+											@click="answerMoveUp($index)" v-if="$index != 0">↑</span>
+										<span style="cursor: pointer; color: #3F9B6A;" @click="answerMoveDown($index)"
+											v-if="$index != (options.length - 1)">↓</span>
+									</template>
+								</el-table-column>
 								<el-table-column label="操作">
 									<template #default="scope">
 										<div class="tableBtn greens" @click="deleteOption(scope.$index)">
@@ -259,6 +264,10 @@
 								<el-option label="文本" value="文本" />
 							</el-select>
 						</el-form-item>
+							<!-- 如果formInline.questionType为多选，那么就显示最多可以选择多少个，计步器来设置，默认是 0 -->
+						<el-form-item v-if="secondData.questionType == '多选'" label="最多可选" prop="maxChoose">
+							<el-input-number v-model="secondData.maxChoose" :min="0" :max="options.length " /> 0为不限制填写数量
+						</el-form-item>
 						<el-form-item label="隶属题库" prop="questionBank">
 							<el-select v-model="secondData.questionBank" placeholder="请选择">
 								<el-option label="用户端题库" value="用户端题库" />
@@ -284,42 +293,46 @@
 						</el-form-item>
 						<el-form-item v-if="secondData.questionType != '文本'" label="答案设置">
 							<el-table :data="options" :header-cell-style="{
-                  fontSize: '14px',
-                  color: '#0009',
-                  fontWeight: 'normal',
-                  backgroundColor: '#F2F3F5',
-                }">
-							
-									<el-table-column prop="index" label="序号" width="180">
-										<template #default="scope">
-											{{ scope.$index + 1 }}
-										</template>
-									</el-table-column>
-									<el-table-column prop="name" label="选项名称">
-										<template #default="scope">
-											<el-input v-model="scope.row.name" :readonly="scope.row.readonly" />
-										</template>
-									</el-table-column>
-									<el-table-column prop="name" label="分数">
-										<template #default="scope">
-											<el-input v-model="scope.row.num" :min="0" :max="100"
-												:readonly="scope.row.readonly" @input="validateScore(scope.row)" />
-										</template>
-									</el-table-column>
-									<el-table-column label=""  min-width="120" >
-									                    <template #default="{$index}">
-									                      <span style="cursor: pointer;margin-right: 5px; color: #3F9B6A;" @click="answerMoveUp($index)" v-if="$index!=0">↑</span>
-									                      <span style="cursor: pointer; color: #3F9B6A;" @click="answerMoveDown($index)" v-if="$index != (options.length-1)">↓</span>
-									                    </template>
+								fontSize: '14px',
+								color: '#0009',
+								fontWeight: 'normal',
+								backgroundColor: '#F2F3F5',
+							}">
+
+								<el-table-column prop="index" label="序号" width="180">
+									<template #default="scope">
+										{{ scope.$index + 1 }}
+									</template>
+								</el-table-column>
+								<el-table-column prop="name" label="选项名称">
+									<template #default="scope">
+										<el-input v-model="scope.row.name" :readonly="scope.row.readonly" />
+									</template>
+								</el-table-column>
+								<el-table-column prop="name" label="分数">
+									<template #default="scope">
+										<el-input v-model="scope.row.num" :min="0" :max="100"
+											:readonly="scope.row.readonly" @input="validateScore(scope.row)" />
+									</template>
+								</el-table-column>
+								<el-table-column label=""  min-width="120">
+									                    <template #default="{ $index }">
+										                      <span
+											style="cursor: pointer;margin-right: 5px; color: #3F9B6A;"
+											@click="answerMoveUp($index)" v-if="$index != 0">↑</span>
+										                      <span style="cursor: pointer; color: #3F9B6A;"
+											@click="answerMoveDown($index)"
+											v-if="$index != (options.length - 1)">↓</span>
+										                    </template>
 									                  </el-table-column>
-									<el-table-column label="操作">
-										<template #default="scope">
-											<div class="tableBtn greens" @click="deleteOption(scope.$index)">
-												删除
-											</div>
-										</template>
-									</el-table-column>
-							
+								<el-table-column label="操作">
+									<template #default="scope">
+										<div class="tableBtn greens" @click="deleteOption(scope.$index)">
+											删除
+										</div>
+									</template>
+								</el-table-column>
+
 							</el-table>
 
 							<el-button style="width: 100%; background-color: #3f9b6a; color: #fff" @click="addOption">+
@@ -342,701 +355,679 @@
 </template>
 
 <script>
-	import {
-		async
-	} from "q";
-	import axios from "axios";
-	import {
-		QuestionGetAll,
-		QuestionAdd,
-		QuestionEdit,
-		QuestionDel,
-	} from "../../api/question.js";
-	import upimg from "@/components/ImageUpload/index";
-	export default {
-		components: {
-			upimg,
-		},
-		data() {
-			return {
-				detbox: false, // 详情
-				currentPage: 1,
-				total: 10,
-				flag: false,
+import {
+	async
+} from "q";
+import axios from "axios";
+import {
+	QuestionGetAll,
+	QuestionAdd,
+	QuestionEdit,
+	QuestionDel,
+} from "../../api/question.js";
+import upimg from "@/components/ImageUpload/index";
+export default {
+	components: {
+		upimg,
+	},
+	data() {
+		return {
+			detbox: false, // 详情
+			currentPage: 1,
+			total: 10,
+			flag: false,
+			pageSize: 10,
+			ggXin: false,
+			formInline: {
+				tikuTitle: "",
+				questionType: "",
+				questionBank: "用户端题库",
+				isRequired: "必填",
+				maxChoose:0,
+				questionDescription: "",
+				optionSettings: {},
+			},
+			tableData: [],
+			secondData: {},
+			formSel: {
+				questionBank: "用户端题库",
+				tikuTitle: "",
+				questionType: "",
+				pageNumber: 0,
+				pageSize: 10,
+			},
+			pageindex: {
+				pageNumber: 0,
+				pageSize: 10,
+				questionBank: "用户端题库",
+			},
+			bainjiBox: false,
+			options: [],
+			labelStyle: {
+				width: "160px",
+			},
+			contentStyle: {
+				width: "246px",
+			},
+			rules: {
+				tikuTitle: [{
+					required: true,
+					message: "请输入题目",
+					trigger: "blur"
+				}],
+				questionType: [{
+					required: true,
+					message: "请选择题型",
+					trigger: "change"
+				},],
+				questionBank: [{
+					required: true,
+					message: "请选择所属题库",
+					trigger: "change"
+				},],
+				layoutType: [{
+					required: true,
+					message: "请选择布局类型",
+					trigger: "change"
+				},],
+				optionSettings: [{
+					required: true,
+					message: "请设置答案",
+					trigger: "change"
+				},],
+			},
+		};
+	},
+	computed: {},
+	mounted() {
+		this.getAll();
+	},
+	methods: {
+		chenge(val) {
+			this.formSel = {
+				questionBank: "用户端题库",
+				tikuTitle: "",
+				questionType: "",
+				pageNumber: 0,
 				pageSize: 10,
-				ggXin: false,
-				formInline: {
-					tikuTitle: "",
-					questionType: "",
-					questionBank: "用户端题库",
-					isRequired: "必填",
-					questionDescription: "",
-					optionSettings: {},
-				},
-				tableData: [],
-				secondData: {},
-				formSel: {
-					questionBank: "用户端题库",
-					tikuTitle: "",
-					questionType: "",
-					pageNumber: 0,
-					pageSize: 10,
-				},
-				pageindex: {
-					pageNumber: 0,
-					pageSize: 10,
-					questionBank: "用户端题库",
-				},
-				bainjiBox: false,
-				options: [],
-				labelStyle: {
-					width: "160px",
-				},
-				contentStyle: {
-					width: "246px",
-				},
-				rules: {
-					tikuTitle: [{
-						required: true,
-						message: "请输入题目",
-						trigger: "blur"
-					}],
-					questionType: [{
-						required: true,
-						message: "请选择题型",
-						trigger: "change"
-					}, ],
-					questionBank: [{
-						required: true,
-						message: "请选择所属题库",
-						trigger: "change"
-					}, ],
-					layoutType: [{
-						required: true,
-						message: "请选择布局类型",
-						trigger: "change"
-					}, ],
-					optionSettings: [{
-						required: true,
-						message: "请设置答案",
-						trigger: "change"
-					}, ],
-				},
 			};
 		},
-		computed: {},
-		mounted() {
-			this.getAll();
+		getAll() {
+			QuestionGetAll(this.pageindex).then((res) => {
+				this.tableData = res.data.content;
+				this.total = res.data.totalElements;
+			});
 		},
-		methods: {
-			chenge(val) {
-				this.formSel = {
-					questionBank: "用户端题库",
-					tikuTitle: "",
-					questionType: "",
-					pageNumber: 0,
-					pageSize: 10,
-				};
-			},
-			getAll() {
-				QuestionGetAll(this.pageindex).then((res) => {
-					this.tableData = res.data.content;
-					this.total = res.data.totalElements;
-				});
-			},
 
-			// 新增确定按钮
-			addCheck(val) {
-				this.$refs.reform.validate((valid) => {
-					if (valid) {
-						if (
-							this.formInline.questionType != "文本" &&
-							this.options.length == 0
-						) {
+		// 新增确定按钮
+		addCheck(val) {
+			this.$refs.reform.validate((valid) => {
+				if (valid) {
+					if (
+						this.formInline.questionType != "文本" &&
+						this.options.length == 0
+					) {
+						this.$message({
+							message: "请添加答案选项",
+						});
+						return;
+					}
+					for (let i = 0; i < this.options.length; i++) {
+						if (this.options[i].name == "") {
 							this.$message({
-								message: "请添加答案选项",
+								message: "答案选项不能为空",
 							});
 							return;
 						}
-						for (let i = 0; i < this.options.length; i++) {
-							if (this.options[i].name == "") {
-								this.$message({
-									message: "答案选项不能为空",
-								});
-								return;
-							}
-						}
-						let accumulator= {}
-						let fenshu = {}
-				this.options.forEach((item,index)=>{
-					accumulator[index] = item.name
-					fenshu[index] =  Number(item.num) || 0
-				})
-						// this.formInline.optionSettings = this.options.reduce(
-						// 	(accumulator, current) => {
-						// 		console.log(accumulator)
-						// 		accumulator[current.index].index = current.name;
-						// 		return accumulator;
-						// 	}, {},
-							
-						// ); // 初始化累加器为空对象
-						this.formInline.optionSettings = accumulator
-						this.formInline.score = fenshu
-						// this.formInline.score = this.options.reduce(
-						// 	(accumulator, current) => {
-						// 		accumulator[current.index] = Number(current.num);
-						// 		return accumulator;
-						// 	}, {}
-						// ); // 初始化累加器为空对象
-						// console.log(this.formInline.optionSettings,this.formInline.score)
-						// return
-						this.formInline.optionSettings = JSON.stringify(
-							this.formInline.optionSettings
-						);
-						this.formInline.score = JSON.stringify(this.formInline.score);
-						this.formInline.createDate = this.currentTime();
-						QuestionAdd(this.formInline).then((res) => {
-							this.$message({
-								message: "保存成功",
-								type: "success",
-							});
-							this.formInline = {
-								tikuTitle: "",
-								questionType: "",
-								questionBank: "用户端题库",
-								isRequired: "必填",
-								questionDescription: "",
-								optionSettings: {},
-							};
-							this.getAll();
+					}
+					let accumulator = {}
+					let fenshu = {}
+					this.options.forEach((item, index) => {
+						accumulator[index] = item.name
+						fenshu[index] = Number(item.num) || 0
+					})
+					this.formInline.optionSettings = accumulator
+					this.formInline.score = fenshu
+					this.formInline.optionSettings = JSON.stringify(
+						this.formInline.optionSettings
+					);
+					this.formInline.score = JSON.stringify(this.formInline.score);
+					this.formInline.createDate = this.currentTime();
+					QuestionAdd(this.formInline).then((res) => {
+						this.$message({
+							message: "保存成功",
+							type: "success",
 						});
+						this.formInline = {
+							tikuTitle: "",
+							questionType: "",
+							questionBank: "用户端题库",
+							isRequired: "必填",
+							questionDescription: "",
+							optionSettings: {},
+						};
+						this.getAll();
+					});
 
-						this.ggXin = false;
-					} else {
-						return false;
+					this.ggXin = false;
+				} else {
+					return false;
+				}
+			});
+		},
+		// 编辑确定
+		async bianCheck() {
+			this.$refs.bianform.validate((valid) => {
+				if (valid) {
+					if (
+						this.secondData.questionType != "文本" &&
+						this.options.length == 0
+					) {
+						this.$message({
+							message: "请添加答案选项",
+						});
+						return;
 					}
-				});
-			},
-			// 编辑确定
-			async bianCheck() {
-				this.$refs.bianform.validate((valid) => {
-					if (valid) {
-						if (
-							this.secondData.questionType != "文本" &&
-							this.options.length == 0
-						) {
+					for (let i = 0; i < this.options.length; i++) {
+						if (this.options[i].name == "") {
 							this.$message({
-								message: "请添加答案选项",
+								message: "答案选项不能为空",
 							});
 							return;
 						}
-						for (let i = 0; i < this.options.length; i++) {
-							if (this.options[i].name == "") {
-								this.$message({
-									message: "答案选项不能为空",
-								});
-								return;
-							}
-						}
-						let accumulator= {}
-						let fenshu ={}
-						this.options.forEach((item,index)=>{
-							
-							accumulator[index] = item.name
-							fenshu[index] =  Number(item.num) || 0
-						})
-							
-							
-						// this.secondData.score = fenshu
-						
-						// this.formInline.optionSettings = accumulator
-						// this.secondData.optionSettings = this.options.reduce(
-						// 	(accumulator, current) => {
-						// 		accumulator[current.index] = current.name;
-						// 		return accumulator;
-						// 	}, {}
-						// ); // 初始化累加器为空对象
-						// this.secondData.score = this.options.reduce(
-						// 	(accumulator, current) => {
-						// 		accumulator[current.index] = Number(current.num);
-						// 		return accumulator;
-						// 	}, {}
-						// ); // 初始化累加器为空对象
-
-						this.secondData.optionSettings = JSON.stringify(
-							accumulator
-						);
-						this.secondData.score = JSON.stringify(fenshu);
-					
-						QuestionEdit(this.secondData).then((res) => {
-							this.$message({
-								message: "保存成功",
-								type: "success",
-							});
-
-							this.getAll();
-						});
-
-						this.bainjiBox = false;
-					} else {
+					}
+					let accumulator = {}
+					let fenshu = {}
+					this.options.forEach((item, index) => {
+
+						accumulator[index] = item.name
+						fenshu[index] = Number(item.num) || 0
+					})
+					this.secondData.optionSettings = JSON.stringify(
+						accumulator
+					);
+					this.secondData.score = JSON.stringify(fenshu);
+
+					QuestionEdit(this.secondData).then((res) => {
 						this.$message({
-							message: "请填写完整信息",
-							type: "error",
+							message: "保存成功",
+							type: "success",
 						});
-						return false;
-					}
-				});
-			},
-			// 获取时间
-			currentTime() {
-				const date = new Date();
-				const year = date.getFullYear();
-				let month = date.getMonth() + 1; // 月份从0~11，所以加一
-				let day = date.getDate();
-				let hours = date.getHours();
-				let minutes = date.getMinutes();
-				let seconds = date.getSeconds();
-
-				// 为月、日、小时、分钟和秒添加前导零（如果需要）
-				month = month < 10 ? "0" + month : month;
-				day = day < 10 ? "0" + day : day;
-				hours = hours < 10 ? "0" + hours : hours;
-				minutes = minutes < 10 ? "0" + minutes : minutes;
-				seconds = seconds < 10 ? "0" + seconds : seconds;
-
-				// 返回格式化的日期和时间字符串
-				return `${year}-${month}-${day} ${hours}:${minutes}`;
-			},
 
-			// 详情
-			details(val, item) {
-				this.secondData = item;
+						this.getAll();
+					});
 
-				if (typeof item.optionSettings === "string") {
-					this.secondData.optionSettings = JSON.parse(item.optionSettings);
-				}
-				this.detbox = true;
-			},
-			addbuss(val, item) {
-				this.detbox = false;
-				this.ggXin = true;
-			},
-			handleSizeChange(val) {
-				this.pageSize = val;
-			},
-			handleCurrentChange(val) {
-				// this.currentPage = val
-				this.pageindex.pageNumber = val - 1;
-				QuestionGetAll(this.pageindex).then((res) => {
-					this.tableData = res.data.content;
-				});
-			},
-
-			closeFn(val) {
-				if (val == 1) {
-					this.ggXin = false;
-				} else {
 					this.bainjiBox = false;
-				}
-			},
-
-			// 查询按钮
-			async onSubmit() {
-				const res = await QuestionGetAll(this.formSel);
-				this.tableData = res.data.content;
-				this.total = res.data.totalElements;
-			},
-			// 重置按钮
-			resetting() {
-				this.formSel = {
-					questionBank: "用户端题库",
-					pageNumber: 0,
-					pageSize: 10,
-				};
-				this.currentPage = 1;
-				this.pageindex.pageNumber = 0;
-				this.getAll();
-			},
-			addOption() {
-				const newOption = {
-					index: this.options.length + 1,
-					name: "",
-					readonly: false,
-				};
-				this.options.push(newOption);
-			},
-			deleteOption(index) {
-				this.options.splice(index, 1);
-			},
-			bianls(item) {
-				let settings = null;
-				let socer = null;
-				if (typeof item.optionSettings !== "object") {
-					settings = JSON.parse(item.optionSettings);
-				} else {
-					settings = item.optionSettings;
-				}
-				if (typeof item.score !== "object") {
-					socer = JSON.parse(item.score);
 				} else {
-					socer = item.score;
+					this.$message({
+						message: "请填写完整信息",
+						type: "error",
+					});
+					return false;
 				}
-				const keys = Object.keys(settings);
-				this.options = keys.map((key) => ({
-					index: parseInt(key), // 将字符串键转换为整数
-					name: settings[key],
-					num: socer[key], // 添加 socer 的值
-				}));
-
-				this.bainjiBox = true;
-				this.secondData = item;
-			},
-			tikuDel(item) {
-				const h = this.$createElement;
-				this.$msgbox({
-					title: "消息",
-					message: h("p", null, [h("span", null, "是否删除 ")]),
-					showCancelButton: true,
-					showClose: false,
-					confirmButtonText: "确定",
-					cancelButtonText: "取消",
-					customClass: "oe-dialog-btn",
-					beforeClose: (action, instance, done) => {
-						if (action === "confirm") {
-							QuestionDel({
-								id: item.id,
-							}).then((res) => {
-								this.getAll();
-								done();
-							});
-						} else {
-							done();
-						}
-					},
-				});
-			},
-			async tikuBox(val) {
-				this.pageindex.questionBank = val;
+			});
+		},
+		// 获取时间
+		currentTime() {
+			const date = new Date();
+			const year = date.getFullYear();
+			let month = date.getMonth() + 1; // 月份从0~11，所以加一
+			let day = date.getDate();
+			let hours = date.getHours();
+			let minutes = date.getMinutes();
+			let seconds = date.getSeconds();
+
+			// 为月、日、小时、分钟和秒添加前导零（如果需要）
+			month = month < 10 ? "0" + month : month;
+			day = day < 10 ? "0" + day : day;
+			hours = hours < 10 ? "0" + hours : hours;
+			minutes = minutes < 10 ? "0" + minutes : minutes;
+			seconds = seconds < 10 ? "0" + seconds : seconds;
+
+			// 返回格式化的日期和时间字符串
+			return `${year}-${month}-${day} ${hours}:${minutes}`;
+		},
+
+		// 详情
+		details(val, item) {
+			this.secondData = item;
 
-				const res = await QuestionGetAll(this.pageindex);
+			if (typeof item.optionSettings === "string") {
+				this.secondData.optionSettings = JSON.parse(item.optionSettings);
+			}
+			this.detbox = true;
+		},
+		addbuss(val, item) {
+			this.detbox = false;
+			this.ggXin = true;
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+		},
+		handleCurrentChange(val) {
+			// this.currentPage = val
+			this.pageindex.pageNumber = val - 1;
+			QuestionGetAll(this.pageindex).then((res) => {
 				this.tableData = res.data.content;
-				this.total = res.data.totalElements;
-			},
-			addTimu() {
-				this.formInline = {
-					tikuTitle: "",
-					questionType: "",
-					questionBank: "用户端题库",
-					isRequired: "必填",
-					layoutType: 1,
-					questionDescription: "",
-					optionSettings: {},
-				};
-				this.options = [];
-				// this.$refs.reform.resetFields()
-				this.ggXin = true;
-			},
-			validateScore(row) {
-				// 如果输入的不是数字或者是NaN，则重置为1
-				if (isNaN(row.num) || row.num < 0) {
-					row.num = 0;
-				}
-				// 如果输入的数字大于100，则重置为100
-				if (row.num > 100) {
-					row.num = 100;
-				}
-			},
-			 answerMoveUp (index) {      
-			      [this.options[index],this.options[index-1]]=[this.options[index - 1],this.options[index]]
-			console.log(this.options[index])
-			this.options[index].index = index  - 1
-			      this.options.sort()
-			
-			
-			    },
-			    answerMoveDown (index) {
-			      [this.options[index],this.options[index+1]]=[this.options[index+1],this.options[index]]
-			this.options[index].index = index  + 1
-			      this.options.sort()
-			
-			    },
+			});
 		},
-	};
-</script>
-
-<style scoped>
-	.zhuti {
-		padding: 0 20px 20px 20px;
-		min-height: calc(100vh - 50px - 20px);
-		background-color: #fff;
-	}
 
-	.chengeXia {
-		border-bottom: 6px solid #3f9b6a;
-		padding-bottom: 4px;
-		color: #3f9b6a;
-	}
+		closeFn(val) {
+			if (val == 1) {
+				this.ggXin = false;
+			} else {
+				this.bainjiBox = false;
+			}
+		},
 
-	/deep/ .el-form-item__content {
-		line-height: 0;
-	}
+		// 查询按钮
+		async onSubmit() {
+			const res = await QuestionGetAll(this.formSel);
+			this.tableData = res.data.content;
+			this.total = res.data.totalElements;
+		},
+		// 重置按钮
+		resetting() {
+			this.formSel = {
+				questionBank: "用户端题库",
+				pageNumber: 0,
+				pageSize: 10,
+			};
+			this.currentPage = 1;
+			this.pageindex.pageNumber = 0;
+			this.getAll();
+		},
+		addOption() {
+			const newOption = {
+				index: this.options.length + 1,
+				name: "",
+				readonly: false,
+			};
+			this.options.push(newOption);
+		},
+		deleteOption(index) {
+			this.options.splice(index, 1);
+		},
+		bianls(item) {
+			let settings = null;
+			let socer = null;
+			if (typeof item.optionSettings !== "object") {
+				settings = JSON.parse(item.optionSettings);
+			} else {
+				settings = item.optionSettings;
+			}
+			if (typeof item.score !== "object") {
+				socer = JSON.parse(item.score);
+			} else {
+				socer = item.score;
+			}
+			console.log("我是点击后的数据",item)
+			const keys = Object.keys(settings);
+			this.options = keys.map((key) => ({
+				index: parseInt(key), // 将字符串键转换为整数
+				name: settings[key],
+				num: socer[key], // 添加 socer 的值
+			}));
+
+			this.bainjiBox = true;
+			//判断item.maxChoose是undefined的话，默认为0
+			
+			this.secondData = item;
+			this.secondData.maxChoose = item.maxChoose || 0;
+		},
+		tikuDel(item) {
+			const h = this.$createElement;
+			this.$msgbox({
+				title: "消息",
+				message: h("p", null, [h("span", null, "是否删除 ")]),
+				showCancelButton: true,
+				showClose: false,
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				customClass: "oe-dialog-btn",
+				beforeClose: (action, instance, done) => {
+					if (action === "confirm") {
+						QuestionDel({
+							id: item.id,
+						}).then((res) => {
+							this.getAll();
+							done();
+						});
+					} else {
+						done();
+					}
+				},
+			});
+		},
+		async tikuBox(val) {
+			this.pageindex.questionBank = val;
 
-	.tableBtn {
-		display: inline-block;
-		margin-right: 10px;
-		color: #acacac;
-		cursor: pointer;
-	}
+			const res = await QuestionGetAll(this.pageindex);
+			this.tableData = res.data.content;
+			this.total = res.data.totalElements;
+		},
+		addTimu() {
+			this.formInline = {
+				tikuTitle: "",
+				questionType: "",
+				questionBank: "用户端题库",
+				isRequired: "必填",
+				maxChoose: 0,
+				layoutType: 1,
+				questionDescription: "",
+				optionSettings: {},
+			};
+			this.options = [];
+			// this.$refs.reform.resetFields()
+			this.ggXin = true;
+		},
+		validateScore(row) {
+			// 如果输入的不是数字或者是NaN，则重置为1
+			if (isNaN(row.num) || row.num < 0) {
+				row.num = 0;
+			}
+			// 如果输入的数字大于100，则重置为100
+			if (row.num > 100) {
+				row.num = 100;
+			}
+		},
+		answerMoveUp(index) {
+			[this.options[index], this.options[index - 1]] = [this.options[index - 1], this.options[index]]
+			console.log(this.options[index])
+			this.options[index].index = index - 1
+			this.options.sort()
 
-	.formSearch {
-		display: flex;
-		width: 100%;
-		font-size: 14px;
-		justify-content: space-between;
-	}
 
-	.greens {
-		color: #3f9b6a;
-	}
+		},
+		answerMoveDown(index) {
+			[this.options[index], this.options[index + 1]] = [this.options[index + 1], this.options[index]]
+			this.options[index].index = index + 1
+			this.options.sort()
 
-	/deep/ .el-table__row {
-		font-size: 14px;
-		color: #000000e6;
-		height: 42px;
-	}
+		},
+	},
+};
+</script>
 
-	.fenye {
-		margin-top: 20px;
-		display: flex;
-		justify-content: flex-end;
+<style scoped>
+.zhuti {
+	padding: 0 20px 20px 20px;
+	min-height: calc(100vh - 50px - 20px);
+	background-color: #fff;
+}
+
+.chengeXia {
+	border-bottom: 6px solid #3f9b6a;
+	padding-bottom: 4px;
+	color: #3f9b6a;
+}
+
+/deep/ .el-form-item__content {
+	line-height: 0;
+}
+
+.tableBtn {
+	display: inline-block;
+	margin-right: 10px;
+	color: #acacac;
+	cursor: pointer;
+}
+
+.formSearch {
+	display: flex;
+	width: 100%;
+	font-size: 14px;
+	justify-content: space-between;
+}
+
+.greens {
+	color: #3f9b6a;
+}
+
+/deep/ .el-table__row {
+	font-size: 14px;
+	color: #000000e6;
+	height: 42px;
+}
+
+.fenye {
+	margin-top: 20px;
+	display: flex;
+	justify-content: flex-end;
+}
+
+/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+	background-color: #3f9b6a;
+}
+
+.el-row {
+	margin-bottom: 20px;
+
+	&:last-child {
+		margin-bottom: 0;
 	}
-
-	/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-		background-color: #3f9b6a;
+}
+
+.el-col {
+	border-radius: 4px;
+}
+
+.bg-purple-dark {
+	background: #99a9bf;
+}
+
+.bg-purple {
+	background: #d3dce6;
+}
+
+.bg-purple-light {
+	background: #e5e9f2;
+}
+
+.grid-content {
+	border-radius: 4px;
+	min-height: 36px;
+}
+
+.row-bg {
+	padding: 10px 0;
+	background-color: #f9fafc;
+}
+
+/deep/ .bg-purple[data-v-0e3fe4ec] {
+	background: #fff;
+	height: 50px;
+}
+
+/deep/ .bg-purple[data-v-3bebae82] {
+	background: #fff;
+	height: 50px;
+}
+
+::v-deep .bg-purple {
+	background: #fff;
+	height: 50px;
+}
+
+/deep/ .el-form--label-top .el-form-item__label {
+	padding: 0;
+}
+
+::v-deep .el-form-item {
+	margin-bottom: 16px;
+}
+
+.device-form .el-form-item__label::after {
+	content: "*";
+	color: #1a1a1a;
+	margin-left: 5px;
+	font-size: 16px;
+}
+
+::v-deep .el-dialog__wrapper {
+	.el-dialog__header {
+		background-color: #fafafa;
 	}
+}
+
+::v-deep .el-input__inner:focus {
+	border: #3f9b6a 1px solid;
+}
+
+.dialog-footer {
+	display: flex;
+	justify-content: flex-end;
+	border-top: solid rgba(209, 209, 209, 0.2) 2px;
+	padding-top: 20px;
+}
+
+::v-deep .el-input__inner:focus {
+	border: #3f9b6a 1px solid;
+}
+
+::v-deep .el-input__inner:hover {
+	border: #3f9b6a 1px solid;
+}
+
+::v-deep .el-select .el-input.is-focus .el-input__inner {
+	border-color: #3f9b6a;
+}
+
+.el-select-dropdown__item.selected {
+	color: #3f9b6a;
+}
+
+.el-pagination__sizes .el-input .el-input__inner:hover {
+	border-color: #3f9b6a;
+}
+
+::v-deep .el-dialog__wrapper {
+	.dialog_css {
+		margin-right: 12px;
+		margin-top: 61px !important;
 
-	.el-row {
-		margin-bottom: 20px;
-
-		&:last-child {
-			margin-bottom: 0;
+		.el-dialog__title {
+			font-size: 16px !important;
+			font-weight: 600;
+			color: #000;
 		}
 	}
 
-	.el-col {
-		border-radius: 4px;
-	}
-
-	.bg-purple-dark {
-		background: #99a9bf;
-	}
-
-	.bg-purple {
-		background: #d3dce6;
-	}
-
-	.bg-purple-light {
-		background: #e5e9f2;
-	}
-
-	.grid-content {
-		border-radius: 4px;
-		min-height: 36px;
-	}
-
-	.row-bg {
-		padding: 10px 0;
-		background-color: #f9fafc;
-	}
-
-	/deep/ .bg-purple[data-v-0e3fe4ec] {
-		background: #fff;
-		height: 50px;
-	}
-
-	/deep/ .bg-purple[data-v-3bebae82] {
-		background: #fff;
-		height: 50px;
-	}
-
-	::v-deep .bg-purple {
-		background: #fff;
-		height: 50px;
-	}
-
-	/deep/ .el-form--label-top .el-form-item__label {
-		padding: 0;
+	.diaslog_zhong {
+		margin-left: 25%;
+		margin-top: 61px !important;
 	}
+}
 
-	::v-deep .el-form-item {
-		margin-bottom: 16px;
-	}
+::v-deep .diaslog_zhong {
+	margin-left: 20%;
+	margin-top: 61px !important;
 
-	.device-form .el-form-item__label::after {
-		content: "*";
-		color: #1a1a1a;
-		margin-left: 5px;
-		font-size: 16px;
-	}
+	.el-dialog__header {
+		background-color: #fff;
+		border-bottom: 1px solid #efefef;
 
-	::v-deep .el-dialog__wrapper {
-		.el-dialog__header {
-			background-color: #fafafa;
+		.el-dialog__title {
+			font-size: 14px;
+			color: #000000e6;
 		}
 	}
 
-	::v-deep .el-input__inner:focus {
-		border: #3f9b6a 1px solid;
+	.el-dialog__body {
+		padding: 10px 30px 30px 20px;
 	}
+}
 
-	.dialog-footer {
-		display: flex;
-		justify-content: flex-end;
-		border-top: solid rgba(209, 209, 209, 0.2) 2px;
-		padding-top: 20px;
-	}
-
-	::v-deep .el-input__inner:focus {
-		border: #3f9b6a 1px solid;
-	}
+/deep/ .el-table_1_column_8 .hetong {
+	color: #7dbb9a;
+	text-decoration: underline;
+}
 
-	::v-deep .el-input__inner:hover {
-		border: #3f9b6a 1px solid;
-	}
+/deep/ .first-column-bg {
+	background-color: #fafafa !important;
+}
 
-	::v-deep .el-select .el-input.is-focus .el-input__inner {
-		border-color: #3f9b6a;
-	}
-
-	.el-select-dropdown__item.selected {
-		color: #3f9b6a;
-	}
+::v-deep .textarea {
+	width: 85%;
 
-	.el-pagination__sizes .el-input .el-input__inner:hover {
-		border-color: #3f9b6a;
+	.el-textarea__inner {
+		width: 100%;
 	}
+}
 
-	::v-deep .el-dialog__wrapper {
-		.dialog_css {
-			margin-right: 12px;
-			margin-top: 61px !important;
-
-			.el-dialog__title {
-				font-size: 16px !important;
-				font-weight: 600;
-				color: #000;
-			}
-		}
+::v-deep .pass_input {
+	width: 100%;
 
-		.diaslog_zhong {
-			margin-left: 25%;
-			margin-top: 61px !important;
-		}
+	.el-input__inner {
+		border: none;
+		padding: 0;
 	}
+}
 
-	::v-deep .diaslog_zhong {
-		margin-left: 20%;
-		margin-top: 61px !important;
-
-		.el-dialog__header {
-			background-color: #fff;
-			border-bottom: 1px solid #efefef;
+::v-deep .pass_select {
+	width: 100%;
 
-			.el-dialog__title {
-				font-size: 14px;
-				color: #000000e6;
-			}
-		}
-
-		.el-dialog__body {
-			padding: 10px 30px 30px 20px;
-		}
-	}
-
-	/deep/ .el-table_1_column_8 .hetong {
-		color: #7dbb9a;
-		text-decoration: underline;
-	}
-
-	/deep/ .first-column-bg {
-		background-color: #fafafa !important;
+	.el-input__inner {
+		border: none;
+		padding: 0;
 	}
 
-	::v-deep .textarea {
-		width: 85%;
-
-		.el-textarea__inner {
-			width: 100%;
-		}
+	.el-icon-arrow-up:before {
+		content: "";
 	}
-
-	::v-deep .pass_input {
-		width: 100%;
-
-		.el-input__inner {
-			border: none;
-			padding: 0;
-		}
+}
+
+/deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+	background-color: #fff;
+}
+/deep/ .el-input-number__decrease,/deep/.el-input-number__increase{
+	height: 30px !important;
+	line-height: 32px  !important;
+	margin-top: 3px;
+}
+</style>
+<style lang="scss" scoped>
+::v-deep .bian_css {
+	.el-dialog__header {
+		padding: 0px;
 	}
 
-	::v-deep .pass_select {
-		width: 100%;
-
-		.el-input__inner {
-			border: none;
-			padding: 0;
-		}
-
-		.el-icon-arrow-up:before {
-			content: "";
-		}
+	.el-input__inner {
+		height: 18px;
+		border: 0px;
+		margin-top: 0px;
 	}
 
-	/deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
-		background-color: #fff;
+	.el-input__inner:hover {
+		border: 0px;
 	}
-</style>
-<style lang="scss" scoped>
-	::v-deep .bian_css {
-		.el-dialog__header {
-			padding: 0px;
-		}
-
-		.el-input__inner {
-			height: 18px;
-			border: 0px;
-			margin-top: 0px;
-		}
-
-		.el-input__inner:hover {
-			border: 0px;
-		}
 
-		.el-input__inner:focus {
-			border: 0px;
-		}
+	.el-input__inner:focus {
+		border: 0px;
 	}
-
-	::v-deep .buttonHover:hover {
-		color: #3f9b6a !important;
-		border-color: #c5e1d2 !important;
-		background-color: #ecf5f0 !important;
-		outline: none;
+}
+
+::v-deep .buttonHover:hover {
+	color: #3f9b6a !important;
+	border-color: #c5e1d2 !important;
+	background-color: #ecf5f0 !important;
+	outline: none;
+}
+
+::v-deep .el-pagination__total {
+	position: absolute;
+	left: 33px;
+}
+
+::v-deep .diaslog_zhong {
+	.el-dialog__body {
+		padding: 10px 20px 20px 20px;
 	}
 
-	::v-deep .el-pagination__total {
-		position: absolute;
-		left: 33px;
+	.el-upload--picture-card {
+		width: 130px;
+		height: 130px;
 	}
+}
 
-	::v-deep .diaslog_zhong {
-		.el-dialog__body {
-			padding: 10px 20px 20px 20px;
-		}
-
-		.el-upload--picture-card {
-			width: 130px;
-			height: 130px;
-		}
-	}
 </style>
\ No newline at end of file
diff --git a/wenjuan/.DS_Store b/wenjuan/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/wenjuan/.DS_Store