分公司列表

src/App.vue

@@ -15,6 +15,7 @@
   .header-css{
     position: fixed;
     top: 0;
+    height: 42px;
     width: 100%;
     z-index: 9999;
     background: #fff;
@@ -25,7 +26,7 @@
   }
   .main-container{
     padding: 0 10px;
-    margin-top: 50px;
+    margin-top: 61px;
   }
   .header-title{
     margin: 0 88px;

src/router/index.js

@@ -45,8 +45,7 @@ export const constantRouterMap = [{
   name: '入股申请',
   hidden: true
   // authority: 'stockCrowd'
-}
-,
+},
 {
   path: '/companyInfo',
   component: _import('baseInfo/companyInfo/index'),
@@ -54,6 +53,13 @@ export const constantRouterMap = [{
   hidden: true
   // authority: 'companyInfo'
 },
+{
+  path: '/provinceMap',
+  component: _import('baseInfo/companyInfo/provinceMap'),
+  name: '省市分布',
+  hidden: true
+  // authority: 'stockCrowd'
+},
 {
   path: '/404',
   component: _import('error/404'),

src/views/baseInfo/companyInfo/chinaMap.vue

@@ -15,25 +15,6 @@
 
   export default {
     props:["list", "provinceName"],
-//    props: {
-//      list: [],
-//      className: {
-//        type: String,
-//        default: 'chart'
-//      },
-//      width: {
-//        type: String,
-//        default: '100%'
-//      },
-//      height: {
-//        type: String,
-//        default: '330px'
-//      },
-//      autoResize: {
-//        type: Boolean,
-//        default: true
-//      }
-//    },
     data() {
       return {
         mapType: "china",
@@ -45,22 +26,24 @@
     watch: {
       list: {
         handler(newValue, oldValue) {
-          this.initChart("china");
+          if(this.provinceName){
+            this.initChart(this.provinceName);
+          } else {
+            this.initChart("china");
+          }
           console.log(newValue);
         },
         deep: true
       },
       provinceName(newValue, oldValue) {
-        if(newValue == "china"){
-          this.chart = null;
-          this.initChart("china");
-        }
+        this.chart = null;
+        this.initChart(newValue);
       },
     },
     mounted() {
       console.log(this.list);
 //      console.log(this.provinceName);
-      this.initChart("china");
+//      this.initChart("china");
       if (this.autoResize) {
         this.__resizeHanlder = debounce(() => {
           if (this.chart) {
@@ -170,7 +153,10 @@
                 provinceId = item.agencyId;
               }
             });
-            that.$emit('headCallBack', provinceId);
+//            that.$emit('headCallBack', provinceId);
+            if(name && provinceId !=0){
+              that.$router.push({path: '/provinceMap?provinceId='+provinceId+"&provinceName="+name})
+            }
           }
         });
       }

src/views/baseInfo/companyInfo/index.vue

@@ -3,19 +3,19 @@
     <div class="header-css">
       <!--@click="$router.push({name:'mypoints'})"-->
       <!--<img @click="goBack()" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfCAYAAADqUJ2JAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjU0OTNGQTA2QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjU0OTNGQTA3QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTQ5M0ZBMDRBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NTQ5M0ZBMDVBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4bKBAsAAAAzklEQVR42qzWWQrCMBDG8VzCtVb01ZuIFJUq4nU8l+AlXEsFXz2CC+iXB2EYgjBL4P/6o4Qk0xD0q4G2aBSMyB590F2LNQkSe6OFFGmhA0PWUqSNjgxZWZEXWkqRDjpZkS46E+Sp2diIXAjyQKUUyRLIXIr0UMWQmQapGTKVInkCKaTIAF0ZMtEgN4aMNZdwR5DYRvskuH1RXEOPPfqtfgIrtFjucY5cTza9a5X1rv27uKUWc3mPXF9I+ma7YuYp4jrXXCet6+xP/o18BRgA2Nl6bmmSdvgAAAAASUVORK5CYII=" size="25" style="width: 15px; height: 20px; margin: 10px">-->
-      <span class="header-title">公司列表</span>
+      <span class="header-title">全国公司列表</span>
     </div>
     <div class="main-container">
       <div class="shoppings main-container">
         <div class="filter-container" ref="filter-container">
           <el-form :rules="rules4Query" ref="queryForm" style="display: flex;" :inline="inline" :model="listQuery">
-            <el-select class="filter-item" style="width: 70%;margin-right: 10px;" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change='getValue'>
+            <el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change='getValue'>
               <el-option :key="undefined" label="全国" :value="undefined"></el-option>
               <el-option v-for="item in provinceRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
-            <el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市"  @change='getCompanyList'>
-              <el-option v-for="item in cityRegions4Query" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
+            <!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市"  @change='getCompanyList'>-->
+              <!--<el-option v-for="item in cityRegions4Query" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
+            <!--</el-select>-->
           </el-form>
         </div>
       </div>
@@ -276,12 +276,27 @@
       getValue(e){
         if(!e){
           //全国
-          location.reload();
+//          location.reload();
 //          this.provinceName = "china";
           return;
         }
-        this.provinceName = e;
+//        this.provinceName = e;
         this.listQuery.addrCity = undefined;
+        if(e){
+          console.log(this.provinceRegions);
+          let name = "";
+          this.provinceRegions.map(function(item){
+            if(e == item.id){
+              if(item.name.indexOf("黑龙江") !=-1 || item.name.indexOf("内蒙古") !=-1){
+                name = item.name.substring(0,3);
+              } else {
+                name = item.name.substring(0,2);
+              }
+            }
+          });
+          this.$router.push({path: '/provinceMap?provinceId='+e+"&provinceName="+name});
+        }
+
 //        this.getList();
       },
       headCall: function (msg) { //回调方法，接收子组件传的参数

src/views/baseInfo/stockCrowdDetail/index.vue

@@ -147,7 +147,7 @@
       switchTab(target){
         this.optionName = target;
       },
-      submit(formName){debugger
+      submit(formName){
         let that = this;
         that.msg = "";
         if(!that.form.companyId){