From cc7f03bcbb427ce334f6935311d22f36a61c21fd Mon Sep 17 00:00:00 2001
From: 鲁班七号 <9159450+luban-71@user.noreply.gitee.com>
Date: 星期四, 20 七月 2023 11:52:48 +0800
Subject: [PATCH] 修改“我发布的”，为本级发出

---
 src/views/Admin/history.vue |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/views/Admin/history.vue b/src/views/Admin/history.vue
index d16edc6..dd5ace3 100644
--- a/src/views/Admin/history.vue
+++ b/src/views/Admin/history.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="inner">
     <a-row type="flex" justify="space-between" style="margin-bottom: 20px">
-      <a-col :span="8">
+      <a-col :span="6">
         <a-radio-group v-model="search.searchParams.emergType" @change="getData">
           <a-radio-button :value="null">
             全部
@@ -14,8 +14,8 @@
           </a-radio-button>
         </a-radio-group>
       </a-col>
-      <a-col :span="16">
-        <a-row type="flex" justify="end" :gutter="12">
+      <a-col :span="18">
+        <a-row type="flex" justify="end" :gutter="18">
           <a-col :span="8">
             <a-range-picker
                 v-model="timeRange"
@@ -26,8 +26,11 @@
                 style="width: 100%"
             />
           </a-col>
+          <a-col :span="6">
+            <a-input v-model="search.searchParams.publishingUnit" placeholder="单位名称" style="width: 100%"/>
+          </a-col>
           <a-col :span="4">
-            <a-button type="primary" @click="getData">查询</a-button>
+            <a-button type="primary" @click="searchData">查询</a-button>
             <a-button style="margin-left: 12px" @click="resetSearch">重置</a-button>
           </a-col>
         </a-row>
@@ -36,7 +39,7 @@
 
     <!-- 表格实体部分-->
     <div class="table-cont">
-      <a-table :columns="columns" :data-source="data" bordered :pagination="pagination">
+      <a-table :columns="columns" :data-source="data" bordered :pagination="pagination" :rowKey="record=>record.id">
         <template #index="text,record,index">
           {{ index + 1 }}
         </template>
@@ -60,9 +63,9 @@
             <a-button @click="viewFile(item)" type="link" v-for="(item,index) in attachment" :key="index"><a-icon type="paper-clip"/>{{item.attachmentName}}</a-button>
           </div>
         </template >
-        <template #responseSituation="text">
-          <a-tag :color="text === 3 ? 'red' :text === 2? 'green':text === 1?'orange':'blue'">
-            {{text == 1 ? '待叫应' : text == 2 ?'已叫应':text == 3 ?'超时未叫应' : ''}}
+        <template #responsesRate="text">
+          <a-tag :color="Number(text.split('%')[0]) == 100 ? 'green' :Number(text.split('%')[0]) == 0? 'red':'orange'">
+            {{ text }}
           </a-tag>
         </template>
         <template #operation="text, record, index">
@@ -86,15 +89,17 @@
 const columns = [{
   title: '序号',
   dataIndex: 'index',
-  width: '8%',
   scopedSlots: {
     customRender: 'index'
   }
 },
   {
+    title: '信息标题',
+    dataIndex: 'title',
+  },
+  {
     title: '发布时间',
     dataIndex: 'publishingTime',
-    width: '15%',
     scopedSlots: {
       customRender: 'publishingTime'
     } //设置定制化表格数据
@@ -102,12 +107,10 @@
   {
     title: '发布单位',
     dataIndex: 'publishingUnit',
-    width: '12%',
   },
   {
     title: '灾种',
     dataIndex: 'disasterType',
-    width: '8%',
     scopedSlots: {
       customRender: 'disasterType'
     }
@@ -118,12 +121,6 @@
     scopedSlots: {
       customRender: 'warningLevel'
     }, //设置定制化表格数据
-    width: '8%',
-  },
-  {
-    title: '信息标题',
-    dataIndex: 'title',
-    width: '16%',
   },
   {
     title: '附件',
@@ -134,11 +131,10 @@
     },
   },
   {
-    title: '叫应情况',
-    dataIndex: 'responseSituation',
-    width: '10%',
+    title: '叫应率',
+    dataIndex: 'responsesRate',
     scopedSlots: {
-      customRender: 'responseSituation'
+      customRender: 'responsesRate'
     }, //设置定制化表格数据
   },
   {
@@ -158,6 +154,7 @@
         pageIndex: 1,
         pageSize: 10,
         searchParams:{
+          publishingUnit: '',
           emergType: null,
           startTime: '',
           endTime: ''
@@ -263,12 +260,18 @@
       console.log('onOk: ', value);
     },
 
+    searchData(){
+      this.search.pageIndex = 1
+      this.getData()
+    },
+
     resetSearch(){
       const t = this
       t.search = {
         pageIndex: 1,
         pageSize: 10,
         searchParams:{
+          publishingUnit: '',
           emergType: null,
           startTime: '',
           endTime: ''

--
Gitblit v1.9.2