+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -62,6 +72,8 @@ import { list, getExportUrl } from './WjxWjxxTmlbDjjgs.api';
import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue';
import ZgtpfModal from '/@/views/kc/wjxWjxx/components/ZgtpfModal.vue';
+const wgxxOpen = ref(false)
+const wgxxData = ref([])
const queryParam = ref
({});
const isFinished = ref('');
const toggleSearchStatus = ref(false);
@@ -162,6 +174,14 @@ function handleHqjg(record){
})
}
+async function handleWeiGui(info){
+ wgxxData.value = []
+ let res = await defHttp.get({ url: '/wjxDjxxFzbtj/wjxDjxxFzbtj/list', params: { vid: info.vid, createBy: info.userId, pageNo: 1, pageSize: -1 } });
+ console.log("🎅 ~ handleWeiGui ~ res:", res)
+ wgxxData.value = res.records
+ wgxxOpen.value = true
+}
+
/**
* 操作栏
*/
@@ -172,6 +192,11 @@ function getTableAction(record) {
label: '答卷结果',
onClick: handlePeizhiDjjg.bind(null, record),
},
+ {
+ label: '违规信息',
+ onClick: handleWeiGui.bind(null, record),
+ ifShow:record.zbcs > 0
+ },
// {
// label: '获取结果',
// onClick: handleHqjg.bind(null, record),
@@ -220,4 +245,50 @@ defineExpose({
text-align: center;
}
}
+
+.timeline {
+ position: relative;
+ padding-left: 40px; /* 调整左侧内边距以适应新的时间点位置 */
+ padding-bottom: 20px;
+}
+
+.timeline::before {
+ content: '';
+ position: absolute;
+ width: 2px; /* 灰线变细 */
+ height: calc(100% - 40px);
+ background-color: #dfe1e6;
+ top: 8px; /* 确保灰线上下有适当的间距 */
+ bottom: 8px; /* 确保灰线下方也有相同的间距 */
+ left: 55px; /* 让灰线从时间点的中心穿过：14px (时间点左边距) + 6px (时间点半径) = 20px */
+ z-index: 1;
+}
+
+.timeline-item {
+ margin-top: 25px;
+ margin-bottom: 25px;
+ position: relative;
+}
+
+.timeline-item:last-child {
+ margin-bottom: 0;
+}
+
+.timeline-point {
+ width: 10px; /* 圆点大小 */
+ height: 10px; /* 圆点大小 */
+ background-color: #1890ff;
+ border-radius: 50%;
+ position: absolute;
+ top: 4px; /* 保持时间点的垂直位置以对齐文本 */
+ left: 17px; /* 设置时间点距离左边界的距离，使其中心与灰线对齐 */
+ transform: translateX(-50%); /* 将时间点中心对齐灰线 */
+ z-index: 2;
+ box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2); /* 添加阴影效果 */
+}
+
+.timeline-content {
+ padding-left: 28px; /* 减少左侧内边距，使内容更贴近时间点 */
+ line-height: 1.5715; /* 设置行高，确保文本对齐 */
+}
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index 02b552b..6c8730c 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -941,10 +941,15 @@ async function handleBohui(record: Recordable) {
okText: '确认',
cancelText: '取消',
onOk: async () => {
- let stuZyIds = await defHttp.post({ url: '/zyInfoStudent/zyInfoStudent/getZyStuIdById', data: { zyinfoId: record.mainId, xh: record.createBy } })
- stuZyIds.forEach(async stu => {
- await defHttp.post({ url: '/zyInfoStudent/zyInfoStudent/editBohui', params: { id: stu.id } })
- })
+ let zyinfo = await defHttp.get({ url: '/zyInfo/zyInfo/queryById', params: { id: record.mainId } })
+ if(zyinfo.xzxstjzy == 'Y'){
+ let stuZyIds = await defHttp.post({ url: '/zyInfoStudent/zyInfoStudent/getZyStuIdById', data: { zyinfoId: record.mainId, xh: record.createBy } })
+ stuZyIds.forEach(async stu => {
+ await defHttp.post({ url: '/zyInfoStudent/zyInfoStudent/editBohui', params: { id: stu.id } })
+ })
+ }else{
+ await defHttp.post({ url: '/zyInfoStudent/zyInfoStudent/editBohui', params: { id: record.id } })
+ }
createMessage.success('作业驳回成功!')
handleSuccess();
},
@@ -1388,14 +1393,7 @@ async function submitForm() {
return;
}
}
- } else {
- //如果不进行查重，则强制清空查重配置数据
- model.wwtgl = null;
- model.wwcc = null;
- model.xncc = null;
- model.nwcc = null;
- model.aigccc = null;
- }
+ }
var xshpkssj = model.xshpkssj;
var xshpjssj = model.xshpjssj;
@@ -1430,7 +1428,6 @@ async function submitForm() {
return;
}
}
-
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {