mod:问卷相关逻辑调整

package.json

@@ -59,7 +59,7 @@
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "pinia": "2.0.22",
-    "qrcode": "^1.5.3",
+    "qrcode": "^1.5.4",
     "qrcodejs2": "^0.0.2",
     "qrcodejs2-fix": "^0.0.1",
     "sortablejs": "^1.15.1",

src/views/main/patientFile/patientFileList/config/search.config.js

@@ -11,14 +11,14 @@ export const searchFormConfig = {
     {
       field: 'name',
       type: 'input',
-      label: '患者姓名',
-      placeholder: '请输入患者姓名'
+      label: '姓名',
+      placeholder: '请输入姓名'
     },
     {
       field: 'phoneNumber',
       type: 'input',
-      label: '患者手机号',
-      placeholder: '请输入患者手机号'
+      label: '手机号',
+      placeholder: '请输入手机号（全部）'
     },
     {
       field: 'label',

src/views/main/questionnaireManagement/fillOut.vue

@@ -168,7 +168,7 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
 	surveyId: {
 		type: Number,
-		default:2
+		default: 0
 	},
 	userId: {
 		type: String,
@@ -232,8 +232,9 @@ const buttDis = ref(true);
 
 // 获取初始化数据
 const getData = () => {
-
-	if ((query.user && query.user !== '-1') || props.userId ) {
+	console.log(query.user, props.userId, 'query.user');
+	if ((query.user && query.user !== '-1') || props.userId) {
+		
 		getPageListData(`/survey/survey/getdetail?id=${props.surveyId || query.id}&user=${props.userId || query.user}`).then(({ data }) => {
 
 			for (const val of data.questionlist) {
@@ -258,7 +259,7 @@ const getData = () => {
 			Fingerprint2.get(async (components) => {
 				const values = components.map(component => component.value);
 				const murmur = Fingerprint2.x64hash128(values.join(''), 31);
-
+				
 				// 获取微信头像与昵称 
 				if (query.code) {
 					await getPageListData('/wechat/getopenid', {
@@ -302,12 +303,14 @@ const getData = () => {
 					}
 
 					formData.value = data;
-
+					console.log(isEnd(formData.value), 'isEnd(formData.value)');
 					// 不是进行中的问卷 全部隐藏
 					if (isEnd(formData.value) !== '进行中' && query.user !== '-1') {
 						return;
 					}
 
+					
+					
 					// 判断 只能微信填写 没有进行微信授权 该用户没有填写
 					if (formData.value.setting === 1 && query.code === undefined && formData.value.existanswer !== 1) {
 						const appid = 'wxe8b06998505853d2';
@@ -497,21 +500,28 @@ function clear() {
 // 判断状态
 function isEnd(data) {
 	let oldTime = new Date(data.starttime).getTime();
-	let newTime = new Date(data.endtime).getTime();
-	let time = new Date().getTime();
+		let newTime = new Date(data.endtime).getTime();
+		let time = new Date().getTime();
+		
 
 
-	if (!data.endtime || !data.starttime) {
-		return '未发布';
-	}
+		if (data.active === 0) {
+			return '停用';
+		} 
+		if (!data.active) {
+			return '未发布';
+		}
+		if (data.active === 2) {
+			return '进行中';
+		}
 
-	if (time < oldTime) {
-		return '未开始';
-	} else if (time > newTime) {
-		return '已结束';
-	} else if (time > oldTime && time < newTime) {
-		return '进行中';
-	}
+		if (time < oldTime) {
+			return '未开始';
+		} else if (time > newTime) {
+			return '已结束';
+		} else if (time > oldTime && time < newTime) {
+			return '进行中';
+		}
 }
 
 // 获取域名

src/views/main/questionnaireManagement/statisticalAnalysis.vue

@@ -2,10 +2,10 @@
 	<div class="app">
 		<div class="center">
 			<div class="title">
-				<div>教育类调查问卷</div>
+				<div>{{ ysData.title }}</div>
 				<div>
 					<div>
-						<div>更新时间：{{ysData.createtime}}</div>
+						<div>{{ysData.createtime}}</div>
 						<div>注：以下针对整体数据进行分析，共{{ysData.answercount || 0}}份答卷</div>
 					</div>
 					<div>
@@ -75,7 +75,7 @@
 		if (props.surveyId) {
 			surveyId = props.surveyId
 		}
-		getPageListData(`/survey/survey/answerstatis/2`).then(({data})=>{
+		getPageListData(`/survey/survey/answerstatis/${surveyId}`).then(({data})=>{
 			ysData.value = data;
 			const arr = [];
 			

src/views/main/questionnaireManagement/survey/survey.vue

@@ -14,9 +14,9 @@
 						placeholder="请输入发布日期" />
 				</div>
 				<div style="width: 240px;">
-					<el-select v-model="scarData.active" placeholder="发布状态" style="width: 240px">
+					<el-select v-model="scarData.active" clearable placeholder="发布状态" style="width: 240px">
 						<el-option label="进行中" value="1" />
-						<el-option label="已结束" value="2" />
+						<el-option label="停用/已结束" value="2" />
 						<el-option label="未发布" value="3" />
 					</el-select>
 				</div>
@@ -93,7 +93,24 @@
 					</div>
 				</div>
 			</div>
+			
 		</div>
+		<div class="page" style="background-color: #fff;height: 50px;padding: 10px;">
+			<el-pagination
+			style="float: right;margin-right: 10px;"
+				v-model:current-page="scarData.pageNum"
+				v-model:page-size="scarData.pageSize"
+				:page-sizes="[10, 30, 50, 100]"
+				:size="size"
+				:disabled="disabled"
+				:background="background"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="page.total"
+				@size-change="handleSizeChange"
+				@current-change="handleCurrentChange"
+			/>
+		</div>
+		
 
 
 		<!-- 弹出框 -->
@@ -166,13 +183,13 @@
 	</div>
 </template>
 
-<script setup>
-	import { ref, getCurrentInstance } from 'vue';
+<script setup name="Survey">
+	import { ref, getCurrentInstance, reactive, onActivated } from 'vue';
 
 	import { useRouter } from 'vue-router';
 	const router = useRouter();
 	import moment from 'moment';
-	import QRCode from 'qrcodejs2-fix';
+	import QRCode from 'qrcode';
 
 	import request from '@/utils/request'
 	import { download } from '@/utils/request'
@@ -184,13 +201,18 @@
 	const table = ref({})
 
 	// 表格数据
-	const dataList = ref([]);;
+	const dataList = ref([]);
+	const page = reactive({
+		total: 0,
+	});
 
 	// 搜索数据
 	const scarData = ref({
 		title: '',
 		createtime: '',
-		active: ''
+		active: '',
+		pageNum: 1,
+		pageSize: 10,
 	});
 
 	// 用户弹出框
@@ -215,7 +237,7 @@
 
 	// 获取列表
 	const getListData = (() => {
-		return (function fn(page) {
+		return (function fn() {
 			dataList.value = [];
 			console.log(scarData.value)
 			// scarData.value.createtime = moment(scarData.value.createtime).format('YYYY-MM-DD')
@@ -225,34 +247,36 @@
 			const params = scarData.value
 			getPageListData(`/survey/survey`, params).then(({ data, total }) => {
 				dataList.value = data;
+				console.log(total, 'total')
+				page.total = total;
 			});
 			return fn;
 		})();
 	})();
 
-	// 二维码下载
-	function dowQR(v) {
-		const el = document.getElementById(`pageQR_${v.surveyId}`);
-		el.innerHTML = '';
-
-		new QRCode(el, {
-			text: returnCopyData(v), //二维码内容字符串
-			width: 128, //图像宽度
-			height: 128, //图像高度
-			colorDark: '#000000', //二维码前景色
-			colorLight: '#ffffff', //二维码背景色
-			correctLevel: QRCode.CorrectLevel.H, //容错级别
-		})
+	const handleSizeChange = (val) => {
+		scarData.value.pageSize = val;
+		getListData();
+	}
 
-		let img = document.querySelectorAll(`#pageQR_${v.surveyId} img`)[0];
-		img.onload = () => {
-			let a = document.createElement('a');
-			a.setAttribute('href', img.src);
-			a.download = '二维码.png';
-			a.click();
+	const handleCurrentChange = (val) => {
+		scarData.value.pageNum = val;
+		getListData();
+	}
 
-			a.remove();
-		}
+	// 二维码下载
+	async function dowQR(v) {
+		const img = await QRCode.toDataURL(returnCopyData(v), {
+			width: 200,
+			margin: 2,
+		});
+
+		console.log(img, 'img');
+		let a = document.createElement('a');
+		a.setAttribute('href', img);
+		a.download = '二维码.png';
+		a.click();
+		a.remove();
 
 	}
 
@@ -439,11 +463,18 @@
 		let oldTime = new Date(data.starttime).getTime();
 		let newTime = new Date(data.endtime).getTime();
 		let time = new Date().getTime();
+		
 
 
-		if (!data.endtime || !data.starttime) {
+		if (data.active === 0) {
+			return '停用';
+		} 
+		if (!data.active) {
 			return '未发布';
 		}
+		if (data.active === 2) {
+			return '进行中';
+		}
 
 		if (time < oldTime) {
 			return '未开始';
@@ -454,6 +485,12 @@
 		}
 	}
 
+	// 页面跳转过来，特定场景刷新
+	onActivated(() => {
+		
+		getListData();
+	});
+
 </script>
 
 <style scoped lang="scss">

src/views/main/questionnaireManagement/surveyAdd.vue

@@ -348,18 +348,11 @@
 			}
 		}
 
-		if(type === 'edit'){
-			createPageData('/survey/survey' , contentDatas.value ).then(()=>{
-				proxy.$modal.msgSuccess('编辑成功！');
-				router.back();
-			}) 
-		}
-		if(type === 'add' || type === 'copy'){
-			createPageData('/survey/survey' , contentDatas.value ).then(()=>{
-				proxy.$modal.msgSuccess('添加成功！');
-				router.back();
-			})
-		}
+		createPageData('/survey/survey' , contentDatas.value ).then(()=>{
+			proxy.$modal.msgSuccess((type === 'add' || type === 'copy') ? '添加功！' : '编辑成功！');
+			// router.back();
+			router.push(`/questionnaireManagement/survey?asyc=${new Date().getTime()}`)
+		})
 	}
 </script>