Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	vue.config.js

package.json

@@ -53,7 +53,7 @@
     "@vue/cli-plugin-babel": "~3.8.0",
     "@vue/cli-service": "~3.8.4",
     "chai": "^4.1.2",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.14.1",
     "sass-loader": "^7.0.1",
     "vue-template-compiler": "^2.6.10"
   },

src/router/axios.js

@@ -14,7 +14,7 @@ import {
 import 'nprogress/nprogress.css'
 import qs from 'qs'
 import store from '@/store' // progress bar style
-axios.defaults.timeout = 30000
+axios.defaults.timeout = 300000
 // 返回其他状态吗
 axios.defaults.validateStatus = function (status) {
     return status >= 200 && status <= 500 // 默认的

src/views/land/api/land.js

@@ -77,6 +77,14 @@ export function exportHandLandListExcel(ids) {
         responseType: "blob"
     })
 }
+// 导出全部已挂牌地块信息
+export function exportAllHandLandListExcel() {
+    return request({
+        url: '/api/landlisted/exportAllLandListExcel' ,
+        method: 'get',
+        responseType: "blob"
+    })
+}
 
 // 下载模板
 export function downloadHandLandTemplate() {

src/views/land/handLand/index.vue

@@ -27,6 +27,12 @@
                     v-model="searchForm.annoId"
                     placeholder="请输入"
                 ></el-input>
+              </el-form-item>
+               <el-form-item label="系统编号:">
+                <el-input
+                    v-model="searchForm.systemId"
+                    placeholder="请输入"
+                ></el-input>
               </el-form-item>
               <el-form-item label="地块编号：">
                 <el-input
@@ -183,7 +189,14 @@
               <el-button type="text" @click="clearSelection">清空</el-button>
             </div>
           </div>
+         
           <div class="page_content_head_right">
+            <div>
+              <el-button @click="exportAllData"
+              ><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>导出全部数据
+              </el-button
+              >
+            </div>
             <div>
               <el-button @click="exportData" v-show="hasSelectData"
               ><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>导出
@@ -373,6 +386,7 @@ import {
   saveHandLandList,
   delHandLandObj,
   exportHandLandListExcel,
+  exportAllHandLandListExcel,
   downloadHandLandTemplate,
   queryLonLatList,
   addLonLat,
@@ -457,12 +471,19 @@ export default {
       landLonLat: [],
       // 列
       cols: [
+            {
+          label: "序号",
+          prop: "systemId",
+          width: 200,
+          fixed: true,
+        },
         {
           label: "已挂牌序号",
           prop: "landListedId",
           width: 200,
           fixed: true,
         },
+
         {
           label: "公告序号",
           prop: "annoId",
@@ -988,6 +1009,18 @@ export default {
         aLink.setAttribute("download", "kg" + ".xlsx"); // 设置下载文件名称
         aLink.click();
       });
+    },
+      // 导出数据
+    exportAllData() {
+    
+      exportAllHandLandListExcel().then((res) => {
+        // fileDownload(res.data, "kg.xlsx");
+        const aLink = document.createElement("a");
+        let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
+        aLink.href = URL.createObjectURL(blob);
+        aLink.setAttribute("download", "kg" + ".xlsx"); // 设置下载文件名称
+        aLink.click();
+      });
     },
     //导入数据
     importData(e) {

src/views/land/noneHandLand/index.vue

@@ -27,6 +27,14 @@
                     v-model="searchForm.landName"
                     placeholder="请输入"
                 ></el-input>
+                
+              </el-form-item>
+                <el-form-item label="系统编号">
+                <el-input
+                    v-model="searchForm.proposedseriaId"
+                    placeholder="请输入"
+                ></el-input>
+                
               </el-form-item>
               <el-form-item label="供地状态：">
                 <el-input

vue.config.js

@@ -11,6 +11,8 @@
 const url = 'http://192.168.100.11:9002';
 // const url = 'http://192.168.23.64:9002';
 // const url = 'http://139.159.180.147:9002'
+// const url = 'http://127.0.0.1:8080';  //裴
+//const url = 'https://yoursairdata.com/api';//生产
 module.exports = {
   lintOnSave: true,
   productionSourceMap: false,