sc

src/api/uav/record.js

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

src/api/uav/regiest.js

@@ -54,8 +54,8 @@ export const updateTeacher = async (data) => {
   })
 }
 
-// export const getCarTypeList = async () => {
+export const getCarTypeList = async () => {
-//   return await request.get({
+  return await request.get({
-//     url: 'https://cloud.ahfkbg.com/wrj-api/wrjSchoolDriverType/list'
+    url: '/admin-api/wrjSchoolDriverType/list'
-//   })
+  })
-// }
+}

src/views/JoinUs/Station/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :model="searchForm" inline label-width="0">
       <el-form-item>
-        <el-input v-model="searchForm.schoolName" placeholder="机构名称" />
+        <el-input v-model="searchForm.schoolName" placeholder="机构名称" clearable />
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.status" clearable filterable placeholder="审核状态">
@@ -21,7 +21,7 @@
       <el-table-column prop="schoolName" label="机构名称" />
       <el-table-column prop="contacts" label="联系人" />
       <el-table-column prop="phone" label="联系方式" />
-      <el-table-column prop="applyTime" label="申请时间" />
+      <el-table-column prop="createTime" label="申请时间" />
       <el-table-column prop="status" label="审核状态" width="100">
         <template #default="{ row }">
           <el-tag v-if="row.status == 1" type="info">待审核</el-tag>
@@ -208,7 +208,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div v-if="dialogType == 'audit'">
+        <!-- <div v-if="dialogType == 'audit'"> -->
         <el-row>
           <el-divider direction="horizontal" content-position="left">审核信息</el-divider>
           <el-col :span="6" :offset="0">
@@ -220,12 +220,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="18" :offset="0">
-              <el-form-item label="审核说明" prop="shsm">
+            <el-form-item label="审核说明" prop="checkRemark">
-                <el-input v-model="form.shsm" placeholder="请输入" />
+              <el-input v-model="form.checkRemark" placeholder="请输入" />
             </el-form-item>
           </el-col>
         </el-row>
-        </div>
+        <!-- </div> -->
       </el-form>
       <template #footer>
         <el-button type="primary" :disabled="formLoading" @click="submitForm">保 存</el-button>
@@ -238,10 +238,10 @@
 <script setup name="Station">
 import {
   searchStation,
-  auditStation,
+  // auditStation,
   updateStation,
-  stationDetail
+  stationDetail,
-  // getCarTypeList
+  getCarTypeList
 } from '@/api/uav/regiest'
 
 const message = useMessage()
@@ -264,224 +264,7 @@ const rules = {
 }
 const dialogVisible = ref(false)
 const dialogType = ref('audit')
-const driverOptions = ref([
+const driverOptions = ref([])
-  {
-    modelId: 10001,
-    modelName: '多旋翼',
-    schoolDriverTypeVoList: [
-      {
-        schoolTypeId: 1000,
-        modelId: 10001,
-        modelName: '多旋翼',
-        typeId: 20021,
-        typeName: '小型-视距内驾驶员',
-        sort: 1
-      },
-      {
-        schoolTypeId: 1002,
-        modelId: 10001,
-        modelName: '多旋翼',
-        typeId: 20022,
-        typeName: '小型-超视距驾驶员',
-        sort: 2
-      },
-      {
-        schoolTypeId: 1004,
-        modelId: 10001,
-        modelName: '多旋翼',
-        typeId: 20023,
-        typeName: '小型-教员',
-        sort: 3
-      },
-      {
-        schoolTypeId: 1001,
-        modelId: 10001,
-        modelName: '多旋翼',
-        typeId: 20021,
-        typeName: '中型-视距内驾驶员',
-        sort: 6
-      },
-      {
-        schoolTypeId: 1003,
-        modelId: 10001,
-        modelName: '多旋翼',
-        typeId: 20022,
-        typeName: '中型-超视距驾驶员',
-        sort: 7
-      },
-      {
-        schoolTypeId: 1005,
-        modelId: 10001,
-        modelName: '多旋翼',
-        typeId: 20023,
-        typeName: '中型-教员',
-        sort: 8
-      }
-    ]
-  },
-  {
-    modelId: 10002,
-    modelName: '固定翼',
-    schoolDriverTypeVoList: [
-      {
-        schoolTypeId: 1010,
-        modelId: 10002,
-        modelName: '固定翼',
-        typeId: 20026,
-        typeName: '小型-视距内驾驶员',
-        sort: 1
-      },
-      {
-        schoolTypeId: 1012,
-        modelId: 10002,
-        modelName: '固定翼',
-        typeId: 20027,
-        typeName: '小型-超视距驾驶员',
-        sort: 2
-      },
-      {
-        schoolTypeId: 1014,
-        modelId: 10002,
-        modelName: '固定翼',
-        typeId: 20028,
-        typeName: '小型-教员',
-        sort: 3
-      },
-      {
-        schoolTypeId: 1011,
-        modelId: 10002,
-        modelName: '固定翼',
-        typeId: 20026,
-        typeName: '中型-视距内驾驶员',
-        sort: 5
-      },
-      {
-        schoolTypeId: 1013,
-        modelId: 10002,
-        modelName: '固定翼',
-        typeId: 20027,
-        typeName: '中型-超视距驾驶员',
-        sort: 6
-      },
-      {
-        schoolTypeId: 1015,
-        modelId: 10002,
-        modelName: '固定翼',
-        typeId: 20028,
-        typeName: '中型-教员',
-        sort: 7
-      }
-    ]
-  },
-  {
-    modelId: 10003,
-    modelName: '垂直起降',
-    schoolDriverTypeVoList: [
-      {
-        schoolTypeId: 1018,
-        modelId: 10003,
-        modelName: '垂直起降',
-        typeId: 20030,
-        typeName: '小型-视距内驾驶员',
-        sort: 1
-      },
-      {
-        schoolTypeId: 1020,
-        modelId: 10003,
-        modelName: '垂直起降',
-        typeId: 20031,
-        typeName: '小型-超视距驾驶员',
-        sort: 2
-      },
-      {
-        schoolTypeId: 1022,
-        modelId: 10003,
-        modelName: '垂直起降',
-        typeId: 20032,
-        typeName: '小型-教员',
-        sort: 3
-      },
-      {
-        schoolTypeId: 1019,
-        modelId: 10003,
-        modelName: '垂直起降',
-        typeId: 20030,
-        typeName: '中型-视距内驾驶员',
-        sort: 5
-      },
-      {
-        schoolTypeId: 1021,
-        modelId: 10003,
-        modelName: '垂直起降',
-        typeId: 20031,
-        typeName: '中型-超视距驾驶员',
-        sort: 6
-      },
-      {
-        schoolTypeId: 1023,
-        modelId: 10003,
-        modelName: '垂直起降',
-        typeId: 20032,
-        typeName: '中型-教员',
-        sort: 7
-      }
-    ]
-  },
-  {
-    modelId: 10004,
-    modelName: '直升机',
-    schoolDriverTypeVoList: [
-      {
-        schoolTypeId: 1026,
-        modelId: 10004,
-        modelName: '直升机',
-        typeId: 20034,
-        typeName: '小型-视距内驾驶员',
-        sort: 1
-      },
-      {
-        schoolTypeId: 1028,
-        modelId: 10004,
-        modelName: '直升机',
-        typeId: 20035,
-        typeName: '小型-超视距驾驶员',
-        sort: 2
-      },
-      {
-        schoolTypeId: 1030,
-        modelId: 10004,
-        modelName: '直升机',
-        typeId: 20036,
-        typeName: '小型-教员',
-        sort: 3
-      },
-      {
-        schoolTypeId: 1027,
-        modelId: 10004,
-        modelName: '直升机',
-        typeId: 20034,
-        typeName: '中型-视距内驾驶员',
-        sort: 5
-      },
-      {
-        schoolTypeId: 1029,
-        modelId: 10004,
-        modelName: '直升机',
-        typeId: 20035,
-        typeName: '中型-超视距驾驶员',
-        sort: 6
-      },
-      {
-        schoolTypeId: 1031,
-        modelId: 10004,
-        modelName: '直升机',
-        typeId: 20036,
-        typeName: '中型-教员',
-        sort: 7
-      }
-    ]
-  }
-])
 
 const defaultTips = [
   { tag: '服务好', isDefault: true, checked: false },
@@ -498,12 +281,9 @@ const defaultService = [
 
 onMounted(() => {
   handleQuery()
-  // getCarTypeList().then((response) => {
+  getCarTypeList().then((response) => {
-  //   driverOptions.value = response.map((item) => ({
+    driverOptions.value = response
-  //     label: item.typeName,
+  })
-  //     value: item.id
-  //   }))
-  // })
 })
 
 function handleQuery() {
@@ -592,21 +372,21 @@ async function submitForm() {
       .filter((item) => item.schoolModelVoList.length > 0)
     params.schoolServiceList = params.schoolServiceList.filter((item) => item.checked)
     params.schoolTagList = params.schoolTagList.filter((item) => item.checked)
-    if (dialogType.value == 'audit') {
+    // if (dialogType.value == 'audit') {
-      auditStation(params).then((response) => {
+    //   auditStation(params).then((response) => {
-        if (response) {
+    //     if (response) {
-          dialogVisible.value = false
+    //       dialogVisible.value = false
-          message.success('操作成功')
+    //       message.success('操作成功')
-        }
+    //     }
-      })
+    //   })
-    } else {
+    // } else {
     updateStation(params).then((response) => {
       if (response) {
         dialogVisible.value = false
         message.success('操作成功')
       }
     })
-    }
+    // }
   } finally {
     formLoading.value = false
     getList()

src/views/UAVClue/StudyRecord/components/Practice.vue

@@ -5,11 +5,17 @@
         <el-input
           v-model="searchForm.userNameOrPhone"
           placeholder="输入学员姓名/手机号"
+          clearable
           @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.question" placeholder="输入题目" @keyup.enter="handleQuery" />
+        <el-input
+          v-model="searchForm.question"
+          placeholder="输入题目"
+          clearable
+          @keyup.enter="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
         <el-select
@@ -31,18 +37,28 @@
       v-loading="loading"
       :data="tableList"
       highlight-current-row
-      max-height="calc(100vh - 320px)"
+      max-height="calc(100vh - 260px)"
     >
       <el-table-column type="index" width="55" align="center" />
       <el-table-column label="题目" prop="question" />
-      <el-table-column label="图片" prop="img" />
+      <el-table-column label="图片" width="120">
-      <el-table-column label="选项" prop="option" />
+        <template #default="{ row }">
-      <el-table-column label="正确答案" prop="answer" />
+          <img v-if="row.imageUrl" :src="row.imageUrl" width="100" height="100" />
-      <el-table-column label="答题时间" prop="createTime" />
+        </template>
-      <el-table-column label="姓名" prop="name" />
+      </el-table-column>
-      <el-table-column label="手机号" prop="phone" />
+      <el-table-column label="选项">
-      <el-table-column label="答题选择" prop="yourAnswer" />
+        <template #default="{ row }">
-      <el-table-column label="答题结果" prop="answerResult">
+          <div v-for="(item, index) in row.optionList" :key="index">
+            <span>{{ item.op }}. {{ item.opDesc }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="正确答案" prop="trueAnswer" width="80" />
+      <el-table-column label="答题时间" prop="practiceTime" width="110" />
+      <el-table-column label="姓名" prop="userName" width="100" />
+      <el-table-column label="手机号" prop="phone" width="120" />
+      <el-table-column label="答题选择" prop="answer" width="80" />
+      <el-table-column label="答题结果" prop="answerResult" width="100">
         <template #default="{ row }">
           <el-tag v-if="row.answerResult == 2" type="danger">答错</el-tag>
           <el-tag v-else type="success">答对</el-tag>
@@ -84,19 +100,8 @@ async function getList() {
   loading.value = true
   try {
     const resp = await searchStudyRecords(searchForm.value)
-    console.log(resp)
+    tableList.value = resp.list || []
-
+    total.value = resp.total || 0
-    tableList.value = [
-      {
-        id: 1,
-        question: '1+1=？',
-        answer: 'B',
-        yourAnswer: 'B',
-        answerResult: 1,
-        createTime: ''
-      }
-    ]
-    total.value = 1
   } finally {
     loading.value = false
   }