Merge branch 'dev_ren' into 'master'

1.8 bug

See merge request !32

src/api/website/archiveDataManagement.js

@@ -11,7 +11,7 @@ export function getSatelliteData(obj) {
 // 已入库数据列表
 export function getDateList(obj) {
   return fetch({
-    url: '/api/datacenter/bg/imageData/pages',
+    url: '/api/datacenter/bg/imageData/bgPages',
     method: 'get',
     params: obj
   });

src/views/archiveDataManagement/dataList/index.vue

@@ -30,7 +30,7 @@
         <el-col :span="5">
           <el-form-item label="分辨率">
             <el-select
-              v-model="listQuery.imageResolution"
+              v-model="listQuery.resolution"
               placeholder="请选择分辨率"
             >
               <el-option label="全部" :value="undefined"></el-option>