Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq

src/api/crawl/index.js

@@ -0,0 +1,68 @@
+import request, {crawlModule ,moduleName } from '/@/utils/request';
+
+
+
+export const geoserve = (vordm_id , link , disaster_id, name) =>{ 
+    return request({
+        url: '/api/' + crawlModule + '/geoserve/pushing',
+        method: 'post',
+        data: {
+            vordm_id,
+            link,
+            disaster_id,
+            name
+        }
+    });
+}
+export const news = (disaster_id, keywords, page,isBaidu,id) =>{ 
+    return request({
+        url: '/api/' + crawlModule + '/news/'+(isBaidu?"baidu":"bing"),
+        method: 'post',
+        data: {
+            disaster_id,
+            keywords,
+            page,
+            id
+        }
+    });
+}
+export const rs = (stime, etime, disaster_id,ranges ,type =1) =>{ 
+    let method = 'sentinel';
+    if(type == 1){
+        method = 'sentinel';
+    }else if(type == 2){
+        method = 'landsat';
+    }else {
+        method = 'searchone';
+    }
+
+    return request({
+        url: '/api/' + crawlModule + '/news/'+method,
+        method: 'post',
+        data: {
+            stime, etime, disaster_id,ranges
+        }
+    });
+}
+export const submit = (row) => {
+    return request({
+        url: '/api/'+moduleName+'/ui/crawlInfo/submit',
+        method: 'post',
+        data: row
+    })
+}
+export const getList = (current, size, param) => {
+    let params =  {
+        current,
+        size,
+    };
+    if(param){
+        params = Object.assign(params, param);
+    }
+    return request({
+        url: '/api/'+moduleName+'/ui/crawlInfo/list',
+        method: 'get',
+        params: params
+    });
+
+}

src/utils/request.js

@@ -4,8 +4,8 @@ import qs from 'qs';
 import { Session } from '/@/utils/storage';
 
 // export const moduleName = 'zqq-biz-vordm';
-// export const moduleName = 'yyhouc-biz-vordm';
+export const moduleName = 'biz-vordm';
-export const moduleName = 'glj-biz-vordm';
+export const crawlModule = 'vordm-crawl';
 // 配置新建一个 axios 实例
 const service = axios.create({
 	//baseURL: import.meta.env.VITE_API_URL,
@@ -53,7 +53,6 @@ service.interceptors.response.use(
 			return Promise.reject(service.interceptors.response);
 		} else {
 			return res.data || res;
-
 		}
 	},
 	(error) => {

src/views/dataService/multimediaData/component/boot.vue

@@ -0,0 +1,204 @@
+<template>
+    <el-dialog title="Collection robot" v-model="state.isShowDialog" width="700px">
+        <el-row>
+            <el-col :span="3" style="text-align:center ;">
+                <el-image style="height:40px ; width:100px!" src="/baidu.jpg"></el-image>
+            </el-col>
+            <el-col :span="9">
+                <el-form-item label="Confirm keywords"  style="text-align:center;">
+                    <el-input v-model="state.baidu.keywords">
+                    </el-input> 
+                </el-form-item>
+            </el-col>
+            <el-col :span="3">
+                <el-form-item label="page"  style="text-align:center ; margin-left: 10px;">
+                    <el-input v-model="state.baidu.page" type="number" style="width: 70px ;"></el-input> 
+                </el-form-item>
+            </el-col>
+            <el-col :span="4" style="text-align:center ;">
+                <el-icon  :size="40" style="cursor:pointer ;" :title="state.baidu.status==0?'Waiting in queue……':'start'" :color="state.baidu.status==0?'#4f4':'blue'"   @click="state.baidu.status==0?confirmBox('baidu'):start('baidu')" v-if="state.baiduOption.buttonIs&&(state.baidu.status==0||!state.baidu.status)">
+                    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="m249.6 417.088 319.744 43.072 39.168 310.272L845.12 178.88 249.6 417.088zm-129.024 47.168a32 32 0 0 1-7.68-61.44l777.792-311.04a32 32 0 0 1 41.6 41.6l-310.336 775.68a32 32 0 0 1-61.44-7.808L512 516.992l-391.424-52.736z"></path></svg>
+                </el-icon>
+                <el-icon :size="40" style="cursor:pointer ;" title="Data collection in progress, please wait……"  color="#131313"  v-if="state.baiduOption.buttonIs&&state.baidu.status==1">
+                    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32zm0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32zm448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32zm-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32zM195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248zm452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248zM828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0zm-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0z"></path></svg>       
+                </el-icon>
+                <el-icon :size="40" style="cursor:pointer ;" title="once more start" color="#4f4"   @click="start('baidu')" v-if="state.baiduOption.buttonIs&&state.baidu.status==2">
+                    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="M406.656 706.944 195.84 496.256a32 32 0 1 0-45.248 45.248l256 256 512-512a32 32 0 0 0-45.248-45.248L406.592 706.944z"></path></svg>
+                </el-icon>
+
+                <span v-if="!state.baiduOption.buttonIs" style="height: 40; line-height: 40px;">{{ state.baiduOption.runTitle }}</span>
+            </el-col>
+        </el-row>   
+        <el-row>
+            <el-col :span="3" style="text-align:center ;">
+                <el-image style="height:40px ; width:100px!" src="/bing.webp"></el-image>
+            </el-col>
+            <el-col :span="9" >
+                <el-form-item label="Confirm keywords"  style="text-align:center ;">
+                    <el-input v-model="state.bing.keywords"></el-input> 
+                </el-form-item>
+            </el-col>
+            <el-col :span="3"  >
+                <el-form-item label="page" style="text-align:center;  margin-left: 10px;">
+                    <el-input v-model="state.bing.page" type="number"  style="width: 70px ;"></el-input> 
+                </el-form-item>
+            </el-col>
+            <el-col :span="4" style="text-align:center ;">
+                <el-icon  :size="40" style="cursor:pointer ;" :title="state.bing.status==0?'Waiting in queue……':'start'" :color="state.bing.status==0?'#4f4':'blue'"   @click="state.bing.status==0?confirmBox('bing'):start('bing')" v-if="state.bingOption.buttonIs&&(state.bing.status==0||!state.bing.status)">
+                    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="m249.6 417.088 319.744 43.072 39.168 310.272L845.12 178.88 249.6 417.088zm-129.024 47.168a32 32 0 0 1-7.68-61.44l777.792-311.04a32 32 0 0 1 41.6 41.6l-310.336 775.68a32 32 0 0 1-61.44-7.808L512 516.992l-391.424-52.736z"></path></svg>
+                </el-icon>
+                <el-icon :size="40" style="cursor:pointer ;" title="Data collection in progress, please wait……"  color="#131313"  v-if="state.buttonIs&&state.bing.status==1">
+                    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="M512 64a32 32 0 0 1 32 32v192a32 32 0 0 1-64 0V96a32 32 0 0 1 32-32zm0 640a32 32 0 0 1 32 32v192a32 32 0 1 1-64 0V736a32 32 0 0 1 32-32zm448-192a32 32 0 0 1-32 32H736a32 32 0 1 1 0-64h192a32 32 0 0 1 32 32zm-640 0a32 32 0 0 1-32 32H96a32 32 0 0 1 0-64h192a32 32 0 0 1 32 32zM195.2 195.2a32 32 0 0 1 45.248 0L376.32 331.008a32 32 0 0 1-45.248 45.248L195.2 240.448a32 32 0 0 1 0-45.248zm452.544 452.544a32 32 0 0 1 45.248 0L828.8 783.552a32 32 0 0 1-45.248 45.248L647.744 692.992a32 32 0 0 1 0-45.248zM828.8 195.264a32 32 0 0 1 0 45.184L692.992 376.32a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0zm-452.544 452.48a32 32 0 0 1 0 45.248L240.448 828.8a32 32 0 0 1-45.248-45.248l135.808-135.808a32 32 0 0 1 45.248 0z"></path></svg>       
+                </el-icon>
+                <el-icon :size="40" style="cursor:pointer ;" title="once more start" color="#4f4"   @click="start('bing')" v-if="state.bingOption.buttonIs&&state.bing.status==2">
+                    <svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" data-v-ea893728=""><path fill="currentColor" d="M406.656 706.944 195.84 496.256a32 32 0 1 0-45.248 45.248l256 256 512-512a32 32 0 0 0-45.248-45.248L406.592 706.944z"></path></svg>
+                </el-icon>
+
+                <span v-if="!state.bingOption.buttonIs" style="height: 40; line-height: 40px;">{{ state.bingOption.runTitle }}</span>
+            </el-col>
+        </el-row>  
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="state.isShowDialog=false" size="default">close</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script setup >
+import { ElMessage,ElMessageBox} from 'element-plus';
+import {reactive,defineExpose} from 'vue';
+import {news,submit,getList} from '/@/api/crawl/index';
+import { useUserInfo } from '/@/stores/userInfo';
+const userInfo = useUserInfo();
+const state = reactive({
+    isShowDialog:false,
+    data:{},
+    table:[],
+    baidu:{
+        keywords:"",
+        page:5,
+        disaster_id:undefined
+    },
+    bing:{
+        keywords:"",
+        page:10,
+        disaster_id:undefined
+    },
+    baiduOption:{
+        buttonIs:true,
+        runTitle:""
+    },
+    bingOption:{
+        buttonIs:true,
+        runTitle:""
+    }
+    
+})
+const confirmBox = (text)=>{
+    ElMessageBox.confirm(
+    'Already in queue, continue to start?',
+    'Warning',
+    {
+      confirmButtonText: 'OK',
+      cancelButtonText: 'Cancel',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+        start(text)
+        ElMessage({
+            type: 'success',
+            message: 'restart success',
+        })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: 'Cancel restart',
+      })
+    })
+}
+const openDialog = (row) => {
+    state.data = row;
+    state.baidu.keywords = row.disasterKeyword;
+    state.baidu.disaster_id = row.id
+    state.bing.keywords=row.disasterKeyword;
+    state.bing.disaster_id = row.id
+    getDate();
+    state.isShowDialog = true;
+}
+const getDate = ()=>{
+    getList(1,10,{disasterId:state.data.id}).then(res=>{
+        let data = res.records;
+        for (let index = 0; index < data.length; index++) {
+            const element = data[index];
+            if(element.type == 2){
+                state.baidu = element;
+            }
+            if(element.type == 1){
+                state.baidu = element;
+            }
+            
+        }
+        state.baidu.page=10;
+        state.bing.page=10;
+    })
+   
+}
+const start  = (text)=>{
+    state.baiduOption.runTitle="start(5s)";
+    let count = 4;
+    const countdown = setInterval(function() {
+        if(text=='baidu'){
+            state.baiduOption.runTitle="start("+count+"s)";
+        }else{
+            state.bingOption.runTitle="start("+count+"s)";
+        }
+       
+        count -= 1;
+            if (count < 0) {
+                if(text=='baidu'){
+                state.baiduOption.buttonIs= true ;
+            }else{
+                state.bingOption.buttonIs= true ;
+            }
+            clearInterval(countdown);
+            console.log('倒计时结束');
+        }
+    }, 1000);
+    let  keywords  = (text=='baidu'?state.baidu.keywords:state.bing.keywords);
+    let  page  = (text=='baidu'?state.baidu.page:state.bing.page);
+    let  id = (text=='baidu'?state.baidu.id:state.bing.id);
+    submit(
+        {
+            type:text=='baidu'?2:1,
+            manageId:userInfo.userInfos.id,
+            status:0,
+            disasterId:state.data.id,
+            keywords:keywords,
+            id:(id?id:null)
+        }
+    ).then(ret=>{
+        if(ret == 1042){
+            ElMessage.error("error")
+        }else{
+            news(ret.disasterId, keywords, page,(text=="baidu"),ret.id).then(res=>{
+                getData();
+                ElMessage.success("success")
+            })
+        }
+       
+    })
+}
+
+defineExpose({
+    openDialog,
+})
+
+</script>
+<style >
+.inline-block {
+  display: inline-block;
+}
+
+</style>

src/views/dataService/multimediaData/index.vue

@@ -17,16 +17,15 @@
               <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
               <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
                 <template #default="scope">
-                  <el-button size="small" text type="primary" v-if="scope.row.respondStatus == 2"
+                  <el-button size="small" text type="primary" @click="startBot(scope.row)">start</el-button>
-                    @click="ElMessage.info('start')">start</el-button>
+                  <!-- <el-tag type="info" v-if="scope.row.respondStatus == 3">complete</el-tag> -->
-                  <el-tag type="info" v-if="scope.row.respondStatus == 3">complete</el-tag>
                 </template>
               </el-table-column>
             </el-table>
             <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
-              class="mt15" :pager-count="5" :page-sizes="[10, 20, 30]"
+              class="mt15" :pager-count="2" :page-sizes="[10, 20, 30]"
               v-model:current-page="state.disasterData.param.pageNum" background
-              v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next, jumper"
+              v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
               :total="state.disasterData.total">
             </el-pagination>
           </div>
@@ -35,20 +34,23 @@
           <div class="system-role-padding layout-padding-auto layout-padding-view">
             <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
               <el-form-item label="type" label-width="100px">
-                  <el-select v-model="state.searchName" placeholder="please select data type" style="max-width: 200px"
+                <el-select v-model="state.searchName" placeholder="Please select data type" style="max-width: 200px"
-                    size="default" clearable>
+                  size="default" clearable @change="getTableData(); state.queryTitle = ''">
                   <el-option value="1" label="news"></el-option>
                   <el-option value="2" label="socialMedia"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="stateus" label-width="100px">
-                  <el-select v-model="state.srarchType" placeholder="please select data type" style="max-width: 200px"
+                <el-select v-model=" state.srarchType " placeholder="Please select data type" style="max-width: 200px"
                   size="default" clearable>
                   <el-option value="0" label="No review"></el-option>
                   <el-option value="1" label="reserve"></el-option>
                   <el-option value="2" label="not retain"></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="title" label-width="100px" v-if=" state.searchName == '1' ">
+                <el-input v-model=" state.queryTitle " placeholder="Please enter a title"></el-input>
+              </el-form-item>
               <el-button size="default" type="primary" class="ml10" @click=" getTableData ">
                 <el-icon>
                   <ele-Search />
@@ -66,6 +68,8 @@
               @selection-change=" handleSelectionChange " style="width: 100%">
               <el-table-column type="selection" width="55" />
               <el-table-column type="index" label="ID" width="50" />
+              <el-table-column v-if=" state.searchName == '1' " prop="title" label="title"
+                show-overflow-tooltip></el-table-column>
               <el-table-column prop="content" label="content" show-overflow-tooltip></el-table-column>
               <el-table-column prop="type" label="type" show-overflow-tooltip>
                 <template #default=" scope ">
@@ -91,21 +95,24 @@
               <el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column> -->
               <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
                 <template #default=" scope ">
-                  <el-button size="small" text type="info" v-if="scope.row.status == 0" @click="openDialog(scope.row,true)">review</el-button>
+                  <el-button size="small" text type="info" v-if=" scope.row.status == 0 "
-                  <el-button size="small" text type="success" v-if="scope.row.status == 1" @click="openDialog(scope.row,false)">review</el-button>
+                    @click=" openDialog(scope.row, true) ">review</el-button>
-                  <el-button size="small" text type="danger" v-if="scope.row.status == 2" @click="openDialog(scope.row,false)">review</el-button>
+                  <el-button size="small" text type="success" v-if=" scope.row.status == 1 "
+                    @click=" openDialog(scope.row, false) ">review</el-button>
+                  <el-button size="small" text type="danger" v-if=" scope.row.status == 2 "
+                    @click=" openDialog(scope.row, false) ">review</el-button>
                 </template>
               </el-table-column>
             </el-table>
-            <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
+            <el-pagination style="margin-left: 20px;" @size-change=" onHandleSizeChange " @current-change=" onHandleCurrentChange " class="mt15"
-              :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
+              :pager-count="3" :page-sizes=" [10, 20, 30] " v-model:current-page=" state.tableData.param.pageNum " background
-              v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next, jumper"
+              v-model:page-size=" state.tableData.param.pageSize " layout="total, sizes, prev, pager, next"
               :total=" state.tableData.total" >
             </el-pagination>
           </div>
         </el-col>
       </el-row>
-      <el-dialog v-model="state.dialogVisible" title="Review" width="30%" :before-close="handleClose">
+      <el-dialog v-model=" state.dialogVisible " title="Review" width="30%">
         <!-- <el-form-item label="status">
           <el-select v-model="state.edit.status" placeholder="please select data type" style="max-width: 200px"
                 size="default" clearable>
@@ -128,11 +135,11 @@
         </template>
       </el-dialog>
     </el-config-provider>
-    <Upload ref="uploadRef" @callback="getTableData" />
+    <boot ref="bootRef" @callback=" getTableData " />
   </div>
 </template>
 
-<script lang="ts" setup name="systemRole">
+<script lang="ts" setup name="dataMultimediaData">
 import en from 'element-plus/dist/locale/en.mjs'
 import type { TabsPaneContext } from 'element-plus';
 import { getOtherDataPage, getDisasterPage, deleteData } from '/@/api/data/otherData.js'
@@ -143,9 +150,10 @@ import { getDictionary } from '/@/api/system/dictbiz';
 //复制内容
 import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
+import boot from "./component/boot.vue"
 // 引入组件
 const auditRef = ref();
-const uploadRef = ref();
+const bootRef = ref();
 
 
 // 定义变量内容
@@ -160,6 +168,7 @@ const state = reactive({
   multipleSelection: [],
   searchName: '1',
   disasterId: null,
+  queryTitle: "",
   edit: {
     status: 0,
   },
@@ -271,7 +280,7 @@ const getDisasterData = () => {
 // 初始化表格数据
 const getTableData = () => {
   state.tableData.loading = true;
-  getNewsList(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "isDeleted": 0,status :state.srarchType }, state.searchName == '1' ? true : false).then(res => {
+  getNewsList(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "isDeleted": 0, status: state.srarchType, title: state.queryTitle }, state.searchName == '1' ? true : false).then(res => {
     state.tableData.data = res.records;
     state.tableData.total = res.total;
   })
@@ -282,12 +291,9 @@ const getTableData = () => {
   }, 500);
 };
 // 打开上传弹窗
-const uploadData = () => {
+const startBot = (row: any) => {
-  if (state.disasterId == null) {
+  bootRef.value.openDialog(row);
-    ElMessage.warning("Please select the disaster first")
+
-    return false;
-  }
-  uploadRef.value.openDialog(state.disasterId);
 };
 // 打开修改角色弹窗
 const onOpenEditRole = (type, row) => {
@@ -368,10 +374,13 @@ onMounted(() => {
 .system-role-container {
   .system-role-padding {
     padding: 15px;
-
     .el-table {
       flex: 1;
     }
   }
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/dataService/otherData/index.vue

@@ -4,33 +4,17 @@
       <el-row :gutter="22">
         <el-col :span="10">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
-          <el-table :data="state.disasterData.data"
+            <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
-                    v-loading="state.disasterData.loading"
+              highlight-current-row @row-click="tableClick">
-                    style="width: 100%"
+              <el-table-column type="index" label="ID" width="50" />
-                    highlight-current-row
+              <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-                    @row-click="tableClick">
+              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-            <el-table-column type="index"
+              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
-                             label="ID"
-                             width="50" />
-            <el-table-column prop="disasterType"
-                             label="Disaster type"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="disasterCountry"
-                             label="disaster country"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="disasterTime"
-                             label="disaster time"
-                             show-overflow-tooltip></el-table-column>
             </el-table>
-          <el-pagination @size-change="onHandleDisasterSizeChange"
+            <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
-                         @current-change="onHandleDisasterCurrentChange"
+              class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
-                         class="mt15"
+              v-model:current-page="state.disasterData.param.pageNum" background
-                         :pager-count="5"
+              v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
-                         :page-sizes="[10, 20, 30]"
-                         v-model:current-page="state.disasterData.param.pageNum"
-                         background
-                         v-model:page-size="state.disasterData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
               :total="state.disasterData.total">
             </el-pagination>
           </div>
@@ -38,10 +22,11 @@
         <el-col :span="14">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
             <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
-            <el-select v-model="state.searchName" placeholder="please select data type"  style="max-width: 200px"  size="default" clearable>
+              <el-select v-model="state.searchName" placeholder="please select data type" style="max-width: 200px"
-                <el-option value="1" label="basic data"></el-option>
+                size="default" clearable>
-                <el-option value="2" label="responded report"></el-option>
+                <el-option value="0" label="basic data"></el-option>
-                <el-option value="3" label="cartographic product"></el-option>
+                <el-option value="1" label="responded report"></el-option>
+                <el-option value="2" label="cartographic product"></el-option>
               </el-select>
               <el-button size="default" type="primary" class="ml10" @click="getTableData">
                 <el-icon>
@@ -62,58 +47,36 @@
                 batch delete
               </el-button>
             </div>
-          <el-table :data="state.tableData.data"
+            <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
-                    v-loading="state.tableData.loading"
+              @selection-change="handleSelectionChange" style="width: 100%">
-                    @selection-change="handleSelectionChange"
-                    style="width: 100%">
               <el-table-column type="selection" width="55" />
-            <el-table-column type="index"
+              <el-table-column type="index" label="ID" width="50" />
-                             label="ID"
+              <el-table-column prop="uploaderName" label="uploader Name" show-overflow-tooltip></el-table-column>
-                             width="50" />
+              <el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="uploaderName"
+              <el-table-column prop="title" label="Professional title" show-overflow-tooltip
-                             label="uploader Name"
+                width="150"></el-table-column>
-                             show-overflow-tooltip></el-table-column>
+              <el-table-column prop="size" label="Data size" show-overflow-tooltip>
-            <el-table-column prop="sourceOrganization"
-                             label="Organization"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="title"
-                             label="Professional title"
-                             show-overflow-tooltip width="150"></el-table-column>
-            <el-table-column prop="size"
-                             label="Data size"
-                             show-overflow-tooltip>
                 <template #default="scope">
                   {{ formatSizeUnits(scope.row.size) }}
                 </template>
               </el-table-column>
-            <el-table-column prop="uploadTime"
+              <el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column>
-                             label="Upload time"
+              <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="Operate"
-                             label="Operate"
-                             show-overflow-tooltip>
                 <template #default="scope">
                   <el-button size="small" text type="primary" @click="del(scope.row)">Delete</el-button>
                 </template>
               </el-table-column>
             </el-table>
-          <el-pagination @size-change="onHandleSizeChange"
+            <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                         @current-change="onHandleCurrentChange"
+              :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
-                         class="mt15"
+              v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
-                         :pager-count="5"
-                         :page-sizes="[10, 20, 30]"
-                         v-model:current-page="state.tableData.param.pageNum"
-                         background
-                         v-model:page-size="state.tableData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
               :total="state.tableData.total">
             </el-pagination>
           </div>
         </el-col>
       </el-row>
     </el-config-provider>
-    <RoleDialog ref="roleDialogRef"
+    <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
-                @refresh="getTableData()" />
     <Upload ref="uploadRef" @callback="getTableData" />
   </div>
 </template>
@@ -213,6 +176,8 @@ const getDisasterData = () => {
 const getTableData = () => {
   state.tableData.loading = true;
   getOtherDataPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "type": state.searchName, "isDeleted": 0 }).then(res => {
+    console.log(res);
+    
     state.tableData.data = res.records;
     state.tableData.total = res.total;
   })
@@ -306,9 +271,14 @@ onMounted(() => {
 .system-role-container {
   .system-role-padding {
     padding: 15px;
+
     .el-table {
       flex: 1;
     }
   }
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/dataService/pictureInfo/index.vue

@@ -4,41 +4,24 @@
       <el-row :gutter="22">
         <el-col :span="10">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
-            <el-table :data="state.disasterData.data"
+            <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
-                      v-loading="state.disasterData.loading"
+              highlight-current-row @row-click="tableClick">
-                      style="width: 100%"
+              <el-table-column type="index" label="ID" width="50" />
-                      highlight-current-row
+              <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-                      @row-click="tableClick">
+              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-              <el-table-column type="index"
+              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
-                               label="ID"
-                               width="50" />
-              <el-table-column prop="disasterType"
-                               label="Disaster type"
-                               show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterCountry"
-                               label="disaster country"
-                               show-overflow-tooltip></el-table-column>
-              <el-table-column prop="disasterTime"
-                               label="disaster time"
-                               show-overflow-tooltip></el-table-column>
             </el-table>
-            <el-pagination @size-change="onHandleDisasterSizeChange"
+            <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
-                           @current-change="onHandleDisasterCurrentChange"
+              class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
-                           class="mt15"
+              v-model:current-page="state.disasterData.param.pageNum" background
-                           :pager-count="5"
+              v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
-                           :page-sizes="[10, 20, 30]"
-                           v-model:current-page="state.disasterData.param.pageNum"
-                           background
-                           v-model:page-size="state.disasterData.param.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
               :total="state.disasterData.total">
             </el-pagination>
           </div>
         </el-col>
         <el-col :span="14">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
-            <div class="system-user-search mb15"
+            <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
-                 style="display: flex;margin-left: 10px;margin-top: 10px;">
               <!--            <el-input size="default" placeholder="please enter username" style="max-width: 180px" v-model="state.searchName"
                       clearable></el-input>
             <el-button size="default" type="primary" class="ml10" @click="getTableData">
@@ -47,19 +30,13 @@
               </el-icon>
               search
             </el-button>-->
-              <el-button size="default"
+              <el-button size="default" type="success" class="ml10" @click="uploadData">
-                         type="success"
-                         class="ml10"
-                         @click="uploadData">
                 <el-icon>
                   <ele-Upload />
                 </el-icon>
                 upload
               </el-button>
-              <el-button size="default"
+              <el-button size="default" type="danger" class="ml10" @click="batchDel">
-                         type="danger"
-                         class="ml10"
-                         @click="batchDel">
                 <el-icon>
                   <ele-Delete />
                 </el-icon>
@@ -67,40 +44,24 @@
               </el-button>
             </div>
 
-            <el-table :data="state.tableData.data"
+            <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
-                      v-loading="state.tableData.loading"
+              @selection-change="handleSelectionChange" style="width: 100%">
-                      @selection-change="handleSelectionChange"
+              <el-table-column type="selection" width="55" />
-                      style="width: 100%">
+              <el-table-column type="index" label="ID" width="50" />
-              <el-table-column type="selection"
+              <el-table-column prop="name" label="name" show-overflow-tooltip>
-                               width="55" />
-              <el-table-column type="index"
-                               label="ID"
-                               width="50" />
-              <el-table-column prop="name"
-                               label="name"
-                               show-overflow-tooltip>
                 <template #default="scope">
                   {{ formatName(scope.row.name) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="link"
+              <el-table-column prop="link" label="image" show-overflow-tooltip>
-                               label="image"
-                               show-overflow-tooltip>
                 <template #default="scope">
-                  <el-popover trigger="hover"
+                  <el-popover trigger="hover" placement="right" popper-class="max-h-300px overflow-auto" :width="330">
-                              placement="right"
-                              popper-class="max-h-300px overflow-auto"
-                              :width="330">
                     <!-- table中原本显示的图片 -->
                     <template #reference>
-                      <img :src="scope.row.link"
+                      <img :src="scope.row.link" :alt="scope.row.link" style="max-height: 130px;max-width: 130px">
-                           :alt="scope.row.link"
-                           style="max-height: 130px;max-width: 130px">
                     </template>
                     <!-- 鼠标移入时弹出的图片 -->
-                    <img :src="scope.row.link"
+                    <img :src="scope.row.link" alt="" style="height: 150px;width: 300px">
-                         alt=""
-                         style="height: 150px;width: 300px">
                   </el-popover>
                 </template>
               </el-table-column>
@@ -114,42 +75,26 @@
               <el-table-column prop="type"
                                label="type"
                                show-overflow-tooltip></el-table-column>-->
-              <el-table-column prop="Operate"
+              <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
-                               label="Operate"
-                               show-overflow-tooltip>
                 <template #default="scope">
-                  <el-button size="small"
+                  <el-button size="small" text type="primary" @click="editData(scope.row)">Edit</el-button>
-                             text
+                  <el-button size="small" text type="primary" @click="del(scope.row)">Delete</el-button>
-                             type="primary"
-                             @click="editData(scope.row)">Edit</el-button>
-                  <el-button size="small"
-                             text
-                             type="primary"
-                             @click="del(scope.row)">Delete</el-button>
                 </template>
               </el-table-column>
             </el-table>
-            <el-pagination @size-change="onHandleSizeChange"
+            <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                           @current-change="onHandleCurrentChange"
+               :pager-count="3" :page-sizes="[10, 20, 30]"
-                           class="mt15"
+              v-model:current-page="state.tableData.param.pageNum" background
-                           :pager-count="5"
+              v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
-                           :page-sizes="[10, 20, 30]"
-                           v-model:current-page="state.tableData.param.pageNum"
-                           background
-                           v-model:page-size="state.tableData.param.pageSize"
-                           layout="total, sizes, prev, pager, next, jumper"
               :total="state.tableData.total">
             </el-pagination>
           </div>
         </el-col>
       </el-row>
     </el-config-provider>
-    <RoleDialog ref="roleDialogRef"
+    <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
-                @refresh="getTableData()" />
+    <Upload ref="uploadRef" @callback="getTableData" />
-    <Upload ref="uploadRef"
+    <EditPicture ref="editUploadRef" @callback="getTableData" />
-            @callback="getTableData" />
-    <EditPicture ref="editUploadRef"
-                 @callback="getTableData" />
   </div>
 </template>
 
@@ -345,6 +290,11 @@ onMounted(() => {
 });
 </script>
 <style>
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
+
 .demo-tabs>.el-tabs__content {
   padding: 32px;
   color: #6b778c;
@@ -355,11 +305,13 @@ onMounted(() => {
 .system-role-container {
   .system-role-padding {
     padding: 15px;
+
     .el-table {
       flex: 1;
     }
   }
 }
+
 .demo-tabs>.el-tabs__content {
   padding: 32px;
   color: #6b778c;

src/views/dataService/remoteSensingData/components/retrievalCondition.vue

@@ -25,12 +25,12 @@
           <el-pagination @size-change="onHandleDisasterSizeChange"
                          @current-change="onHandleDisasterCurrentChange"
                          class="mt15"
-                         :pager-count="5"
+                         :pager-count="3"
                          :page-sizes="[10, 20, 30]"
                          v-model:current-page="state.disasterData.param.pageNum"
                          background
                          v-model:page-size="state.disasterData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
+                         layout="total, sizes, prev, pager, next"
                          :total="state.disasterData.total">
           </el-pagination>
         </div>
@@ -96,7 +96,7 @@
                                 clearable
                                 placeholder="Select resolution" />
               </el-col>
-              <el-col :span="5">
+              <el-col :span="3">
                 <el-button size="default"
                            type="primary"
                            class="ml10"
@@ -188,12 +188,12 @@
           <el-pagination @size-change="onHandleSizeChange"
                          @current-change="onHandleCurrentChange"
                          class="mt15"
-                         :pager-count="5"
+                         :pager-count="3"
                          :page-sizes="[10, 20, 30]"
                          background
                          v-model:current-page="state.tableData.param.pageNum"
                          v-model:page-size="state.tableData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
+                         layout="total, sizes, prev, pager, next"
                          :total="state.tableData.total">
           </el-pagination>
         </div>
@@ -640,4 +640,8 @@ const searchDisasterDate = () => {
 .el-pagination {
 	padding-left: 1%;
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/dataService/remoteSensingData/components/searchCondition.vue

@@ -7,7 +7,7 @@
           <el-card class="box-card">
             <span>Select time range</span>
             <el-row class="block">
-              <el-col :span="5">
+              <el-col :span="3">
                 <span class="demonstration">Start time</span>
               </el-col>
               <el-col :span="19">
@@ -19,7 +19,7 @@
               </el-col>
             </el-row>
             <el-row class="block">
-              <el-col :span="5">
+              <el-col :span="3">
                 <span class="demonstration">End time</span>
               </el-col>
               <el-col :span="19">

src/views/dataService/visualData/index.vue

@@ -4,33 +4,17 @@
       <el-row :gutter="22">
         <el-col :span="10">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
-          <el-table :data="state.disasterData.data"
+            <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
-                    v-loading="state.disasterData.loading"
+              highlight-current-row @row-click="tableClick">
-                    style="width: 100%"
+              <el-table-column type="index" label="ID" width="50" />
-                    highlight-current-row
+              <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-                    @row-click="tableClick">
+              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-            <el-table-column type="index"
+              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
-                             label="ID"
-                             width="50" />
-            <el-table-column prop="disasterType"
-                             label="Disaster type"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="disasterCountry"
-                             label="disaster country"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="disasterTime"
-                             label="disaster time"
-                             show-overflow-tooltip></el-table-column>
             </el-table>
-          <el-pagination @size-change="onHandleDisasterSizeChange"
+            <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
-                         @current-change="onHandleDisasterCurrentChange"
+              class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
-                         class="mt15"
+              v-model:current-page="state.disasterData.param.pageNum" background
-                         :pager-count="5"
+              v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
-                         :page-sizes="[10, 20, 30]"
-                         v-model:current-page="state.disasterData.param.pageNum"
-                         background
-                         v-model:page-size="state.disasterData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
               :total="state.disasterData.total">
             </el-pagination>
           </div>
@@ -61,81 +45,45 @@
             </div>
             <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick" type="card">
               <el-tab-pane label="wordclouds" name="first">
-              <el-table :data="state.tableData.data"
+                <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
-                        v-loading="state.tableData.loading"
+                  @selection-change="handleSelectionChange" style="width: 100%">
-                        @selection-change="handleSelectionChange"
-                        style="width: 100%">
                   <el-table-column type="selection" width="55" />
-                <el-table-column type="index"
+                  <el-table-column type="index" label="ID" width="50" />
-                                 label="ID"
+                  <el-table-column prop="time" label="time" show-overflow-tooltip></el-table-column>
-                                 width="50" />
+                  <el-table-column prop="frequency" label="frequency" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="time"
+                  <el-table-column prop="word" label="word" show-overflow-tooltip></el-table-column>
-                                 label="time"
+                  <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column prop="frequency"
-                                 label="frequency"
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column prop="word"
-                                 label="word"
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Operate"
-                                 label="Operate"
-                                 show-overflow-tooltip>
                     <template #default="scope">
                       <el-button size="small" text type="primary" @click="editWordCloud(scope.row)">Edit</el-button>
                       <el-button size="small" text type="primary" @click="delWordCloud(scope.row)">Delete</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
-              <el-pagination @size-change="onHandleSizeChange"
+                <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                             @current-change="onHandleCurrentChange"
+                  :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum"
-                             class="mt15"
+                  background v-model:page-size="state.tableData.param.pageSize"
-                             :pager-count="5"
+                  layout="total, sizes, prev, pager, next" :total="state.tableData.total">
-                             :page-sizes="[10, 20, 30]"
-                             v-model:current-page="state.tableData.param.pageNum"
-                             background
-                             v-model:page-size="state.tableData.param.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="state.tableData.total">
                 </el-pagination>
               </el-tab-pane>
               <el-tab-pane label="hotspot" name="second">
-              <el-table :data="state.tableData.data"
+                <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
-                        v-loading="state.tableData.loading"
+                  @selection-change="handleSelectionHotspotChange" style="width: 100%">
-                        @selection-change="handleSelectionHotspotChange"
-                        style="width: 100%">
                   <el-table-column type="selection" width="55" />
-                <el-table-column type="index"
+                  <el-table-column type="index" label="ID" width="50" />
-                                 label="ID"
+                  <el-table-column prop="areaCn" label="area cn" show-overflow-tooltip></el-table-column>
-                                 width="50" />
+                  <el-table-column prop="areaEn" label="area en" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="areaCn"
+                  <el-table-column prop="frequency" label="frequency" show-overflow-tooltip></el-table-column>
-                                 label="area cn"
+                  <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column prop="areaEn"
-                                 label="area en"
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column prop="frequency"
-                                 label="frequency"
-                                 show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Operate"
-                                 label="Operate"
-                                 show-overflow-tooltip>
                     <template #default="scope">
                       <el-button size="small" text type="primary" @click="editHotspot(scope.row)">Edit</el-button>
                       <el-button size="small" text type="primary" @click="delHotspot(scope.row)">Delete</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
-              <el-pagination @size-change="onHandleSizeChange"
+                <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                             @current-change="onHandleCurrentChange"
+                  :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum"
-                             class="mt15"
+                  background v-model:page-size="state.tableData.param.pageSize"
-                             :pager-count="5"
+                  layout="total, sizes, prev, pager, next" :total="state.tableData.total">
-                             :page-sizes="[10, 20, 30]"
-                             v-model:current-page="state.tableData.param.pageNum"
-                             background
-                             v-model:page-size="state.tableData.param.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="state.tableData.total">
                 </el-pagination>
               </el-tab-pane>
             </el-tabs>
@@ -143,8 +91,7 @@
         </el-col>
       </el-row>
     </el-config-provider>
-    <RoleDialog ref="roleDialogRef"
+    <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
-                @refresh="getTableData()" />
     <HotspotForm ref="hotspotRef" @callback="getTableData" />
     <WordClouds ref="wordCloudsRef" @callback="getTableData" />
     <EditHotspotForm ref="editHotspotRef" @callback="getTableData" />
@@ -406,15 +353,21 @@ onMounted(() => {
 .system-role-container {
   .system-role-padding {
     padding: 15px;
+
     .el-table {
       flex: 1;
     }
   }
 }
+
 .demo-tabs>.el-tabs__content {
-  padding: 32px;
+  padding: 10px;
   color: #6b778c;
   font-size: 32px;
   font-weight: 600;
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/dataUploadAndRetrieval/dataRetrieval/index.vue

@@ -90,12 +90,12 @@
 				@size-change="onHandleSizeChange"
 				@current-change="onHandleCurrentChange"
 				class="mt15"
-				:pager-count="5"
+				:pager-count="3"
 				:page-sizes="[10, 20, 30]"
 				v-model:current-page="state.tableData.param.pageNum"
 				background
 				v-model:page-size="state.tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
+				layout="total, sizes, prev, pager, next"
 				:total="state.tableData.total"
 			>
 			</el-pagination> -->

src/views/dataUploadAndRetrieval/dataUpload/index.vue

@@ -90,12 +90,12 @@
 				@size-change="onHandleSizeChange"
 				@current-change="onHandleCurrentChange"
 				class="mt15"
-				:pager-count="5"
+				:pager-count="3"
 				:page-sizes="[10, 20, 30]"
 				v-model:current-page="state.tableData.param.pageNum"
 				background
 				v-model:page-size="state.tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
+				layout="total, sizes, prev, pager, next"
 				:total="state.tableData.total"
 			>
 			</el-pagination> -->

src/views/login/component/account.vue

@@ -24,7 +24,7 @@
 		</el-form-item>
 		<el-form-item class="login-animation3" v-if="state.captchaMode">
 			<el-col :span="15">
-				<el-input text maxlength="5" placeholder="Please input validate code" v-model="state.ruleForm.code" clearable autocomplete="off">
+				<el-input text maxlength="3" placeholder="Please input validate code" v-model="state.ruleForm.code" clearable autocomplete="off">
 					<template #prefix>
 						<el-icon class="el-input__icon"><ele-Position /></el-icon>
 					</template>

src/views/responseManagement/contact/index.vue

@@ -14,8 +14,8 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4">
-                                        <el-form-item label="checked">
+                                        <el-form-item label="checked" style="margin-left: 10px;">
-                                            <el-select size="default" v-model="state.query.status" clearable
+                                            <el-select size="default" v-model="state.query.status" clearable style="max-width: 180px"
                                                 placeholder="Replied">
                                                 <el-option label="UnReplied" :value="0"></el-option>
                                                 <el-option label="Replied" :value="1"></el-option>
@@ -57,9 +57,9 @@
                         </el-table-column>
                     </el-table>
                     <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                        :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum"
+                        :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum"
                         background v-model:page-size="state.tableData.param.pageSize"
-                        layout="total, sizes, prev, pager, next, jumper" :total="state.tableData.total">
+                        layout="total, sizes, prev, pager, next" :total="state.tableData.total">
                     </el-pagination>
                 </el-card>
             </el-col>
@@ -217,3 +217,10 @@ onMounted(() => {
 
 });
 </script>
+<style>
+
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
+</style>

src/views/responseManagement/dataUpload/index.vue

@@ -4,33 +4,17 @@
       <el-row :gutter="22">
         <el-col :span="10">
           <div class="system-role-padding layout-padding-auto layout-padding-view">
-          <el-table :data="state.disasterData.data"
+            <el-table :data="state.disasterData.data" v-loading="state.disasterData.loading" style="width: 100%"
-                    v-loading="state.disasterData.loading"
+              highlight-current-row @row-click="tableClick">
-                    style="width: 100%"
+              <el-table-column type="index" label="ID" width="50" />
-                    highlight-current-row
+              <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip></el-table-column>
-                    @row-click="tableClick">
+              <el-table-column prop="disasterCountry" label="disaster country" show-overflow-tooltip></el-table-column>
-            <el-table-column type="index"
+              <el-table-column prop="disasterTime" label="disaster time" show-overflow-tooltip></el-table-column>
-                             label="ID"
-                             width="50" />
-            <el-table-column prop="disasterType"
-                             label="Disaster type"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="disasterCountry"
-                             label="disaster country"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="disasterTime"
-                             label="disaster time"
-                             show-overflow-tooltip></el-table-column>
             </el-table>
-          <el-pagination @size-change="onHandleDisasterSizeChange"
+            <el-pagination @size-change="onHandleDisasterSizeChange" @current-change="onHandleDisasterCurrentChange"
-                         @current-change="onHandleDisasterCurrentChange"
+              class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
-                         class="mt15"
+              v-model:current-page="state.disasterData.param.pageNum" background
-                         :pager-count="5"
+              v-model:page-size="state.disasterData.param.pageSize" layout="total, sizes, prev, pager, next"
-                         :page-sizes="[10, 20, 30]"
-                         v-model:current-page="state.disasterData.param.pageNum"
-                         background
-                         v-model:page-size="state.disasterData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
               :total="state.disasterData.total">
             </el-pagination>
           </div>
@@ -45,59 +29,36 @@
                 batch audit
               </el-button>
             </div>
-          <el-table :data="state.tableData.data"
+            <el-table :data="state.tableData.data" v-loading="state.tableData.loading"
-                    v-loading="state.tableData.loading"
+              @selection-change="handleSelectionChange" style="width: 100%">
-                    @selection-change="handleSelectionChange"
-                    style="width: 100%">
               <el-table-column type="selection" width="55" />
-            <el-table-column type="index"
+              <el-table-column type="index" label="ID" width="50" />
-                             label="ID"
+              <el-table-column prop="uploaderName" label="uploader Name" show-overflow-tooltip></el-table-column>
-                             width="50" />
+              <el-table-column prop="sourceOrganization" label="Organization" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="uploaderName"
+              <el-table-column prop="title" label="Professional title" show-overflow-tooltip
-                             label="uploader Name"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="sourceOrganization"
-                             label="Organization"
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="title"
-                             label="Professional title"
-                             show-overflow-tooltip
                 width="150"></el-table-column>
-            <el-table-column prop="size"
+              <el-table-column prop="size" label="Data size" show-overflow-tooltip>
-                             label="Data size"
-                             show-overflow-tooltip>
                 <template #default="scope">
                   {{ formatSizeUnits(scope.row.size) }}
                 </template>
               </el-table-column>
-            <el-table-column prop="uploadTime"
+              <el-table-column prop="uploadTime" label="Upload time" show-overflow-tooltip></el-table-column>
-                             label="Upload time"
+              <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
-                             show-overflow-tooltip></el-table-column>
-            <el-table-column prop="Operate"
-                             label="Operate"
-                             show-overflow-tooltip>
                 <template #default="scope">
                   <el-button size="small" text type="primary" @click="auditData(scope.row)">Audit</el-button>
                 </template>
               </el-table-column>
             </el-table>
-          <el-pagination @size-change="onHandleSizeChange"
+            <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                         @current-change="onHandleCurrentChange"
+              :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
-                         class="mt15"
+              v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
-                         :pager-count="5"
-                         :page-sizes="[10, 20, 30]"
-                         v-model:current-page="state.tableData.param.pageNum"
-                         background
-                         v-model:page-size="state.tableData.param.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
               :total="state.tableData.total">
             </el-pagination>
           </div>
         </el-col>
       </el-row>
     </el-config-provider>
-    <RoleDialog ref="roleDialogRef"
+    <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
-                @refresh="getTableData()" />
     <Audit ref="auditRef" @callback="getTableData" />
   </div>
 </template>
@@ -274,9 +235,14 @@ onMounted(() => {
 .system-role-container {
   .system-role-padding {
     padding: 15px;
+
     .el-table {
       flex: 1;
     }
   }
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/responseManagement/tool/index.vue

@@ -14,7 +14,7 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="4">
-                                        <el-form-item label="checked">
+                                        <el-form-item label="checked" style="margin-left: 10px;">
                                             <el-select size="default" v-model="state.query.checked" clearable
                                                 placeholder="Please select">
                                                 <el-option label="checked" value="0"></el-option>
@@ -62,10 +62,10 @@
                             </el-table-column>
                         </el-table>
                         <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange"
-                            class="mt15" :pager-count="5" :page-sizes="[10, 20, 30]"
+                            class="mt15" :pager-count="3" :page-sizes="[10, 20, 30]"
                             v-model:current-page="state.tableData.param.pageNum" background
                             v-model:page-size="state.tableData.param.pageSize"
-                            layout="total, sizes, prev, pager, next, jumper" :total="state.tableData.total">
+                            layout="total, sizes, prev, pager, next" :total="state.tableData.total">
                         </el-pagination>
                     </el-card>
                 </el-col>
@@ -171,3 +171,10 @@ onMounted(() => {
 
 });
 </script>
+<style>
+
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
+</style>

src/views/responseManagement/userResponse/component/selectUser.vue

@@ -18,9 +18,9 @@
 					<el-table-column prop="email" label="E-mail" show-overflow-tooltip></el-table-column>
 				</el-table>
 				<el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-					:pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum"
+					:pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum"
 					background v-model:page-size="state.tableData.param.pageSize"
-					layout="total, sizes, prev, pager, next, jumper" :total="state.tableData.total">
+					layout="total, sizes, prev, pager, next" :total="state.tableData.total">
 				</el-pagination>
 			</el-card>
 			<template #footer>
@@ -131,3 +131,9 @@ defineExpose({
 	openDialog,
 });
 </script>
+<style>
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
+</style>

src/views/responseManagement/userResponse/index.vue

@@ -2,38 +2,65 @@
   <div class="system-role-container layout-padding">
     <el-config-provider :locale="en">
       <div class="system-role-padding layout-padding-auto layout-padding-view">
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" style="margin-left: 20px">
+        <el-tabs v-model="activeName"
-        <el-tab-pane label="unchecked" name="first">
+                 class="demo-tabs"
-          <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+                 @tab-click="handleClick"
-            <el-table-column type="index" label="ID" width="50" />
+                 style="margin-left: 20px">
-            <el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
+          <el-tab-pane label="unchecked"
-            <el-table-column prop="organization" label="Organization" show-overflow-tooltip></el-table-column>
+                       name="first">
-            <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip>
+            <el-table :data="state.tableData.data"
+                      v-loading="state.tableData.loading"
+                      style="width: 100%">
+              <el-table-column type="index"
+                               label="ID"
+                               width="50" />
+              <el-table-column prop="username"
+                               label="User name"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="organization"
+                               label="Organization"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterType"
+                               label="Disaster type"
+                               show-overflow-tooltip>
                 <!-- 在disasterType中获取dictKey 对应的dictValue -->
                 <template #default="scope">
                   <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
                 </template>
               </el-table-column>
-            <el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterKeyword"
+                               label="Disaster keyword"
+                               show-overflow-tooltip></el-table-column>
               <!-- <el-table-column prop="affectedCountry" label="Affected country" show-overflow-tooltip></el-table-column> -->
               <!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> -->
-            <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip>
+              <el-table-column prop="disasterTime"
+                               label="Disaster time"
+                               show-overflow-tooltip>
                 <template #default="scope">
                   <!-- 格式化去除时分秒 -->
                   {{ dateFormat(scope.row.disasterTime) }}
                 </template>
               </el-table-column>
               <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
-            <el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
+              <el-table-column prop="respondStatus"
+                               label="Response status"
+                               show-overflow-tooltip>
                 <template #default="scope">
-                <el-tag type="info" v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
+                  <el-tag type="info"
-                <el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag>
+                          v-if="scope.row.respondStatus === 0">Not reviewed</el-tag>
+                  <el-tag type="info"
+                          v-if="scope.row.respondStatus === 1">Failed</el-tag>
                 </template>
               </el-table-column>
-            <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
+              <el-table-column prop="Operate"
+                               label="Operate"
+                               show-overflow-tooltip>
                 <template #default="scope">
-                <el-button size="small" text type="primary" @click="onOpenEditRole('edit', scope.row)">Review</el-button>
+                  <el-button size="small"
+                             text
+                             type="primary"
+                             @click="onOpenEditRole('edit', scope.row)">Review</el-button>
                 </template>
               </el-table-column>
 
@@ -56,92 +83,140 @@
 							</template>
 						</el-table-column> -->
             </el-table>
-          <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
+            <el-pagination @size-change="onHandleSizeChange"
-            :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.current" background
+                           @current-change="onHandleCurrentChange"
-            v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper"
+                           class="mt15"
+                           :pager-count="3"
+                           :page-sizes="[10, 20, 30]"
+                           v-model:current-page="state.tableData.param.current"
+                           background
+                           v-model:page-size="state.tableData.param.size"
+                           layout="total, sizes, prev, pager, next"
                            :total="state.tableData.total">
             </el-pagination>
           </el-tab-pane>
-        <el-tab-pane label="checked" name="second">
+          <el-tab-pane label="checked"
-          <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+                       name="second">
-            <el-table-column type="index" label="ID" width="50" />
+            <el-table :data="state.tableData.data"
-            <el-table-column prop="username" label="User name" show-overflow-tooltip></el-table-column>
+                      v-loading="state.tableData.loading"
+                      style="width: 100%">
+              <el-table-column type="index"
+                               label="ID"
+                               width="50" />
+              <el-table-column prop="username"
+                               label="User name"
+                               show-overflow-tooltip></el-table-column>
               <!-- <el-table-column prop="Administrator" label="Administrator" show-overflow-tooltip></el-table-column> -->
-            <el-table-column prop="organization" label="Organization" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="organization"
-            <el-table-column prop="email" label="Email" show-overflow-tooltip></el-table-column>
+                               label="Organization"
-            <el-table-column prop="disasterType" label="Disaster type" show-overflow-tooltip>
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="email"
+                               label="Email"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterType"
+                               label="Disaster type"
+                               show-overflow-tooltip>
                 <!-- 在disasterType中获取dictKey 对应的dictValue -->
                 <template #default="scope">
                   <el-tag type="info">{{ getValue(scope.row.disasterType) }}</el-tag>
                 </template>
               </el-table-column>
-            <el-table-column prop="disasterKeyword" label="Disaster keyword" show-overflow-tooltip></el-table-column>
+              <el-table-column prop="disasterKeyword"
+                               label="Disaster keyword"
+                               show-overflow-tooltip></el-table-column>
               <!-- <el-table-column prop="Affected country" label="Affected country" show-overflow-tooltip></el-table-column> -->
               <!-- <el-table-column prop="Longitude" label="Longitude" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Latitude" label="Latitude" show-overflow-tooltip></el-table-column> -->
-              <el-table-column prop="disasterTime" label="Disaster time" show-overflow-tooltip>
+              <el-table-column prop="disasterTime"
+                               label="Disaster time"
+                               show-overflow-tooltip>
                 <template #default="scope">
                   <!-- 格式化去除时分秒 -->
                   {{ dateFormat(scope.row.disasterTime) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="chiefName" label="Answer" show-overflow-tooltip></el-table-column>
               <!-- <el-table-column prop="responseTime" label="Response time" show-overflow-tooltip></el-table-column> -->
               <!-- <el-table-column prop="Operate" label="Operate" show-overflow-tooltip></el-table-column> -->
-            <el-table-column prop="respondStatus" label="Response status" show-overflow-tooltip>
+              <el-table-column prop="respondStatus"
+                               label="Response status"
+                               show-overflow-tooltip>
 
                 <template #default="scope">
-                <el-tag type="info" v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
+                  <el-tag type="info"
-                <el-tag type="info" v-if="scope.row.respondStatus === 1">Failed</el-tag>
+                          v-if="scope.row.respondStatus === 2">Reviewed</el-tag>
+                  <el-tag type="info"
+                          v-if="scope.row.respondStatus === 1">Failed</el-tag>
                 </template>
 
               </el-table-column>
-
-            <el-table-column prop="Operate" label="Operate" show-overflow-tooltip>
-              <template #default="scope">
-                <el-button size="small" text type="primary" @click="onAllocation(scope.row)">Allocation</el-button>
-              </template>
-            </el-table-column>
             </el-table>
-          <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
+            <el-pagination @size-change="onHandleSizeChange"
-            :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.current" background
+                           @current-change="onHandleCurrentChange"
-            v-model:page-size="state.tableData.param.size" layout="total, sizes, prev, pager, next, jumper"
+                           class="mt15"
+                           :pager-count="3"
+                           :page-sizes="[10, 20, 30]"
+                           v-model:current-page="state.tableData.param.current"
+                           background
+                           v-model:page-size="state.tableData.param.size"
+                           layout="total, sizes, prev, pager, next"
                            :total="state.tableData.total">
             </el-pagination>
           </el-tab-pane>
         </el-tabs>
       </div>
-    <el-dialog v-model="state.dialogVisible" title="Review" width="30%">
+      <el-dialog v-model="state.dialogVisible"
+                 title="Review"
+                 width="30%"
+                 :before-close="handleClose">
         <el-container style="margin-top: -2%;margin-bottom: 2%;">
-        <el-radio v-model="state.radio" label='1' @click="mapEvents('1')">Point</el-radio>
+          <el-radio v-model="state.radio"
-        <el-radio v-model="state.radio" label='2' @click="mapEvents('2')">Area</el-radio>
+                    label='1'
-        <el-button type="primary" style="margin-left: 5%;" @click="ClearSubmit">Clear</el-button>
+                    @click="mapEvents('1')">Point</el-radio>
+          <el-radio v-model="state.radio"
+                    label='2'
+                    @click="mapEvents('2')">Area</el-radio>
+          <el-button type="primary"
+                     style="margin-left: 5%;"
+                     @click="ClearSubmit">Clear</el-button>
         </el-container>
-      <el-container style="margin-top: 2%;margin-bottom: 2%;" v-if="state.radio==='1'?true:false">
+        <el-container style="margin-top: 2%;margin-bottom: 2%;"
+                      v-if="state.radio === '1' ? true : false">
           <span style="line-height: 35px;"> Latitude：</span>
-        <el-input placeholder="wait……" style="height:35px;margin-right: 1%;" v-model="state.dislat" readonly="readonly"> </el-input>
+          <el-input placeholder="请输入内容"
+                    style="height:35px;margin-right: 1%;"
+                    v-model="state.dislat"></el-input>
           <span style="line-height: 35px;">Longitude：</span>
-        <el-input  placeholder="wait……" style="height:35px;"  v-model="state.dislon" readonly="readonly"></el-input>
+          <el-input placeholder="请输入内容"
+                    style="height:35px;"></el-input>
         </el-container>
-      <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;" ref="mapRef"></MapPage>
+
+        <Map style="height:350px ; width:100% ;margin-bottom: 10px;"
+             ref="map"></Map>
+
+        <MapPage style="height:350px ; width:100% ;margin-bottom: 10px;"
+                 ref="mapRef"></MapPage>
+
         <el-form-item label="Disaster Time">
-        <el-date-picker v-model="state.edit.disasterTime" type="date" value-format="YYYY-MM-DD"
+          <el-date-picker v-model="state.edit.disasterTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
                           placeholder="Select date and time" />
         </el-form-item>
 
         <template #footer>
           <span class="dialog-footer">
             <el-button @click="dialogVisible = false">Cancel</el-button>
-          <el-button type="danger" @click="reviews(1)">
+            <el-button type="danger"
+                       @click="reviews(1)">
               Not Review
             </el-button>
-          <el-button type="primary" @click="reviews(2)">
+            <el-button type="primary"
+                       @click="reviews(2)">
               Review
             </el-button>
           </span>
         </template>
       </el-dialog>
-    <selectUser ref ="select" @callback="getTableData"></selectUser>
     </el-config-provider>
   </div>
 </template>
@@ -152,23 +227,18 @@ import { reactive, onMounted, ref, nextTick,watchEffect,defineAsyncComponent } f
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { getList, review } from '/@/api/disasterInfo/index';
 import { getDictionary } from '/@/api/system/dictbiz';
-import { useVariableStore } from '/@/stores/index.ts'
 //引入地图
 import Map from '/@/components/Map.vue';
 import { useDateFormat } from '@vueuse/shared';
-import selectUser from './component/selectUser.vue';
 import L from "leaflet";
 import '@geoman-io/leaflet-geoman-free';
 import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
 import "leaflet/dist/leaflet.css";
 import 'leaflet-draw/dist/leaflet.draw'
 import 'leaflet-draw/dist/leaflet.draw.css'
-import { map } from 'lodash';
+const map = ref();
-import * as turf from '@turf/turf'
-const variableStore = useVariableStore();
-const mapRef = ref();
 const activeName = ref('first');
-const select = ref();
+
 const handleClick = (tab, event) => {
   state.selectName = tab.props.name;
   getTableData();
@@ -203,8 +273,7 @@ const state = reactive({
   edit: {},
   radio: null,
   dislat: '',
-  dislon:'',
+  dislon: ''
-  wktPoint:undefined
 });
 // 初始化表格数据
 const getTableData = () => {
@@ -215,6 +284,7 @@ const getTableData = () => {
   } else {
     state.tableData.param.respondStatus = 2;
   }
+  console.log(activeName.value);
   getList(state.tableData.param).then((res) => {
     state.tableData.data = res.records;
     state.tableData.total = res.total;
@@ -229,6 +299,11 @@ const onOpenEditRole = (type, row) => {
 
   //深拷贝
   state.edit = JSON.parse(JSON.stringify(row));
+  nextTick(() => {
+    //赋值地图范围，并且可以修改点或者区域
+    //TODO
+    map.mapOperations.wktParseToMap(row.geometry)
+  });
   state.dialogVisible = true;
   setTimeout(() => {
     state.radio = "1"
@@ -248,8 +323,8 @@ const onOpenEditRole = (type, row) => {
 };
 const mapEvents = (ev) => {
   if (ev == '1') {
-    // mapRef.value.mapOperations.clearPolygon()
+    mapRef.value.mapOperations.clearPolygon()
-    mapRef.value.mapOperations.on("click", mapClick)
+    // mapRef.value.mapOperations.on("click", mapClick)
     mapRef.value.mapOperations.on("mousemove", changelatlon)
     variableStore.polygoncontrol = "option1"
   } else {
@@ -270,21 +345,18 @@ const mapClick=(res)=>{
   changelatlon(res);
   mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3), res.latlng.lng.toFixed(3))
 }
+
 const reviews = (index) => {
   //将修改后的地图位置赋值到state.edit.geometry
   //TODO 修改地图赋值
   //state.edit.geometry = map.mapOperations.getWkt();
 
   //判断index的值来判断是审核通过还是不通过
-
-
-
   if (index === 1) {
     state.edit.respondStatus = 1;
   } else {
     state.edit.respondStatus = 2;
   }
-  state.edit.geometry = variableStore.layerGroupPoint === null ? variableStore.layerGroupPoly : variableStore.layerGroupPoint;
   //时间格式化
   state.edit.disasterTime = useDateFormat(state.edit.disasterTime, 'YYYY-MM-DD').value + " 00:00:00";
   review(state.edit).then((res) => {
@@ -295,13 +367,20 @@ const reviews = (index) => {
 }
 // 分页改变
 const onHandleCurrentChange = (val) => {
+  console.log(val);
   state.tableData.param.pageNum = val;
   getTableData();
 };
+const onMapClick = (e) => {
+  state.lat = e.latlng.lat.toFixed(3);
+  state.lon = e.latlng.lng.toFixed(3);
+  map.value.mapOperations.addInteractMarker(state.lat, state.lon)
+}
 const changelatlon = (e) => {
-  //深拷贝e
+
   state.dislat = e.latlng.lat.toFixed(3);
   state.dislon = e.latlng.lng.toFixed(3);
+  // state.lon = state.lon % 360;
   // if (state.lon < 0) {
   //   state.lon = state.lon + 360;
   // }
@@ -349,13 +428,13 @@ onMounted(() => {
   });
   watchEffect(() => {
     if (state.radio == "1") {
-      // mapRef.value.mapOperations.on("click", onMapClick)
+      // map.value.mapOperations.on("click", onMapClick)
       // map.value.mapOperations.clearPolygon()     
       // map.value.mapOperations.on("mousemove", changelatlon)
       // variableStore.polygoncontrol = "option1"
     }
     else {
-      // mapRef.value.mapOperations.off("click", onMapClick)
+      // map.value.mapOperations.off("click", onMapClick)
       // map.value.mapOperations.drawPolygon()
       // map.value.mapOperations.drawCreated()
       // variableStore.polygoncontrol = "option2"
@@ -384,4 +463,8 @@ const getValue = (key) => {
 		}
 	}
 }
+.mt15 {
+	float: right;
+	margin-bottom: 15px;
+}
 </style>

src/views/system/dic/index.vue

@@ -38,12 +38,12 @@
 				@size-change="onHandleSizeChange"
 				@current-change="onHandleCurrentChange"
 				class="mt15"
-				:pager-count="5"
+				:pager-count="3"
 				:page-sizes="[10, 20, 30]"
 				v-model:current-page="state.tableData.param.pageNum"
 				background
 				v-model:page-size="state.tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
+				layout="total, sizes, prev, pager, next"
 				:total="state.tableData.total"
 			>
 			</el-pagination> -->

src/views/system/role/index.vue

@@ -74,12 +74,12 @@
       <el-pagination @size-change="onHandleSizeChange"
                      @current-change="onHandleCurrentChange"
                      class="mt15"
-                     :pager-count="5"
+                     :pager-count="3"
                      :page-sizes="[10, 20, 30]"
                      v-model:current-page="state.tableData.param.pageNum"
                      background
                      v-model:page-size="state.tableData.param.pageSize"
-                     layout="total, sizes, prev, pager, next, jumper"
+                     layout="total, sizes, prev, pager, next"
                      :total="state.tableData.total">
       </el-pagination>
     </div>
@@ -175,4 +175,8 @@ onMounted(() => {
 		}
 	}
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/system/user/index.vue

@@ -1,99 +1,53 @@
 <template>
   <div class="system-user-container layout-padding">
-    <el-card shadow="hover"
+    <el-card shadow="hover" class="layout-padding-auto">
-             class="layout-padding-auto">
       <div class="system-user-search mb15">
-        <el-input size="default"
+        <el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
-                  placeholder="请输入用户名称"
+        <el-button size="default" type="primary" class="ml10">
-                  style="max-width: 180px"> </el-input>
-        <el-button size="default"
-                   type="primary"
-                   class="ml10">
           <el-icon>
             <ele-Search />
           </el-icon>
           查询
         </el-button>
-        <el-button size="default"
+        <el-button size="default" type="success" class="ml10" @click="onOpenAddUser('add')">
-                   type="success"
-                   class="ml10"
-                   @click="onOpenAddUser('add')">
           <el-icon>
             <ele-FolderAdd />
           </el-icon>
           新增用户
         </el-button>
       </div>
-      <el-table :data="state.tableData.data"
+      <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
-                v-loading="state.tableData.loading"
+        <el-table-column type="index" label="序号" width="60" />
-                style="width: 100%">
+        <el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
-        <el-table-column type="index"
+        <el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
-                         label="序号"
+        <el-table-column prop="roleSign" label="关联角色" show-overflow-tooltip></el-table-column>
-                         width="60" />
+        <el-table-column prop="department" label="部门" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="userName"
+        <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
-                         label="账户名称"
+        <el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
-                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="status" label="用户状态" show-overflow-tooltip>
-        <el-table-column prop="userNickname"
-                         label="用户昵称"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="roleSign"
-                         label="关联角色"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="department"
-                         label="部门"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="phone"
-                         label="手机号"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="email"
-                         label="邮箱"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="status"
-                         label="用户状态"
-                         show-overflow-tooltip>
           <template #default="scope">
-            <el-tag type="success"
+            <el-tag type="success" v-if="scope.row.status">启用</el-tag>
-                    v-if="scope.row.status">启用</el-tag>
+            <el-tag type="info" v-else>禁用</el-tag>
-            <el-tag type="info"
-                    v-else>禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="describe"
+        <el-table-column prop="describe" label="用户描述" show-overflow-tooltip></el-table-column>
-                         label="用户描述"
+        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
-                         show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="100">
-        <el-table-column prop="createTime"
-                         label="创建时间"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作"
-                         width="100">
           <template #default="scope">
-            <el-button :disabled="scope.row.userName === 'admin'"
+            <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
-                       size="small"
-                       text
-                       type="primary"
               @click="onOpenEditUser('edit', scope.row)">修改</el-button>
-            <el-button :disabled="scope.row.userName === 'admin'"
+            <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
-                       size="small"
-                       text
-                       type="primary"
               @click="onRowDel(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="onHandleSizeChange"
+      <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" class="mt15"
-                     @current-change="onHandleCurrentChange"
+        :pager-count="3" :page-sizes="[10, 20, 30]" v-model:current-page="state.tableData.param.pageNum" background
-                     class="mt15"
+        v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next"
-                     :pager-count="5"
-                     :page-sizes="[10, 20, 30]"
-                     v-model:current-page="state.tableData.param.pageNum"
-                     background
-                     v-model:page-size="state.tableData.param.pageSize"
-                     layout="total, sizes, prev, pager, next, jumper"
         :total="state.tableData.total">
       </el-pagination>
     </el-card>
-    <UserDialog ref="userDialogRef"
+    <UserDialog ref="userDialogRef" @refresh="getTableData()" />
-                @refresh="getTableData()" />
   </div>
 </template>
 
@@ -188,9 +142,14 @@ onMounted(() => {
     flex-direction: column;
     flex: 1;
     overflow: auto;
+
     .el-table {
       flex: 1;
     }
   }
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/systemManagement/administrator/index.vue

@@ -59,12 +59,12 @@
       <el-pagination @size-change="onHandleSizeChange"
                      @current-change="onHandleCurrentChange"
                      class="mt15"
-                     :pager-count="5"
+                     :pager-count="3"
                      :page-sizes="[10, 20, 30]"
                      v-model:current-page="state.tableData.param.pageNum"
                      background
                      v-model:page-size="state.tableData.param.pageSize"
-                     layout="total, sizes, prev, pager, next, jumper"
+                     layout="total, sizes, prev, pager, next"
                      :total="state.tableData.total">
       </el-pagination>
       </el-config-provider>
@@ -201,4 +201,8 @@ onMounted(() => {
 }
 }
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/systemManagement/chiefAdministrator/component/disasterInfo.vue

@@ -22,12 +22,12 @@
     <el-pagination @size-change="onHandleSizeChange"
                    @current-change="onHandleCurrentChange"
                    class="mt15"
-                   :pager-count="5"
+                   :pager-count="3"
                    :page-sizes="[10, 20, 30]"
                    v-model:current-page="state.tableData.param.pageNum"
                    background
                    v-model:page-size="state.tableData.param.pageSize"
-                   layout="total, sizes, prev, pager, next, jumper"
+                   layout="total, sizes, prev, pager, next"
                    :total="state.tableData.total">
     </el-pagination>
     </el-config-provider>
@@ -125,5 +125,8 @@ defineExpose({
 </script>
 
 <style scoped>
-
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue

@@ -44,12 +44,12 @@
     <el-pagination @size-change="onHandleSizeChange"
                    @current-change="onHandleCurrentChange"
                    class="mt15"
-                   :pager-count="5"
+                   :pager-count="3"
                    :page-sizes="[10, 20, 30]"
                    v-model:current-page="state.tableData.param.pageNum"
                    background
                    v-model:page-size="state.tableData.param.pageSize"
-                   layout="total, sizes, prev, pager, next, jumper"
+                   layout="total, sizes, prev, pager, next"
                    :total="state.tableData.total">
     </el-pagination>
     <DisasterInfo ref="disasterInfoRef" @callback="getTableData"/>
@@ -154,5 +154,8 @@ defineExpose({
 </script>
 
 <style scoped>
-
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>

src/views/systemManagement/chiefAdministrator/index.vue

@@ -60,12 +60,12 @@
       <el-pagination @size-change="onHandleSizeChange"
                      @current-change="onHandleCurrentChange"
                      class="mt15"
-                     :pager-count="5"
+                     :pager-count="3"
                      :page-sizes="[10, 20, 30]"
                      v-model:current-page="state.tableData.param.pageNum"
                      background
                      v-model:page-size="state.tableData.param.pageSize"
-                     layout="total, sizes, prev, pager, next, jumper"
+                     layout="total, sizes, prev, pager, next"
                      :total="state.tableData.total">
       </el-pagination>
       </el-config-provider>
@@ -234,4 +234,8 @@ onMounted(() => {
 		}
 	}
 }
+.mt15 {
+  float: right;
+  margin-bottom: 15px;
+}
 </style>