Jelajahi Sumber

迭代八走查bug和我的填报接口调试

zhangyihao 8 bulan lalu
induk
melakukan
445ed43982

+ 9 - 0
src/api/dataFilling/datafilling.ts

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+// 查询部门列表
+export function fillList(data) {
+  return request({
+    url: '/api/dataFilling/my_filling',
+    method: 'post',
+    data: data
+  });
+}

+ 27 - 40
src/views/dataFilling/myFilling.vue

@@ -12,8 +12,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="任务状态:" prop="task_status">
-                    <el-radio-group v-model="queryParams.task_status">
+                  <el-form-item label="任务状态:" prop="submission_status">
+                    <el-radio-group v-model="queryParams.submission_status">
                       <el-radio value="0" size="large">待填报</el-radio>
                       <el-radio value="1" size="large">已上报</el-radio>
                     </el-radio-group>
@@ -29,14 +29,14 @@
         </transition>
         <!-- 表格组件 -->
         <el-table ref="multipleTable" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" align="center" prop="table_id" />
+          <el-table-column label="序号" align="center" prop="report_id" />
           <el-table-column label="表格名称" align="center" prop="table_name" />
-          <el-table-column label="开始日期" align="center" prop="run_time" />
-          <el-table-column label="截止填报时间" align="center" prop="filling_time" />
-          <el-table-column label="任务状态" align="center" prop="status" />
+          <el-table-column label="开始日期" align="center" prop="start_time" />
+          <el-table-column label="截止填报时间" align="center" prop="end_time" />
+          <el-table-column label="任务状态" align="center" prop="submission_status" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-              <el-text v-if="scope.row.status === '待填报'" class="common-btn-text-primary" @click="handleWrite(scope.row)">填表</el-text>
+              <el-text v-if="scope.row.submission_status === '待填报'" class="common-btn-text-primary" @click="handleWrite(scope.row)">填表</el-text>
               <el-text class="common-btn-text-primary" @click="handleView(scope.row)">详情</el-text>
             </template>
           </el-table-column>
@@ -44,12 +44,13 @@
         <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
       </div>
     </div>
+    <WriteForm v-if="writeFormState.show" :event-id="writeFormState.eventId" @close="handleCancel" />
+    <FormDetail v-if="formDetailState.show" :event-id="formDetailState.eventId" @close="handleCancel" />
   </div>
-  <WriteForm v-if="writeFormState.show" :event-id="writeFormState.eventId" @close="handleCancel" />
-  <FormDetail v-if="formDetailState.show" :event-id="formDetailState.eventId" @close="handleCancel" />
 </template>
 <script setup lang="ts">
 import { onMounted, reactive, ref } from 'vue';
+import { fillList } from '@/api/dataFilling/datafilling';
 import WriteForm from './writeForm.vue';
 import FormDetail from './formDetail.vue';
 const loading = ref(true);
@@ -61,11 +62,11 @@ const total = ref(0);
 const tableData = ref([]);
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const initFormData = reactive({
-  table_id: '',
+  report_id: '',
   table_name: '',
-  filling_time: '',
-  run_time: '',
-  task_status: ''
+  start_time: '',
+  end_time: '',
+  submission_status: ''
 });
 const data = reactive({
   form: { ...initFormData },
@@ -73,35 +74,12 @@ const data = reactive({
     page: 1,
     pageSize: 10,
     table_name: '',
-    task_status: ''
+    submission_status: ''
   }
 });
 
 const { queryParams, form } = toRefs(data);
 // 模拟数据源
-const staticData = [
-  {
-    table_id: 1,
-    table_name: '测试表单',
-    run_time: '2024-10-15',
-    filling_time: '2024-10-15 18:00:00',
-    status: '待填报'
-  },
-  {
-    table_id: 2,
-    table_name: '应急工单数据表',
-    run_time: '2024-06-24',
-    filling_time: '2025-06-24 18:00:00',
-    status: '待填报'
-  },
-  {
-    table_id: 3,
-    table_name: '安全风险通告数据表',
-    run_time: '2024-06-24',
-    filling_time: '2025-06-24 18:00:00',
-    status: '已上报'
-  }
-];
 let writeFormState = reactive({
   show: false,
   eventId: ''
@@ -126,11 +104,20 @@ const handleView = (row) => {
     formDetailState.show = true;
   }
 };
+const fetchFillList = () => {
+  loading.value = true;
+  fillList(queryParams.value)
+    .then((res) => {
+      tableData.value = res.data;
+      total.value = res.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
 // 初始化数据
 onMounted(() => {
-  tableData.value = staticData;
-  total.value = staticData.length;
-  loading.value = false;
+  fetchFillList();
 });
 const handleQuery = () => {
   queryParams.value.page = 1;

+ 12 - 16
src/views/informationissue/informationList.vue

@@ -3,37 +3,35 @@
     <div v-show="!informationDetailState.show && !informationViewState.show && !informationApprovalState.show">
       <transition name="fade">
         <div v-show="showSearch">
-          <el-form ref="queryFormRef" :model="queryParams" label-width="100px">
+          <el-form ref="queryFormRef" :model="queryParams" label-width="auto">
             <el-row :gutter="20">
-              <el-col :span="7">
+              <el-col :span="8">
                 <el-segmented v-model="queryParams.dispose_status" :options="disposeStatusOptions" size="large" block @change="handleDisposeStatus" />
               </el-col>
             </el-row>
-            <el-row :gutter="20">
-              <el-col :span="5">
+            <el-row :gutter="24">
+              <el-col :span="6">
                 <el-form-item label="发布单位:">
                   <el-input v-model="queryParams.publish_group" placeholder="请输入内容" clearable></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="6">
                 <el-form-item label="发布状态:">
                   <el-select v-model="queryParams.publish_status" placeholder="请选择">
                     <el-option v-for="item in publishStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="6">
                 <el-form-item label="审批状态:">
                   <el-select v-model="queryParams.examine_status" placeholder="请选择">
                     <el-option v-for="item in approvalStatusOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
-                <el-form-item>
-                  <el-button type="primary" @click="handleSearch">查询</el-button>
-                  <el-button @click="resetSearch">重置</el-button>
-                </el-form-item>
+              <el-col :span="5">
+                <el-button type="primary" @click="handleSearch">查询</el-button>
+                <el-button @click="resetSearch">重置</el-button>
               </el-col>
             </el-row>
           </el-form>
@@ -220,7 +218,7 @@ let informationApprovalState = reactive({
 
 const handleView = (row) => {
   if (row) {
-    informationViewState.eventId = row.id+""; // 假设eventId是id字段
+    informationViewState.eventId = row.id + ''; // 假设eventId是id字段
     informationViewState.show = true;
   }
 };
@@ -233,7 +231,7 @@ const handleUpdate = (row) => {
 
 const handleApproval = (row) => {
   if (row) {
-    informationApprovalState.eventId = row.id+""; // 假设eventId是id字段
+    informationApprovalState.eventId = row.id + ''; // 假设eventId是id字段
     informationApprovalState.show = true;
   }
 };
@@ -285,6 +283,4 @@ onMounted(() => {
 });
 </script>
 
-<style scoped>
-/* Add your custom styles here */
-</style>
+<style scoped></style>

+ 1 - 1
src/views/system/dict/data.vue

@@ -77,7 +77,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
-            <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>
+            <!--            <el-text v-hasPermi="['system:menu:remove']" class="common-btn-text-danger" @click="handleDelete(scope.row)">删除</el-text>-->
           </template>
         </el-table-column>
       </el-table>

+ 6 - 6
src/views/system/dict/index.vue

@@ -51,12 +51,12 @@
             删除
           </el-button>
         </el-col>
-        <el-col :span="1.5">
-          <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>
-        </el-col>
+        <!--        <el-col :span="1.5">-->
+        <!--          <el-button v-hasPermi="['system:dict:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>-->
+        <!--        </el-col>-->
+        <!--        <el-col :span="1.5">-->
+        <!--          <el-button v-hasPermi="['system:dict:remove']" type="danger" plain icon="Refresh" @click="handleRefreshCache">刷新缓存</el-button>-->
+        <!--        </el-col>-->
         <!--      <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>-->
       </el-row>