glj-代码提交

src/views/dataService/disasterPartners/component/editPicture.vue

@@ -2,13 +2,21 @@
   <el-dialog title="edit" v-model="state.isShowDialog" width="550px">
     <el-form :model="state.ruleForm" size="default" label-width="150px" :rules="rules" ref="adminAddFormRef">
       <el-form-item prop="title" label="name">
-        <el-input v-model="state.ruleForm.title" class="m-2" placeholder="please enter name" :rows="3" type="text"
-          style="width:220px;" />
+        <el-select v-model="state.ruleForm.title" class="m-2" placeholder="please enter name">
+          <el-option label="GDACS" value="GDACS"></el-option>
+          <el-option label="Charter" value="Charter"></el-option>
+          <el-option label="USGS" value="USGS"></el-option>
+          <el-option label="INGV" value="INGV"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item prop="link" label="link">
         <el-input v-model="state.ruleForm.link" class="m-2" placeholder="please enter link" :rows="3" type="text"
           style="width:220px;" />
       </el-form-item>
+      <el-form-item prop="websiteId" label="websiteid">
+        <el-input v-model="state.ruleForm.websiteId" class="m-2" placeholder="please enter websiteid" :rows="3" type="text"
+          style="width:220px;" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -36,11 +44,14 @@ const state = reactive({
 //校验规则
 const rules = reactive({
   title: [
-    { required: true, message: 'please enter name', trigger: 'blur' }
+    { required: true, message: 'please enter name', trigger: 'change' }
   ],
   link: [
     { required: true, message: 'please enter link', trigger: 'blur' }
   ],
+  websiteId: [
+    { required: true, message: 'please enter websiteid', trigger: 'blur' }
+  ],
 })
 
 //重置表单
@@ -55,6 +66,7 @@ const openDialog = (row) => {
   getWebsitesById(row.id).then(da=>{
     state.ruleForm.title = da.title;
     state.ruleForm.link = da.link;
+    state.ruleForm.websiteId = da.websiteId;
   })
 };
 // 关闭弹窗

src/views/dataService/disasterPartners/component/upload.vue

@@ -1,14 +1,22 @@
 <template>
-  <el-dialog title="upload" v-model="state.isShowDialog" width="700px">
+  <el-dialog title="upload" v-model="state.isShowDialog" width="550px">
     <el-form :model="state.ruleForm" size="default" label-width="150px" :rules="rules" ref="adminAddFormRef">
       <el-form-item prop="title" label="name">
-        <el-input v-model="state.ruleForm.title" class="m-2" placeholder="please enter name" :rows="3" type="text"
-          style="width:220px;" />
+        <el-select v-model="state.ruleForm.title" class="m-2" placeholder="please enter name">
+          <el-option label="GDACS" value="GDACS"></el-option>
+          <el-option label="Charter" value="Charter"></el-option>
+          <el-option label="USGS" value="USGS"></el-option>
+          <el-option label="INGV" value="INGV"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item prop="link" label="link">
         <el-input v-model="state.ruleForm.link" class="m-2" placeholder="please enter link" :rows="3" type="text"
           style="width:220px;" />
       </el-form-item>
+      <el-form-item prop="websiteId" label="websiteid">
+        <el-input v-model="state.ruleForm.websiteId" class="m-2" placeholder="please enter websiteid" :rows="3" type="text"
+          style="width:220px;" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <span class="dialog-footer">
@@ -37,11 +45,14 @@ const state = reactive({
 //校验规则
 const rules = reactive({
   title: [
-    { required: true, message: 'please enter name', trigger: 'blur' }
+    { required: true, message: 'please enter name', trigger: 'change' }
   ],
   link: [
     { required: true, message: 'please enter link', trigger: 'blur' }
   ],
+  websiteId: [
+    { required: true, message: 'please enter websiteid', trigger: 'blur' }
+  ],
 })
 
 //重置表单

src/views/dataService/disasterPartners/index.vue

@@ -3,12 +3,12 @@
     <el-config-provider :locale="en">
       <el-row :gutter="22">
         <el-col :span="10">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <disasterTable @childClick="tableClick"></disasterTable>
           </div>
         </el-col>
         <el-col :span="14">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
               <el-button size="default" type="success" class="ml10" @click="uploadData">
                 <el-icon>

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

@@ -159,14 +159,14 @@ const openDialog = (row) => {
     state.bing = {};
     state.data = row;
     state.baidu.keywords = row.disasterKeyword;
-    state.baidu.disaster_id = row.id
+    state.baidu.disaster_id = row.disasterId
     state.bing.keywords = row.disasterKeyword;
-    state.bing.disaster_id = row.id
+    state.bing.disaster_id = row.disasterId
     getDate();
     state.isShowDialog = true;
 }
 const getDate = () => {
-    getList(1, 10, { disasterId: state.data.id }).then(res => {
+    getList(1, 10, { disasterId: state.data.disasterId }).then(res => {
         let data = res.records;
         for (let index = 0; index < data.length; index++) {
             const element = data[index];
@@ -212,7 +212,7 @@ const start = (text) => {
             type: text == 'baidu' ? 2 : 1,
             manageId: userInfo.userInfos.id,
             status: 0,
-            disasterId: state.data.id,
+            disasterId: state.data.disasterId,
             keywords: keywords,
             id: (id ? id : null)
         }

src/views/dataService/multimediaData/index.vue

@@ -16,7 +16,7 @@
           </div>
         </el-col>
         <el-col :span="14">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <div class="system-user-search "
               style="display: flex;margin-left: 10px;margin-top: 10px;margin-bottom:-15px ">
               <el-form-item label="Type">

src/views/dataService/otherData/index.vue

@@ -3,12 +3,12 @@
     <el-config-provider :locale="en">
       <el-row :gutter="22">
         <el-col :span="10">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <disasterTable @childClick="tableClick"></disasterTable>
           </div>
         </el-col>
         <el-col :span="14">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <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>

src/views/dataService/pictureInfo/index.vue

@@ -3,12 +3,12 @@
     <el-config-provider :locale="en">
       <el-row :gutter="22">
         <el-col :span="10">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <disasterTable @childClick="tableClick"></disasterTable>
           </div>
         </el-col>
         <el-col :span="14">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <div class="system-user-search mb15" 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>

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

@@ -2,7 +2,7 @@
   <div>
     <el-row :gutter="22">
       <el-col :span="10">
-        <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 80vh;">
+        <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
 
           <disasterTable @childClick="tableClick">
             <el-table-column prop="Operate" label="Operate" width="85" show-overflow-tooltip>
@@ -15,7 +15,7 @@
         </div>
       </el-col>
       <el-col :span="14">
-        <div class="system-role-padding layout-padding-auto layout-padding-view" style="height:80vh;">
+        <div class="system-role-padding layout-padding-auto layout-padding-view" style="height:85vh;">
           <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
             <!-- 选择灾害类型 -->
             <el-row>

src/views/dataService/visualData/index.vue

@@ -3,12 +3,12 @@
     <el-config-provider :locale="en">
       <el-row :gutter="22">
         <el-col :span="10">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <disasterTable @childClick="tableClick"></disasterTable>
           </div>
         </el-col>
         <el-col :span="14">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <div class="system-user-search mb15" 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>

src/views/responseManagement/dataUpload/index.vue

@@ -3,12 +3,12 @@
     <el-config-provider :locale="en">
       <el-row :gutter="22">
         <el-col :span="10">
-          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 90vh;">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <disasterTable @childClick="tableClick"></disasterTable>
           </div>
         </el-col>
         <el-col :span="14">
-          <div class="system-role-padding layout-padding-auto layout-padding-view">
+          <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
             <div class="system-user-search mb15" style="display: flex;margin-left: 10px;margin-top: 10px;">
               <el-button size="default" type="primary" class="ml10" @click="batchAudit">
                 <el-icon>