Compare commits

...

5 Commits
dev-cl ... main

Author SHA1 Message Date
qsh e449f1a124 sc 5 days ago
qsh 80b8eddd35 sc 6 days ago
qsh 6359913c2c sc 2 weeks ago
qsh cff96918ce sc 2 weeks ago
qsh f5b7a77fb0 sc 3 weeks ago
  1. 1
      package.json
  2. 0
      src/api/uav/clue.js
  3. 8
      src/api/uav/record.js
  4. 58
      src/components/Editor/src/Editor.vue
  5. 6
      src/main.js
  6. 34
      src/views/ExamVenue/Calendar/index.vue
  7. 283
      src/views/ExamVenue/Room/index.vue
  8. 168
      src/views/JoinUs/Coach/index.vue
  9. 329
      src/views/JoinUs/Station/index.vue
  10. 6
      src/views/Question/UAV/Components/QuestionAddForm.vue
  11. 4
      src/views/Question/UAV/index.vue
  12. 10
      src/views/Question/UAVChapter/index.vue
  13. 30
      src/views/UAVClue/StudyRecord/components/Practice.vue
  14. 19
      yarn.lock

@ -39,6 +39,7 @@
"@vueuse/core": "^10.1.2", "@vueuse/core": "^10.1.2",
"@wangeditor/editor": "^5.1.23", "@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.10", "@wangeditor/editor-for-vue": "^5.1.10",
"@wangeditor/plugin-upload-attachment": "^1.1.0",
"@zxcvbn-ts/core": "^3.0.1", "@zxcvbn-ts/core": "^3.0.1",
"animate.css": "^4.1.1", "animate.css": "^4.1.1",
"axios": "^1.4.0", "axios": "^1.4.0",

@ -0,0 +1,8 @@
import request from '@/config/axios'
export const searchStudyRecords = async (data) => {
return await request.post({
url: 'wrj-api/wrjQuestionPractice/query',
data
})
}

@ -42,7 +42,11 @@ const props = defineProps({
'undo', // 'undo', //
'redo', // 'redo', //
'fullScreen' 'fullScreen'
] ],
insertKeys: {
index: 20, //
keys: ['uploadAttachment'] //
}
}) })
} }
}) })
@ -104,6 +108,12 @@ const editorConfig = computed((): IEditorConfig => {
}, },
autoFocus: false, autoFocus: false,
scroll: true, scroll: true,
//
hoverbarKeys: {
attachment: {
menuKeys: ['downloadAttachment'] //
}
},
MENU_CONF: { MENU_CONF: {
['uploadImage']: { ['uploadImage']: {
server: import.meta.env.VITE_UPLOAD_URL, server: import.meta.env.VITE_UPLOAD_URL,
@ -218,6 +228,52 @@ const editorConfig = computed((): IEditorConfig => {
customInsert(res: any, insertFn: InsertFnType) { customInsert(res: any, insertFn: InsertFnType) {
insertFn(res.data, 'video', res.data) insertFn(res.data, 'video', res.data)
} }
},
uploadAttachment: {
server: import.meta.env.VITE_UPLOAD_URL,
timeout: 20 * 1000, // 2s
fieldName: 'file',
// meta: { token: 'xxx', a: 100 }, //
// metaWithUrl: true, // meta url
// headers: { Accept: 'text/x-json' },
// http header
headers: {
Accept: '*',
Authorization: 'Bearer ' + getAccessToken(),
'tenant-id': getTenantId(),
'instance-id': getAppId()
},
maxFileSize: 20 * 1024 * 1024, // 20M
onBeforeUpload(file: File) {
console.log('onBeforeUpload', file)
return file // file
// return false //
},
onProgress(progress: number) {
console.log('onProgress', progress)
},
onSuccess(file: File, res: any) {
console.log('onSuccess', file, res)
},
onFailed(file: File, res: any) {
alert(res.message)
console.log('onFailed', file, res)
},
onError(file: File, err: Error, res: any) {
alert(err.message)
console.error('onError', file, err, res)
},
//
customInsert(res: any, file: File, insertFn: Function) {
console.log('customInsert', res)
//
insertFn(file.name, res.data)
// insertFn(res.data, `customInsert-${file.name}`, res.data)
}
} }
}, },
uploadImgShowBase64: true uploadImgShowBase64: true

@ -42,8 +42,14 @@ import '@/plugins/tongji' // 百度统计
import Logger from '@/utils/Logger' import Logger from '@/utils/Logger'
import VueDOMPurifyHTML from 'vue-dompurify-html' import VueDOMPurifyHTML from 'vue-dompurify-html'
import { Boot } from '@wangeditor/editor'
import attachmentModule from '@wangeditor/plugin-upload-attachment'
// 创建实例 // 创建实例
const setupAll = async () => { const setupAll = async () => {
// 注册。要在创建编辑器之前注册,且只能注册一次,不可重复注册。
Boot.registerModule(attachmentModule)
const app = createApp(App) const app = createApp(App)
await setupI18n(app) await setupI18n(app)

@ -1,7 +1,37 @@
<template> <template>
<div> 考试日历 </div> <div>
<el-tabs v-model="examType">
<el-tab-pane label="理论考试" :name="1" />
<el-tab-pane label="实践考试" :name="2" />
<el-calendar>
<template #date-cell="{ data }">
<el-popover placement="top" width="500px" trigger="click">
<template #reference>
<div>
<div>{{ new Date(data.day).getDate() }}</div>
<div class="mt-10px">考场数量{{ new Date(data.day).getDate() % 5 }}</div>
</div>
</template>
<el-table :data="roomList" border stripe>
<el-table-column prop="name" label="考场名称" width="120px" />
<el-table-column prop="address" label="考场地址" />
</el-table>
</el-popover>
</template>
</el-calendar>
</el-tabs>
</div>
</template> </template>
<script setup name="Calendar"></script> <script setup name="Calendar">
const examType = ref(1)
const roomList = ref([
{
name: '合肥瑶海长安考场',
address: '合肥瑶海大道100号'
}
])
</script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

@ -1,13 +1,284 @@
<template> <template>
<div> <div>
<div>无人机章节</div> <el-form :model="searchForm" inline label-width="0">
<div>权限</div> <el-form-item>
<div>新增ExamVenue:Room:add</div> <el-input v-model="searchForm.name" placeholder="考场名称" />
<div>修改ExamVenue:Room:edit</div> </el-form-item>
<div>删除ExamVenue:Room:delete</div> <el-form-item>
<el-button type="primary" @click="handleQuery"> </el-button>
<el-button v-hasPermi="['ExamVenue:Room:add']" @click="handleDetail(null)"> </el-button>
</el-form-item>
</el-form>
<el-table :data="tableList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column prop="name" label="考点名称" min-width="200px" />
<el-table-column prop="username" label="负责人" width="100px" />
<el-table-column prop="userPhone" label="负责人电话" width="100px" />
<el-table-column prop="contactName" label="联系人" width="100px" />
<el-table-column prop="contactPhone" label="联系人电话" width="100px" />
<el-table-column prop="address" label="地址" min-width="200px" />
<el-table-column label="理论" align="center">
<el-table-column prop="lilunTime" label="时间" width="100px" align="center">
<template #default="{ row }">
{{ row.lilunTime.map((item) => `每月${item}`).join(',') }}
</template>
</el-table-column>
<el-table-column prop="lilunAddress" label="地址" min-width="200px" align="center" />
</el-table-column>
<el-table-column label="实践" align="center">
<el-table-column prop="shijianTime" label="时间" width="100px" align="center">
<template #default="{ row }">
{{ row.shijianTime.map((item) => `每月${item}`).join(',') }}
</template>
</el-table-column>
<el-table-column prop="shijianAddress" label="地址" min-width="200px" align="center" />
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template #default="{ row }">
<el-button
v-hasPermi="['ExamVenue:Room:edit']"
type="primary"
link
@click="handleDetail(row)"
>
修改
</el-button>
<el-button
v-hasPermi="['ExamVenue:Room:delete']"
type="danger"
link
@click="handleDelete(row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="searchForm.pageNo"
v-model:limit="searchForm.pageSize"
@pagination="getList"
/>
<Dialog v-model="dialogVisible" title="教员详情" style="width: 800px">
<el-form :model="form" ref="formRef" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="24" :offset="0">
<el-form-item label="考点名称" prop="name">
<el-input v-model="form.name" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="负责人" prop="username">
<el-input v-model="form.username" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="负责人电话" prop="userPhone">
<el-input v-model="form.userPhone" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="联系人" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="联系人电话" prop="contactPhone">
<el-input v-model="form.contactPhone" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="地址" prop="address">
<el-input
v-model="form.address"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</el-col>
</el-row>
<el-divider direction="horizontal" content-position="left">理论</el-divider>
<el-row :gutter="20">
<el-col :span="24" :offset="0">
<el-form-item label="理论地址" prop="lilunAddress">
<el-input
v-model="form.lilunAddress"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="理论时间">
<el-input
class="mr-2 mb-2"
v-for="(item, index) in form.lilunTime"
:key="index"
v-model="form.lilunTime[index]"
style="width: 180px"
>
<template #prepend>每月</template>
<template #append></template>
</el-input>
<el-button type="primary" @click="form.lilunTime.push(undefined)">
新增考试时间
</el-button>
</el-form-item>
</el-col>
</el-row>
<el-divider direction="horizontal" content-position="left">实践</el-divider>
<el-row :gutter="20">
<el-col :span="24" :offset="0">
<el-form-item label="实践地址" prop="lilunAddress">
<el-input
v-model="form.shijianAddress"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="实践时间">
<el-input
class="mr-2 mb-2"
v-for="(item, index) in form.shijianTime"
:key="index"
v-model="form.shijianTime[index]"
style="width: 180px"
>
<template #prepend>每月</template>
<template #append></template>
</el-input>
<el-button type="primary" @click="form.shijianTime.push(undefined)">
新增考试时间
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</div> </div>
</template> </template>
<script setup name="ExamVenue"></script> <script setup name="ExamVenue">
const message = useMessage()
const searchForm = ref({
name: '',
pageNo: 1,
pageSize: 20
})
const tableList = ref([])
const total = ref(0)
onMounted(() => {
handleQuery()
})
function handleQuery() {
searchForm.value.pageNo = 1
getList()
}
function getList() {
// getStationList(searchForm.value).then((res) => {
// console.log(res)
// })
//
tableList.value = [
{
id: 1,
name: '上海01',
address: '上海01地址',
username: 'z张三',
userPhone: '12345678901',
contactName: '李四',
contactPhone: '12345678901',
lilunTime: [1, 10],
shijianTime: [5, 15],
lilunAddress: '上海01地址',
shijianAddress: '上海01地址'
},
{
id: 2,
name: '上海02',
address: '上海02地址',
username: 'z张三',
userPhone: '12345678901',
contactName: '李四',
contactPhone: '12345678901',
lilunTime: [2, 22],
shijianTime: [5, 15],
lilunAddress: '上海02地址',
shijianAddress: '上海02地址'
}
]
total.value = 2
}
const form = ref({})
const rules = {
name: { required: true, message: '请输入名称', trigger: 'blur' },
username: { required: true, message: '请输入姓名', trigger: 'blur' },
userPhone: { required: true, message: '请输入手机号', trigger: 'blur' }
}
const dialogVisible = ref(false)
const handleDetail = (row) => {
resetForm()
dialogVisible.value = true
if (row) {
form.value = { ...row }
}
}
const formRef = ref(null)
function resetForm() {
form.value = {
id: undefined,
name: '',
username: '',
userPhone: '',
contactName: '',
contactPhone: '',
address: '',
lilunAddress: '',
lilunTime: [],
shijianAddress: '',
shijianTime: []
}
formRef.value && formRef.value.resetFields()
}
const handleDelete = async (row) => {
try {
//
await message.delConfirm()
//
await UserApi.deleteUser(row.id)
message.success('删除成功')
//
getList()
} catch {}
}
const submitForm = async () => {
try {
} catch (err) {
console.log(err)
}
}
</script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

@ -1,11 +1,171 @@
<template> <template>
<div> <div>
<div>教员入驻</div> <el-form :model="searchForm" inline label-width="0">
<div>权限</div> <el-form-item>
<div>审核JoinUs:Coach:audit</div> <el-input v-model="searchForm.name" placeholder="教员名称" />
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.auditType" clearable filterable placeholder="审核状态">
<el-option label="待审核" :value="1" />
<el-option label="已通过" :value="2" />
<el-option label="未通过" :value="3" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"> 搜索 </el-button>
</el-form-item>
</el-form>
<el-table :data="tableList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column prop="name" label="教员姓名" />
<el-table-column prop="phone" label="联系方式" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="createTime" label="申请时间" />
<el-table-column prop="auditRemark" label="审核状态" />
<el-table-column prop="auditUser" label="审核人" />
<el-table-column prop="auditTime" label="审核时间" />
<!-- 操作 -->
<el-table-column label="操作" fixed="right" width="150">
<template #default="{ row }">
<el-button
v-if="row.auditType == 1"
type="primary"
link
v-hasPermi="['JoinUs:Station:audit']"
@click="handleDetail(row, 'audit')"
>
审核
</el-button>
<el-button
v-else
type="primary"
link
v-hasPermi="['JoinUs:Station:audit']"
@click="handleDetail(row, 'detail')"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="searchForm.pageNo"
v-model:limit="searchForm.pageSize"
@pagination="getList"
/>
<Dialog v-model="dialogVisible" title="教员详情" style="width: 600px">
<el-form
:model="form"
ref="formRef"
:rules="rules"
label-width="80px"
:disabled="form.auditType != 1"
>
<el-form-item label="教员姓名" prop="applyUser">
<el-input v-model="form.applyUser" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
<el-form-item label="备注" prop="xcwa">
<el-input
v-model="form.name"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
<div v-if="dialogType == 'audit'">
<el-divider direction="horizontal" content-position="left">审核信息</el-divider>
<el-form-item label="审核结果" prop="shjg">
<el-radio-group v-model="form.shjg">
<el-radio :label="2" :value="2">通过</el-radio>
<el-radio :label="3" :value="3">不通过</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审核说明" prop="shsm">
<el-input
v-model="form.shsm"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</div>
</el-form>
<template #footer>
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</div> </div>
</template> </template>
<script setup name="Coach"></script> <script setup name="Coach">
const searchForm = ref({
name: '',
auditType: 1,
pageNo: 1,
pageSize: 20
})
const tableList = ref([])
const total = ref(0)
const form = ref({})
const rules = {
name: { required: true, message: '请输入名称', trigger: 'blur' },
phone: { required: true, message: '请输入手机号', trigger: 'blur' }
}
const dialogVisible = ref(false)
const dialogType = ref('audit')
onMounted(() => {
handleQuery()
})
function handleQuery() {
searchForm.value.pageNo = 1
getList()
}
function getList() {
// getStationList(searchForm.value).then((res) => {
// console.log(res)
// })
tableList.value = [
{
id: 1,
name: '教员1',
createTime: '2021-01-01',
phone: '18888888888',
auditType: 2,
auditTime: '2021-02-01',
auditUser: 'admin',
auditRemark: '审核通过'
},
{
id: 2,
name: '教员2',
auditType: 1,
phone: '19999999999'
}
]
total.value = 2
}
function handleDetail(row, type) {
console.log(type)
dialogVisible.value = true
form.value = { ...row }
}
function submitForm() {
dialogVisible.value = false
}
</script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

@ -1,11 +1,332 @@
<template> <template>
<div> <div>
<div>机构入驻</div> <el-form :model="searchForm" inline label-width="0">
<div>权限</div> <el-form-item>
<div>审核JoinUs:Station:audit</div> <el-input v-model="searchForm.name" placeholder="机构名称" />
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.auditType" clearable filterable placeholder="审核状态">
<el-option label="待审核" :value="1" />
<el-option label="已通过" :value="2" />
<el-option label="未通过" :value="3" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleQuery"> 搜索 </el-button>
<!-- <el-button type="primary" @click="handleAdd" v-hasPermi="['question:database:add']">
新增
</el-button> -->
</el-form-item>
</el-form>
<el-table :data="tableList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column prop="name" label="机构名称" />
<el-table-column prop="applyUser" label="申请人" />
<el-table-column prop="phone" label="联系方式" />
<el-table-column prop="createTime" label="申请时间" />
<el-table-column prop="auditRemark" label="审核状态" />
<el-table-column prop="auditUser" label="审核人" />
<el-table-column prop="auditTime" label="审核时间" />
<!-- 操作 -->
<el-table-column label="操作" fixed="right" width="150">
<template #default="{ row }">
<el-button
v-if="row.auditType == 1"
type="primary"
link
v-hasPermi="['JoinUs:Station:audit']"
@click="handleDetail(row, 'audit')"
>
审核
</el-button>
<el-button
v-else
type="primary"
link
v-hasPermi="['JoinUs:Station:audit']"
@click="handleDetail(row, 'detail')"
>
详情
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="searchForm.pageNo"
v-model:limit="searchForm.pageSize"
@pagination="getList"
/>
<Dialog v-model="dialogVisible" title="机构详情" style="width: 1000px">
<el-form
:model="form"
ref="formRef"
:rules="rules"
label-position="top"
:disabled="form.auditType != 1"
>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="机构名称" prop="name">
<el-input v-model="form.name" placeholder="请输入机构名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系人" prop="applyUser">
<el-input v-model="form.applyUser" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训机构宣传文案" prop="xcwa">
<el-input
v-model="form.name"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训机构地址" prop="address">
<el-input
v-model="form.address"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训项目-多旋翼" prop="dxy">
<el-checkbox-group v-model="form.dxy">
<el-checkbox
v-for="item in driverOptions"
:key="item.value"
:label="item.value"
:value="item.value"
>
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训项目-垂直起降" prop="czqj">
<el-checkbox-group v-model="form.czqj">
<el-checkbox
v-for="item in driverOptions"
:key="item.value"
:label="item.value"
:value="item.value"
>
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训项目-直升机" prop="zsj">
<el-checkbox-group v-model="form.zsj">
<el-checkbox
v-for="item in driverOptions"
:key="item.value"
:label="item.value"
:value="item.value"
>
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="培训项目-固定翼" prop="gdy">
<el-checkbox-group v-model="form.gdy">
<el-checkbox
v-for="item in driverOptions"
:key="item.value"
:label="item.value"
:value="item.value"
>
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="合格证图片" prop="hgztp">
<UploadImg v-model="form.hgztp" height="100px" width="100px" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="培训机构Logo" prop="logo">
<UploadImg v-model="form.logo" height="100px" width="100px" />
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="主页宣传图" prop="zyxct">
<UploadImgs v-model="form.zyxct" :limit="6" height="100px" width="100px" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="优势标签" prop="ysbq">
<el-checkbox-group v-model="form.ysbq">
<el-checkbox
v-for="item in goodOptions"
:key="item.value"
:label="item.value"
:value="item.value"
>
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他服务" prop="qtfw">
<el-checkbox-group v-model="form.qtfw">
<el-checkbox
v-for="item in serviceOptions"
:key="item.value"
:label="item.value"
:value="item.value"
>
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他诉求" prop="qtsq">
<el-input
v-model="form.qtsq"
type="textarea"
:autosize="{ minRows: 2 }"
placeholder="请输入"
/>
</el-form-item>
</el-col>
</el-row>
<div v-if="dialogType == 'audit'">
<el-row>
<el-divider direction="horizontal" content-position="left">审核信息</el-divider>
<el-col :span="6" :offset="0">
<el-form-item label="审核结果" prop="shjg">
<el-radio-group v-model="form.shjg">
<el-radio :label="2" :value="2">通过</el-radio>
<el-radio :label="3" :value="3">不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="18" :offset="0">
<el-form-item label="审核说明" prop="shsm">
<el-input v-model="form.shsm" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
<template #footer>
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</div> </div>
</template> </template>
<script setup name="Station"></script> <script setup name="Station">
const searchForm = ref({
name: '',
auditType: 1,
pageNo: 1,
pageSize: 20
})
const tableList = ref([])
const total = ref(0)
const form = ref({})
const rules = {
name: { required: true, message: '请输入名称', trigger: 'blur' },
applyUser: { required: true, message: '请输入创建人', trigger: 'blur' },
phone: { required: true, message: '请输入手机号', trigger: 'blur' }
}
const dialogVisible = ref(false)
const dialogType = ref('audit')
const driverOptions = ref([
{ label: '小型-视距内驾驶员', value: 1 },
{ label: '小型-超视距驾驶员', value: 2 },
{ label: '小型-教员', value: 3 },
{ label: '中型-视距内驾驶员', value: 4 },
{ label: '中型-超视距驾驶员', value: 5 },
{ label: '中型-教员', value: 6 }
])
const goodOptions = ref([
{ label: '服务好', value: 1 },
{ label: '交通便利', value: 2 },
{ label: '提供住宿', value: 3 },
{ label: '免费接送', value: 4 }
])
const serviceOptions = ref([
{ label: '希望平台主动推荐学员', value: 1 },
{ label: '接受团购学员报名', value: 2 },
{ label: '希望平台推荐教员资源', value: 3 },
{ label: '希望平台推荐无人机相关的设备', value: 4 }
])
onMounted(() => {
handleQuery()
})
function handleQuery() {
searchForm.value.pageNo = 1
getList()
}
function getList() {
// getStationList(searchForm.value).then((res) => {
// console.log(res)
// })
tableList.value = [
{
id: 1,
name: '机构1',
createTime: '2021-01-01',
applyUser: '张三',
phone: '18888888888',
auditType: 2,
auditTime: '2021-02-01',
auditUser: 'admin',
auditRemark: '审核通过'
},
{
id: 2,
name: '机构2',
auditType: 1,
applyUser: '李四',
phone: '19999999999'
}
]
total.value = 2
}
function handleDetail(row, type) {
console.log(type)
dialogVisible.value = true
form.value = { ...row }
}
function submitForm() {
dialogVisible.value = false
}
</script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

@ -236,7 +236,7 @@ const dialogForm = ref({
chooseC: undefined, chooseC: undefined,
chooseD: undefined, chooseD: undefined,
imageUrl: undefined, imageUrl: undefined,
type: undefined, type: '2',
trueAnswer: undefined, trueAnswer: undefined,
carTypeId: undefined, carTypeId: undefined,
skillInfoPic: undefined, skillInfoPic: undefined,
@ -257,7 +257,7 @@ const open = (info = undefined, opts) => {
dialogForm.value.driveTypeName = info.driveTypeName dialogForm.value.driveTypeName = info.driveTypeName
dialogForm.value.carTypeName = info.carTypeName dialogForm.value.carTypeName = info.carTypeName
if (info) { if (info) {
dialogForm.value = { ...info, chapter: info.chapter } dialogForm.value = { ...dialogForm.value, ...info, chapter: info.chapter }
if (dialogForm.value.imageUrl) { if (dialogForm.value.imageUrl) {
imgUrl.value = dialogForm.value.imageUrl.includes('http') imgUrl.value = dialogForm.value.imageUrl.includes('http')
? dialogForm.value.imageUrl ? dialogForm.value.imageUrl
@ -283,7 +283,7 @@ const resetDialogForm = () => {
chooseC: undefined, chooseC: undefined,
chooseD: undefined, chooseD: undefined,
imageUrl: undefined, imageUrl: undefined,
type: undefined, type: '2',
trueAnswer: undefined, trueAnswer: undefined,
carTypeId: undefined, carTypeId: undefined,
skillInfoPic: undefined, skillInfoPic: undefined,

@ -239,7 +239,9 @@ function handleEdit(item) {
function handleAdd() { function handleAdd() {
dialogAddForm.value.open( dialogAddForm.value.open(
{ {
chapter: queryParams.value.chapter chapter: queryParams.value.chapter,
modelId: queryParams.value.modelId,
typeId: queryParams.value.typeId
}, },
chapterOptions.value chapterOptions.value
) )

@ -20,7 +20,7 @@
v-loading="loading" v-loading="loading"
:data="tableList" :data="tableList"
highlight-current-row highlight-current-row
max-height="calc(100vh - 320px)" max-height="calc(100vh - 180px)"
> >
<el-table-column type="index" width="55" align="center" /> <el-table-column type="index" width="55" align="center" />
<el-table-column label="章节名称" prop="chapterName" /> <el-table-column label="章节名称" prop="chapterName" />
@ -66,8 +66,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="知识总结" prop="remark"> <el-form-item label="知识总结" prop="summary">
<Editor v-model="form.remark" /> <Editor v-model="form.summary" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
@ -130,7 +130,7 @@ function handleEdit(row) {
chapterName: row.chapterName, chapterName: row.chapterName,
sort: row.sort, sort: row.sort,
chapterId: row.chapterId, chapterId: row.chapterId,
remark: row.remark summary: row.summary
} }
} }
@ -138,7 +138,7 @@ function resetForm() {
form.value = { form.value = {
chapterName: undefined, chapterName: undefined,
sort: 1, sort: 1,
remark: undefined summary: undefined
} }
if (dialogFormRef.value) { if (dialogFormRef.value) {
dialogFormRef.value.resetFields() dialogFormRef.value.resetFields()

@ -3,7 +3,7 @@
<el-form :model="searchForm" inline @submit.prevent> <el-form :model="searchForm" inline @submit.prevent>
<el-form-item> <el-form-item>
<el-input <el-input
v-model="searchForm.nameOrPhone" v-model="searchForm.userNameOrPhone"
placeholder="输入学员姓名/手机号" placeholder="输入学员姓名/手机号"
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
/> />
@ -13,18 +13,18 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select <el-select
v-model="searchForm.status" v-model="searchForm.answerResult"
placeholder="选择答题结果" placeholder="选择答题结果"
@change="handleQuery" @change="handleQuery"
style="width: 150px" style="width: 150px"
clearable clearable
> >
<el-option label="答对" :value="1" /> <el-option label="答对" :value="1" />
<el-option label="答错" :value="0" /> <el-option label="答错" :value="2" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="handleQuery"> </el-button> <el-button type="primary" @click="handleQuery"> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
@ -42,9 +42,9 @@
<el-table-column label="姓名" prop="name" /> <el-table-column label="姓名" prop="name" />
<el-table-column label="手机号" prop="phone" /> <el-table-column label="手机号" prop="phone" />
<el-table-column label="答题选择" prop="yourAnswer" /> <el-table-column label="答题选择" prop="yourAnswer" />
<el-table-column label="答题结果" prop="status"> <el-table-column label="答题结果" prop="answerResult">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.status == 0" type="danger">答错</el-tag> <el-tag v-if="row.answerResult == 2" type="danger">答错</el-tag>
<el-tag v-else type="success">答对</el-tag> <el-tag v-else type="success">答对</el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -62,11 +62,15 @@
</template> </template>
<script setup> <script setup>
import { searchStudyRecords } from '@/api/uav/record'
const searchForm = ref({ const searchForm = ref({
userNameOrPhone: '',
practiceType: 1,
question: '', question: '',
status: '', answerResult: undefined,
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 50
}) })
const loading = ref(false) const loading = ref(false)
@ -76,20 +80,26 @@ const tableList = ref([])
onMounted(() => { onMounted(() => {
handleQuery() handleQuery()
}) })
function getList() { async function getList() {
loading.value = true loading.value = true
try {
const resp = await searchStudyRecords(searchForm.value)
console.log(resp)
tableList.value = [ tableList.value = [
{ {
id: 1, id: 1,
question: '1+1=?', question: '1+1=?',
answer: 'B', answer: 'B',
yourAnswer: 'B', yourAnswer: 'B',
status: '1', answerResult: 1,
createTime: '' createTime: ''
} }
] ]
total.value = 1 total.value = 1
} finally {
loading.value = false loading.value = false
}
} }
function handleQuery() { function handleQuery() {

@ -2502,6 +2502,13 @@
resolved "https://registry.yarnpkg.com/@wangeditor/list-module/-/list-module-1.0.5.tgz#3fc0b167acddf885536b45fa0c127f9c6adaea33" resolved "https://registry.yarnpkg.com/@wangeditor/list-module/-/list-module-1.0.5.tgz#3fc0b167acddf885536b45fa0c127f9c6adaea33"
integrity sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ== integrity sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==
"@wangeditor/plugin-upload-attachment@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@wangeditor/plugin-upload-attachment/-/plugin-upload-attachment-1.1.0.tgz#a014de72703a9f3d5ae44a428ac01406640ac80a"
integrity sha512-K6SsV3Cv1g+Ob1xjRRQ13Sh3lcj3yAa/aXMaKKbaPI76rNZiOpyAGH/iVv5i9enmwbZql01IXpvhK+HtrikVyQ==
dependencies:
dom7 "^4.0.4"
"@wangeditor/table-module@^1.1.4": "@wangeditor/table-module@^1.1.4":
version "1.1.4" version "1.1.4"
resolved "https://registry.yarnpkg.com/@wangeditor/table-module/-/table-module-1.1.4.tgz#757d4a5868b2b658041cd323854a4d707c8347e9" resolved "https://registry.yarnpkg.com/@wangeditor/table-module/-/table-module-1.1.4.tgz#757d4a5868b2b658041cd323854a4d707c8347e9"
@ -3733,6 +3740,13 @@ dom7@^3.0.0:
dependencies: dependencies:
ssr-window "^3.0.0-alpha.1" ssr-window "^3.0.0-alpha.1"
dom7@^4.0.4:
version "4.0.6"
resolved "https://registry.yarnpkg.com/dom7/-/dom7-4.0.6.tgz#091a51621d7a19ce0fb86045cafb3c10035e97ed"
integrity sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==
dependencies:
ssr-window "^4.0.0"
domelementtype@1, domelementtype@^1.3.1: domelementtype@1, domelementtype@^1.3.1:
version "1.3.1" version "1.3.1"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
@ -7245,6 +7259,11 @@ ssr-window@^3.0.0-alpha.1:
resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37" resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37"
integrity sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA== integrity sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==
ssr-window@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-4.0.2.tgz#dc6b3ee37be86ac0e3ddc60030f7b3bc9b8553be"
integrity sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==
stable@^0.1.8: stable@^0.1.8:
version "0.1.8" version "0.1.8"
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"

Loading…
Cancel
Save