Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx
This commit is contained in:
commit
02edf3fd4e
|
@ -65,9 +65,9 @@
|
|||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">预览题目</a-button>
|
||||
<a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">发布试卷</a-button>
|
||||
<a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">删除试卷</a-button>
|
||||
<a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">试卷详情</a-button>
|
||||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">预览题目</a-button>
|
||||
<a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">测验结果</a-button>
|
||||
<a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">试卷详情</a-button>
|
||||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">预览题目</a-button>
|
||||
<a-button type="primary" @click="handleDjjgs(item,'')" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">测验结果</a-button>
|
||||
</a-col>
|
||||
<!-- <a-col :span="24" style="text-align:center;margin-top:20px;">-->
|
||||
<!-- <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">答卷</a-button>-->
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :lg="7">
|
||||
<a-form-item label="测验名称">
|
||||
<a-input placeholder="请输入测验名称" v-model:value="queryParam.title"></a-input>
|
||||
<j-input placeholder="请输入测验名称" v-model:value="queryParam.title"></j-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="7">
|
||||
|
@ -15,6 +15,7 @@
|
|||
<a-select-option value="">全部</a-select-option>
|
||||
<a-select-option value="0">待发布</a-select-option>
|
||||
<a-select-option value="1">已发布</a-select-option>
|
||||
<a-select-option value="2">已完成</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
@ -61,6 +62,7 @@ import WjxWjxxTmlbDjModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjModa
|
|||
import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
|
||||
import WjxWjxxTmlbDjjgsModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue'
|
||||
import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
|
||||
import { JInput } from '/@/components/Form';
|
||||
import {useRouter} from "vue-router";
|
||||
|
||||
//当前路由信息
|
||||
|
@ -210,7 +212,7 @@ function handleSuccess() {
|
|||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record) {
|
||||
if(record.qpublish == '1'){
|
||||
if(record.qpublish == '1' || record.qpublish == '2'){
|
||||
return [
|
||||
{
|
||||
label: '详情',
|
||||
|
|
|
@ -64,9 +64,9 @@
|
|||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">问卷预览</a-button>
|
||||
<a-button type="primary" @click="handleFabu(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">发布问卷</a-button>
|
||||
<a-button type="primary" @click="handleDelete(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==0">删除问卷</a-button>
|
||||
<a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">问卷详情</a-button>
|
||||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">问卷预览</a-button>
|
||||
<!-- <a-button type="primary" @click="handleDjjgs(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">结果</a-button>-->
|
||||
<a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷详情</a-button>
|
||||
<a-button type="primary" @click="handlePeizhiXq(item)" style="margin-left:5px;margin-bottom:5px;padding: 0px 4px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷预览</a-button>
|
||||
<a-button type="primary" @click="handleDjjgs(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1||item.qpublish==2">问卷结果</a-button>
|
||||
</a-col>
|
||||
<!-- <a-col :span="24" style="text-align:center;margin-top:20px;">-->
|
||||
<!-- <a-button type="primary" @click="handleDj(item)" style="margin-left:5px;padding: 0px 8px;background:rgb(28, 132, 198);" v-if="item.qpublish==1">答卷</a-button>-->
|
||||
|
@ -107,7 +107,6 @@
|
|||
import WjxWjxxTmlbDjjgsDcModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue'
|
||||
import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
|
||||
import {useRouter} from "vue-router";
|
||||
import { JInput } from '/@/components/Form';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import {useMessage} from "/@/hooks/web/useMessage";
|
||||
import TikuListModal from '/@/views/kc/wjxWjxxTmlb/TikuListModal.vue';
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<a-row :gutter="24">
|
||||
<a-col :lg="7">
|
||||
<a-form-item label="测验名称">
|
||||
<a-input placeholder="请输入测验名称" v-model:value="queryParam.title"></a-input>
|
||||
<j-input placeholder="请输入测验名称" v-model:value="queryParam.title"></j-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="7">
|
||||
|
@ -15,6 +15,7 @@
|
|||
<a-select-option value="">全部</a-select-option>
|
||||
<a-select-option value="0">未发布</a-select-option>
|
||||
<a-select-option value="1">已发布</a-select-option>
|
||||
<a-select-option value="2">已完成</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
@ -61,6 +62,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
|
|||
import WjxWjxxTmlbDjjgModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgModal.vue'
|
||||
import WjxWjxxTmlbDjjgsDcModal from '/@/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsDcModal.vue'
|
||||
import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue';
|
||||
import { JInput } from '/@/components/Form';
|
||||
import {useRouter} from "vue-router";
|
||||
|
||||
//当前路由信息
|
||||
|
@ -210,7 +212,7 @@ import {ref, reactive, defineExpose, unref} from 'vue';
|
|||
* 操作栏
|
||||
*/
|
||||
function getTableAction(record) {
|
||||
if(record.qpublish == '1'){
|
||||
if(record.qpublish == '1' || record.qpublish == '2'){
|
||||
return [
|
||||
{
|
||||
label: '详情',
|
||||
|
|
Loading…
Reference in New Issue