glj-代码提交

src/router/route.js

@@ -66,7 +66,7 @@ export const dynamicRoutes = [
 						name: 'userResponseManagement',
 						component: () => import('/@/views/responseManagement/userResponse/index.vue'),
 						meta: {
-							title: 'User Response',
+							title: 'Disaster Response',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
@@ -229,7 +229,7 @@ export const dynamicRoutes = [
 						name: 'disasterPartners',
 						component: () => import('/@/views/dataService/disasterPartners/index.vue'),
 						meta: {
-							title: 'Disaster Website',
+							title: 'Responsive websites',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,

src/views/home/index.vue

@@ -179,7 +179,7 @@ const state = reactive({
     {
       num1: '',
       num2: '',
-      num3: 'Number of Disaster Response Applications',
+      num3: 'Number of disaster responses',
       num4: 'iconfont',
       color1: '#FF6462',
       color2: '--next-color-primary-lighter',
@@ -188,7 +188,7 @@ const state = reactive({
     {
       num1: '',
       num2: '',
-      num3: 'Actual Times of Disaster Response',
+      num3: 'Number of registered users',
       num4: 'iconfont',
       color1: '#6690F9',
       color2: '--next-color-success-lighter',
@@ -197,7 +197,7 @@ const state = reactive({
     {
       num1: '',
       num2: '',
-      num3: 'User Visits',
+      num3: 'Number of platform visits',
       num4: 'iconfont',
       color1: '#6690F9',
       color2: '--next-color-warning-lighter',
@@ -206,7 +206,7 @@ const state = reactive({
     {
       num1: '',
       num2: '',
-      num3: 'Data Downloads',
+      num3: 'Number of resource downloads',
       num4: 'iconfont',
       color1: '#FF6462',
       color2: '--next-color-danger-lighter',
@@ -617,9 +617,9 @@ const setLineChart = (data) => {
   let data1 = [];
   let data2 = [];
   data.forEach(item=>{
-    xData.push(item.dict_value)
+    xData.push(item.key)
-    data1.push(item.download)
+    data1.push(item.response)
-    data2.push(item.visit)
+    data2.push(item.initiate)
   })
   //访问量 和下载次数
   initLineVandDChart(xData,data1, data2)

src/views/responseManagement/userResponse/index.vue

@@ -7,7 +7,7 @@
                  class="demo-tabs"
                  @tab-click="handleClick"
                  style="margin-left: 20px">
-          <el-tab-pane label="Unapproved"
+          <el-tab-pane label="Pending"
                        name="first">
             <el-table :data="state.tableData.data"
                       v-loading="state.tableData.loading"
@@ -42,6 +42,10 @@
                   {{ dateFormat(scope.row.disasterTime) }}
                 </template>
               </el-table-column>
+              <el-table-column prop="uploadTime"
+                               label="Initiated Time"
+                               show-overflow-tooltip
+                               sortable></el-table-column>
               <el-table-column prop="respondStatus"
                                label="Response Status"
                                show-overflow-tooltip
@@ -243,7 +247,76 @@
             </el-pagination>
           </el-tab-pane>
 
-          <el-tab-pane label="Finish"
+          <el-tab-pane label="End - Apply"
+                       name="firstEndExamine">
+            <el-table :data="state.tableData.data"
+                      v-loading="state.tableData.loading"
+                      style="width: 100%">
+              <el-table-column prop="username"
+                               label="User Name"
+                               show-overflow-tooltip
+                               sortable></el-table-column>
+              <el-table-column prop="organization"
+                               label="Organization"
+                               show-overflow-tooltip
+                               sortable></el-table-column>
+              <el-table-column prop="disasterType"
+                               label="Disaster Type"
+                               show-overflow-tooltip
+                               sortable>
+                <!-- 在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
+                               sortable></el-table-column>
+              <el-table-column prop="disasterTime"
+                               label="Disaster Time"
+                               show-overflow-tooltip
+                               sortable>
+                <template #default="scope">
+                  <!-- 格式化去除时分秒 -->
+                  {{ dateFormat(scope.row.disasterTime) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="respondStatus"
+                               label="Response Status"
+                               show-overflow-tooltip
+                               sortable>
+                <template #default="scope">
+                  <el-tag type="info"
+                          v-if="scope.row.respondStatus === 2">Approved</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="Operate"
+                               label="Operate"
+                               show-overflow-tooltip
+                               sortable>
+                <template #default="scope">
+                  <el-button size="small"
+                             text
+                             type="primary"
+                             @click="ApproveUserEnd(scope.row)">Approve</el-button>
+                </template>
+              </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.current"
+                           background
+                           v-model:page-size="state.tableData.param.size"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="state.tableData.total">
+            </el-pagination>
+          </el-tab-pane>
+
+          <el-tab-pane label="Completed"
                        name="firstNewOne">
             <el-table :data="state.tableData.data"
                       v-loading="state.tableData.loading"
@@ -313,75 +386,6 @@
                            :total="state.tableData.total">
             </el-pagination>
           </el-tab-pane>
-
-          <el-tab-pane label="EndExamine"
-                       name="firstEndExamine">
-            <el-table :data="state.tableData.data"
-                      v-loading="state.tableData.loading"
-                      style="width: 100%">
-              <el-table-column prop="username"
-                               label="User Name"
-                               show-overflow-tooltip
-                               sortable></el-table-column>
-              <el-table-column prop="organization"
-                               label="Organization"
-                               show-overflow-tooltip
-                               sortable></el-table-column>
-              <el-table-column prop="disasterType"
-                               label="Disaster Type"
-                               show-overflow-tooltip
-                               sortable>
-                <!-- 在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
-                               sortable></el-table-column>
-              <el-table-column prop="disasterTime"
-                               label="Disaster Time"
-                               show-overflow-tooltip
-                               sortable>
-                <template #default="scope">
-                  <!-- 格式化去除时分秒 -->
-                  {{ dateFormat(scope.row.disasterTime) }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="respondStatus"
-                               label="Response Status"
-                               show-overflow-tooltip
-                               sortable>
-                <template #default="scope">
-                  <el-tag type="info"
-                          v-if="scope.row.respondStatus === 2">Approved</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column prop="Operate"
-                               label="Operate"
-                               show-overflow-tooltip
-                               sortable>
-                <template #default="scope">
-                  <el-button size="small"
-                             text
-                             type="primary"
-                             @click="ApproveUserEnd(scope.row)">Approve</el-button>
-                </template>
-              </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.current"
-                           background
-                           v-model:page-size="state.tableData.param.size"
-                           layout="total, sizes, prev, pager, next, jumper"
-                           :total="state.tableData.total">
-            </el-pagination>
-          </el-tab-pane>
         </el-tabs>
       </div>
       <el-dialog v-model="state.dialogVisible"
@@ -471,12 +475,20 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="Magnitude">
+            <el-input style="width: 200px;"
+                      v-model="state.edit.disasterLevel"
+                      placeholder="please Magnitude"
+                      clearable></el-input>
+          </el-form-item>
+
           <el-form-item label="Affected Country">
             <el-input style="width: 200px;"
                       v-model="state.edit.disasterCountry"
                       placeholder="please Affected Country"
                       clearable></el-input>
           </el-form-item>
+
           <el-form-item label="Theme keywords">
             <el-input style="width: 200px;"
                       v-model="state.edit.disasterKeyword"