修改楼盘信息

src/main.js

@@ -17,6 +17,11 @@ import 'element-ui/lib/theme-chalk/index.css'
 import './styles/common.scss'
 import avueFormDesign from 'avue-plugin-formdesign'
 import basicContainer from './components/basic-container/main'
+import modal from './util/modal.js'
+
+// 全局引入global
+import global from "./util/global.js"
+Vue.prototype.global = global
 
 
 // 插件 json 展示
@@ -44,6 +49,8 @@ import {
 Vue.prototype.$getStore = getStore;
 Vue.prototype.$setStore = setStore;
 Vue.prototype.$removeStore = removeStore;
+// 模态框对象
+Vue.prototype.$modal = modal
 
 // 注册全局容器
 Vue.component('basicContainer', basicContainer)

src/page/index/top/index.vue

@@ -43,6 +43,7 @@ import topLogs from "./top-logs";
 import topColor from "./top-color";
 import topSetting from "./top-setting";
 import {
+  getStore,
   setStore
 } from '@/util/store'
 import {getCityList} from '@/api/content'
@@ -89,6 +90,15 @@ export default {
   created() {
     getCityList().then(res => {
       this.cityList = res.data.data
+
+      const CITY = getStore({
+        name: 'city'
+      })
+     // console.log(CITY);
+      if(CITY !== undefined  ){
+        this.city = CITY;
+      }
+      this.global.city = this.city;
     })
   },
   mounted() {
@@ -96,7 +106,10 @@ export default {
   },
   methods: {
     changeCity() {
+
       setStore({name: 'city', content: this.city})
+      this.global.city = this.city;
+     // console.log(this.global.city);
       this.reload()
     },
     handleScreen() {

src/router/axios.js

@@ -100,14 +100,13 @@ axios.interceptors.request.use(config => {
         config.url.indexOf("cityArea") === -1 &&
         config.url.indexOf("tenant") === -1) {
         if (config.params) {
-            config.params.city = CITY ? CITY : DEFAULT_CITY
+            config.params.city = CITY ? CITY : DEFAULT_CITY;
         } else {
             config.params = {
                 city: CITY ? CITY : DEFAULT_CITY
             }
         }
 
-
     }
 
     return config
@@ -148,4 +147,4 @@ axios.interceptors.response.use(res => {
     return Promise.reject(new Error(error))
 })
 
-export default axios
+export default axios

src/util/global.js

@@ -0,0 +1,7 @@
+
+//地址
+const city = null;
+
+export default {
+    city
+};

src/util/modal.js

@@ -0,0 +1,83 @@
+import { Message, MessageBox, Notification, Loading } from 'element-ui'
+
+let loadingInstance;
+
+export default {
+  // 消息提示
+  msg(content) {
+    Message.info(content)
+  },
+  // 错误消息
+  msgError(content) {
+    Message.error(content)
+  },
+  // 成功消息
+  msgSuccess(content) {
+    Message.success(content)
+  },
+  // 警告消息
+  msgWarning(content) {
+    Message.warning(content)
+  },
+  // 弹出提示
+  alert(content) {
+    MessageBox.alert(content, "系统提示")
+  },
+  // 错误提示
+  alertError(content) {
+    MessageBox.alert(content, "系统提示", { type: 'error' })
+  },
+  // 成功提示
+  alertSuccess(content) {
+    MessageBox.alert(content, "系统提示", { type: 'success' })
+  },
+  // 警告提示
+  alertWarning(content) {
+    MessageBox.alert(content, "系统提示", { type: 'warning' })
+  },
+  // 通知提示
+  notify(content) {
+    Notification.info(content)
+  },
+  // 错误通知
+  notifyError(content) {
+    Notification.error(content);
+  },
+  // 成功通知
+  notifySuccess(content) {
+    Notification.success(content)
+  },
+  // 警告通知
+  notifyWarning(content) {
+    Notification.warning(content)
+  },
+  // 确认窗体
+  confirm(content) {
+    return MessageBox.confirm(content, "系统提示", {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: "warning",
+    })
+  },
+  // 提交内容
+  prompt(content) {
+    return MessageBox.prompt(content, "系统提示", {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: "warning",
+    })
+  },
+  // 打开遮罩层
+  loading(content) {
+    loadingInstance = Loading.service({
+      lock: true,
+      text: content,
+      spinner: "el-icon-loading",
+      background: "rgba(0, 0, 0, 0.7)",
+    })
+  },
+  // 关闭遮罩层
+  closeLoading() {
+    loadingInstance.close();
+  }
+}

src/views/houseList/page/FormatInfo.vue

@@ -86,6 +86,14 @@
           <div class="page_content_head_left">
             <div>业态列表</div>
           </div>
+          <div class="page_content_head_right">
+            <div style="margin-right: 0;">
+              <el-button @click="infoYeTai"
+              ><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>查看楼栋
+              </el-button
+              >
+            </div>
+          </div>
         </div>
       </div>
       <div class="page_content_table">
@@ -562,6 +570,7 @@ export default {
       .then((res) => {
         this.upInfo = res.data.data.housingEstates;
         this.land = res.data.data.landListed;
+        console.log(this.land);
       })
       .catch((e) => {});
     this.onSubmit();
@@ -575,6 +584,13 @@ export default {
     },
   },
   methods: {
+    //跳转到楼栋
+    infoYeTai() {
+
+      //楼栋
+      // this.$router.push({path:"/houseList/page/houseInfo",query:{id:data.housingEstateId}});
+
+    },
     // 获取大业态
     getBigye() {
       if (!this.ruleForm.propertyType) {
@@ -615,9 +631,7 @@ export default {
       this.dialogLoad = true;
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          api
-            .changeFormat(this.ruleForm)
-            .then((res) => {
+          api.changeFormat(this.ruleForm).then((res) => {
               if (res.data.data) {
                 this.dialogLoad = false;
                 this.dialogFormVisible = false;

src/views/houseList/page/houseInfo.vue

@@ -86,6 +86,14 @@
           <div class="page_content_head_left">
             <div>楼栋列表</div>
           </div>
+          <div class="page_content_head_right">
+            <div style="margin-right: 0;">
+              <el-button @click="infoYeTai"
+              ><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>查看业态
+              </el-button
+              >
+            </div>
+          </div>
         </div>
       </div>
       <div class="page_content_table">
@@ -406,6 +414,7 @@ export default {
     api.houseById(this.$route.query.id).then(res=>{
       this.upInfo = res.data.data.housingEstates;
       this.land=res.data.data.landListed;
+      console.log(this.land);
       this.onSubmit();
     }).catch((e)=>{});
       // api.getDict('property_types').then(res=>{
@@ -440,6 +449,13 @@ export default {
     // },
   },
   methods: {
+    //跳转到业态
+    infoYeTai() {
+
+        // //业态
+        // this.$router.push({path:"/houseList/page/FormatInfo",query:{id:data.housingEstateId}});
+
+    },
     //子列表
     info(data) {
       //需要带参数跳转

src/views/houseList/page/index.vue

@@ -968,8 +968,7 @@ export default {
         },
         this.searchForm
       );
-      api.houseList(param)
-        .then((response) => {
+      api.houseList(param) .then((response) => {
           this.tableData = response.data.data.records;
           this.page.total = response.data.data.total;
           this.loading = false;

src/views/land/handLand/index.vue

@@ -965,7 +965,7 @@ export default {
           },
           this.searchForm
       );
-      console.log(param+"==========================================");
+      //console.log(param+"==========================================");
       fetchHandLandList(param).then( (response) => {
             this.tableData = response.data.data.records.map(item => {
               item.deal = item.deal == '1' ? '是' : '否'
@@ -1012,13 +1012,16 @@ export default {
     },
       // 导出全部数据
     exportAllData() {
-
+      //console.log(Vue.prototype.$getStore );
+      //console.log(Vue.prototype.$setStore );
+    //  console.log(Vue.prototype.$removeStore );
       exportAllHandLandListExcel().then((res) => {
         // fileDownload(res.data, "kg.xlsx");
+//        console.log(res.data)
         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.setAttribute("download",  this.global.city  + ".xlsx"); // 设置下载文件名称
         aLink.click();
       });
     },

src/views/sale/api/index.js

@@ -48,3 +48,13 @@ export function getListedLands(query) {
         params: query
     })
 }
+
+//取消任务操作
+export function getAnnul(query) {
+    return request({
+        url: '/api/blocks_origin/annul',
+        method: 'post',
+        data: query
+    })
+}
+

src/views/sale/index.vue

@@ -38,8 +38,101 @@
           <div class="page_content_head_left">
             <div>任务列表</div>
           </div>
+          <div class="page_content_head_right">
+            <div style="margin-right: 0;">
+              <el-button @click="revocation"
+              ><img style="margin-right: 5px;" src="@public/img/land/u1340.png"/>撤销处理
+              </el-button
+              >
+            </div>
+          </div>
         </div>
+
       </div>
+<!--      撤销处理-->
+      <el-dialog
+          title="撤销数据处理"
+          :visible.sync="dialogFormVisibleRepeal"
+          width="70%"
+          v-loading="dialogLoadRepeal"
+          :modal="false"
+      >
+        <div class="page_content_table">
+          <el-table
+              :data="tableDataRepeal"
+              border
+              style="width: 100%"
+              max-height="630"
+              ref="multipleTable"
+              v-loading="loading"
+          >
+            <el-table-column
+                v-for="(item, index) in cols"
+                :key="index"
+                :prop="item.prop"
+                :label="item.label"
+                :width="item.width"
+                :fixed="item.fixed"
+                show-overflow-tooltip
+            >
+            </el-table-column>
+            <el-table-column label="楼栋" show-overflow-tooltip>
+              <template slot-scope="scope">
+              <span style="cursor: pointer;color:blue;" @click="handleBuild(scope.row)">{{
+                  scope.row.buildingNo
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="爬取时间" show-overflow-tooltip>
+              <template slot-scope="scope">
+              <span>{{
+                  scope.row.createDate ? scope.row.createDate.split(" ")[0] : ""
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态">
+              <template>
+                <span>已处理</span>
+              </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="250">
+              <template slot-scope="scope">
+                <el-button type="text" size="small" @click="revocationRepeal(scope.row) "
+                >撤销处理
+                </el-button>
+
+              </template>
+
+
+
+            </el-table-column>
+          </el-table>
+
+            <div class="btnGp">
+              <el-button @click="dialogFormVisibleRepeal = false">取 消</el-button>
+            </div>
+
+
+
+
+
+
+          <div class="page_page">
+            <el-pagination
+                @size-change="handleSizeChangeRepeal"
+                @current-change="handleCurrentChangeRepeal"
+                :current-page="pageRepeal.currentPage"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="pageRepeal.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pageRepeal.total"
+            >
+            </el-pagination>
+          </div>
+        </div>
+      </el-dialog>
+
+
       <div class="page_content_table">
         <el-table
             :data="tableData"
@@ -78,13 +171,16 @@
               <span>待处理</span>
             </template>
           </el-table-column>
-          <el-table-column fixed="right" label="操作" width="150">
+          <el-table-column fixed="right" label="操作" width="250">
             <template slot-scope="scope">
-              <el-button type="text" size="small" @click="handle(scope.row)"
+              <el-button type="text" size="small" @click="handle(scope.row) "
               >立即处理
-              </el-button
-              >
+              </el-button>
+
             </template>
+
+
+
           </el-table-column>
         </el-table>
         <div class="page_page">
@@ -289,6 +385,8 @@ export default {
   name: "HandLand",
   data() {
     return {
+      //处理过的集合
+      tableDataRepeal:[],
       showHousingEstateName: true,
       showHousingEstateId: true,
       searchForm: {
@@ -307,9 +405,17 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10, // 每页显示多少条
       },
+      pageRepeal: {
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 10, // 每页显示多少条
+      },
       // 编辑或新增窗口
       dialogFormVisible: false,
       dialogLoad: false,
+      // 编辑或新增窗口
+      dialogFormVisibleRepeal: false,
+      dialogLoadRepeal: false,
       // 列
       cols: [
         {
@@ -458,6 +564,31 @@ export default {
     }
   },
   methods: {
+    //撤销处理
+
+    revocationRepeal(row){
+    //  console.log(row);
+      const id = row.id || this.ids
+      let rows = row;
+      this.$modal.confirm('是否确认撤销预售许可证号/房产证号为"' +row.preSaleLicenseNo  + '"的操作？').then(function() {
+        return api.getAnnul(rows);
+      }).then(() => {
+        this.$message.success("成功");
+        this.onSubmitRepeal();
+      }).catch(() => {});
+      //
+      // api.getAnnul(row).then((res) => {
+      //
+      // })
+    },
+    //撤销处理弹框
+    revocation(){
+    this.dialogFormVisibleRepeal = true;
+     this.onSubmitRepeal();
+
+    },
+
+
     remoteMethod(query) {
       if (query !== "") {
         this.landLoading = true;
@@ -539,6 +670,34 @@ export default {
       };
       this.dialogFormVisible = true;
     },
+    // 查询已经处理过的数据
+    onSubmitRepeal() {
+      this.loading = true;
+      let param = Object.assign(
+          {
+            current: this.pageRepeal.currentPage,
+            size: this.pageRepeal.pageSize,
+            statusCd: "1",
+          },
+          this.searchForm
+      );
+      //     console.log(param)
+      api.getSaleList(param).then((response) => {
+        this.tableDataRepeal = [];
+        console.log(response.data.data.records)
+        // this.tableData = response.data.data.records;
+        for (let i = 0; i < response.data.data.records.length; i++) {
+          if (response.data.data.records[i].statusCd == "1") {
+            this.tableDataRepeal.push(response.data.data.records[i]);
+          }
+        }
+        this.pageRepeal.total = response.data.data.total;
+        this.loading = false;
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+
     // 查询
     onSubmit() {
       this.loading = true;
@@ -553,7 +712,7 @@ export default {
  //     console.log(param)
       api.getSaleList(param).then((response) => {
         this.tableData = [];
-
+        console.log(response.data.data.records)
         // this.tableData = response.data.data.records;
         for (let i = 0; i < response.data.data.records.length; i++) {
           if (response.data.data.records[i].statusCd == "0") {
@@ -581,6 +740,15 @@ export default {
     handleCurrentChange(val) {
       this.page.currentPage = val;
       this.onSubmit();
+    },
+    handleSizeChangeRepeal(val) {
+      this.pageRepeal.pageSize = val;
+      this.onSubmitRepeal();
+    },
+
+    handleCurrentChangeRepeal(val) {
+      this.pageRepeal.currentPage = val;
+      this.onSubmitRepeal();
     }
   }
 };
@@ -626,6 +794,11 @@ export default {
   }
 }
 
+.btnGp{
+  text-align: right;
+  margin-top: 20px;
+}
+
 .dialog_op {
   position: absolute;
   left: 0;