修改bug

src/views/kc/wjxWjxxTmlb/WjxWjxxTmlb.data.ts

@@ -101,19 +101,24 @@ export const wjxWjxxTmxxColumns: JVxeColumn[] = [
       title: '选项',
       key: 'itemTitle',
       type: JVxeTypes.text,
-      width:"200px",
       placeholder: '请输入${title}',
       defaultValue:'',
         validateRules: [
           { required: true, message: '${title}不能为空' },
         ],
     },
+    
     {
       title: '正确答案',
       key: 'itemSelected',
-      type: JVxeTypes.text,
-      width:"200px",
+      type: JVxeTypes.select,
+      width:"100px",
       placeholder: '请输入${title}',
       defaultValue:'',
+      // 下拉选项
+      options: [
+        { title: '正确', value: 'true' },
+        { title: '错误', value: 'false' },
+      ],
     },
   ]

src/views/kc/wjxWjxxTmlb/YinyongTikuList.vue

@@ -12,7 +12,7 @@
           <a-col :lg="7">
             <a-form-item label="题目类型">
               <!-- <JDictSelectTag placeholder="请选择" v-model:value="queryParam.wjSytype" dictCode="yn" /> -->
-              <a-select placeholder="请选择题目类型" ref="select" v-model:value="queryParam.qpublish">
+              <a-select placeholder="请选择题目类型" ref="select" v-model:value="queryParam.wjType">
                 <a-select-option value="">全部</a-select-option>
                 <a-select-option value="3">单选</a-select-option>
                 <a-select-option value="4">多选</a-select-option>

src/views/kc/wjxWjxxTmlb/components/WjxWjxxTmlbForm.vue

@@ -2,31 +2,26 @@
   <a-spin :spinning="loading">
     <a-form v-bind="formItemLayout">
       <a-row>
-        <!-- <a-col :span="24">
-          <a-form-item label="题目编号" v-bind="validateInfos.wjIndex">
-	          <a-input-number v-model:value="formData.wjIndex" placeholder="请输入题目编号" style="width: 100%" :disabled="disabled"/>
-          </a-form-item>
-        </a-col> -->
         <a-col :span="12">
-          <a-form-item label="问题标题" v-bind="validateInfos.wjTitle">
-            <a-input v-model:value="formData.wjTitle" placeholder="请输入问题标题" :disabled="disabled"></a-input>
+          <a-form-item label="题干" v-bind="validateInfos.wjTitle">
+            <a-input v-model:value="formData.wjTitle" placeholder="请输入题干" :disabled="disabled"></a-input>
           </a-form-item>
         </a-col>
-        <!-- <a-col :span="24">
-          <a-form-item label="是否必填" v-bind="validateInfos.isRequir">
-            <a-input v-model:value="formData.isRequir" placeholder="请输入是否必填" :disabled="disabled"></a-input>
-          </a-form-item>
-        </a-col> -->
         <a-col :span="12">
           <a-form-item label="问题分值" v-bind="validateInfos.wjScore">
 	          <a-input-number v-model:value="formData.wjScore" placeholder="请输入问题分值" style="width: 100%" :disabled="disabled"/>
           </a-form-item>
         </a-col>
+        <a-col :span="12" v-if="formData.wjAnswer">
+          <a-form-item label="正确答案" >
+	          <a-input-number v-model:value="formData.wjAnswer" placeholder="请输入正确答案" style="width: 100%" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
       </a-row>
     </a-form>
 
 		<!-- 子表单区域 -->
-    <a-tabs v-model:activeKey="activeKey" animated>
+    <a-tabs v-model:activeKey="activeKey" animated v-if="!formData.wjAnswer">
       <a-tab-pane tab="选项信息" key="wjxWjxxTmxx" :forceRender="true">
         <j-vxe-table
           :keep-source="true"
@@ -38,7 +33,7 @@
           :height="340"
           :disabled="disabled"
           :rowNumber="true"
-          :rowSelection="true"
+          :rowSelection="false"
           :toolbar="false"/>
       </a-tab-pane>
     </a-tabs>

src/views/zy/zyInfoStudent/ZyCdxxList.vue

@@ -0,0 +1,225 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="8">
+            <a-form-item label="作业名称">
+              <a-input placeholder="请输入作业名称" v-model:value="queryParam.zyname"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="8">
+            <a-form-item label="存档类型">
+              <JDictSelectTag v-model:value="queryParam.cdlx" dictCode="cdlx" placeholder="请选择" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" style="margin-top: 20px;">
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" />
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+
+      <template #wwsftgaction="{text,record}">
+        <span v-if="record.wwcc=='0'">-</span>
+        <span v-else>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.wwxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.wwxsl}}%</span>
+          <span v-else>
+            <span v-if="record.filePath">检测中</span>
+            <span v-else>未提交</span>
+          </span>
+        </span>
+      </template>
+      <template #nwsftgaction="{text,record}">
+        <span v-if="record.nwcc=='0'">-</span>
+        <span v-else>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.nwxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.nwxsl}}%</span>
+          <span v-else>
+            <span v-if="record.filePath">检测中</span>
+            <span v-else>未提交</span>
+          </span>
+        </span>
+      </template>
+      <template #aigcsftgaction="{text,record}">
+        <span v-if="record.aigccc=='0'">-</span>
+        <span v-else>
+          <span v-if="text=='通过'" style="color: green;padding: 5px 15px;" title="通过">{{record.aigcxsl}}%</span>
+          <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;" title="未通过">{{record.aigcxsl}}%</span>
+          <span v-else>
+            <span v-if="record.filePath">检测中</span>
+            <span v-else>未提交</span>
+          </span>
+        </span>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ZyInfoStudentModal ref="registerModal" @success="handleSuccess"></ZyInfoStudentModal>
+    <ZyInfoStudentScoreModal ref="registerScoreModal" @success="handleSuccess"></ZyInfoStudentScoreModal>
+    <SzybStudentModal ref="SzybStudentModalpage" @success="handleSuccess"></SzybStudentModal>
+  </div>
+</template>
+
+<script lang="ts" name="zyInfoStudent-zyInfoStudent" setup>
+  import { ref, reactive,defineExpose,unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { cdxxcolumns } from './ZyInfoStudent.data';
+  import { cdxxlist, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ZyInfoStudent.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import ZyInfoStudentModal from './components/ZyInfoStudentModal.vue'
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import SzybStudentModal from '/@/views/zy/zyInfoStudent/components/SzybStudentModal.vue';
+  import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+  import ZyInfoStudentScoreModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue'
+  import { useGlobSetting } from '/@/hooks/setting';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { useRouter } from 'vue-router';
+  import { useUserStore } from '/@/store/modules/user';
+
+  const { createMessage } = useMessage();
+
+  //当前路由信息
+  const { currentRoute } = useRouter();
+  const { query } = unref(currentRoute);
+  const { rwbh,xqxn,type } = query;//获取传递参数
+  const userStore = useUserStore();
+  const globSetting = useGlobSetting();
+  const baseApiUrl = globSetting.domainUrl;
+
+  const queryParam = ref<any>({xqxn,teacherNo:userStore.getUserInfo.username});
+  const mainId = ref<string>('');
+
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const registerScoreModal = ref();
+  const SzybStudentModalpage = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      api: cdxxlist,
+      columns: cdxxcolumns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: '120px',
+        // fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        params.column = '',params.order = '';//新生成的默认不带排序
+        return Object.assign(params, queryParam.value);
+      },
+    },
+    exportConfig: {
+      name: "学生提交作业",
+      url: getExportUrl,
+    },
+	importConfig: {
+	  url: getImportUrl,
+	  success: handleSuccess
+	},
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  function yulanFile(record){
+
+    var url2 = getFileAccessHttpUrl(record.pdfPath)
+    let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2);
+    window.open(url,"_blank")
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    reload();
+  }
+
+  function handleDown(record){
+    downloadFile(record.filePath);
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+        var list = [
+          {
+              label: '下载',
+              onClick: handleDown.bind(null, record),
+            },
+          {
+            label: '预览',
+            onClick: yulanFile.bind(null, record),
+          }
+        ];
+        return list;
+  }
+
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    queryParam.value = {};
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>

src/views/zy/zyInfoStudent/components/SzybStudentForm.vue

@@ -0,0 +1,140 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24" style="margin-top:30px;">
+          <a-form-item label="存档类型" v-bind="validateInfos.cdlx">
+            <JDictSelectTag v-model:value="formData.cdlx" dictCode="cdlx" placeholder="请选择" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import { editCdlx  } from '../ZyInfoStudent.api';
+  import { Form } from 'ant-design-vue';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+const { createConfirm } = useMessage();
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    cdlx: '',
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    createConfirm({
+      iconType: 'warning',
+      title: '确认提交',
+      content: '是否确认提交数据',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => {
+        editCdlx(model, isUpdate.value)
+          .then((res) => {
+            if (res.success) {
+              createMessage.success(res.message);
+              emit('ok');
+            } else {
+              createMessage.warning(res.message);
+            }
+          })
+          .finally(() => {
+            confirmLoading.value = false;
+          });
+      }
+    });
+
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 300px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>

src/views/zy/zyInfoStudent/components/SzybStudentModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <SzybStudentForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></SzybStudentForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import SzybStudentForm from './SzybStudentForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>