城投平台优化

hailu

2023-02-13 acf398f7816c9eea1f503536b8753df6e03574bc

城投平台优化

 src/components/main/components/header-bar/sider-trigger/sider-trigger.vue

@@ -57,16 +57,16 @@
             <span class="two_class" name="zoneAnalyses" @click="setVersionInfo('zoneAnalyses')">区域经济</span>
           </li>
           <li>
             <span class="ivu-icon custom custom-pinggu1"></span>
             <span class="two_class" name="zongheEvaluates" @click="setVersionInfo('zongheEvaluates')">综合评估</span>
           </li>
           <li>
             <span class="ivu-icon custom custom-gongsi1"></span>
             <span class="two_class" name="zhengxinCompenys" @click="setVersionInfo('zhengxinCompenys')">城投平台</span>
           </li>
           <li>
             <span class="ivu-icon custom custom-fenxi3"></span>
             <span class="two_class" name="rongziStructures" @click="setVersionInfo('rongziStructures')">融资分析</span>
           </li>
           <li>
             <span class="ivu-icon custom custom-pinggu1"></span>
             <span class="two_class" name="zongheEvaluates" @click="setVersionInfo('zongheEvaluates')">综合评估</span>
           </li>
           <li>
             <span class="ivu-icon custom custom-shixiangguanli"></span>

 src/router/routers.js

@@ -1153,7 +1153,7 @@
                meta: {
                    notCache: true,
                    access: ['no_admin', 'bankPunishNewEvent'],
                    icon: 'custom custom-shixiangguanli',
                    icon: 'custom custom-zulin-copy',
                    title: '银保监处罚事件'
                },
                component: () =>

 src/view/chengtou/zhengxinCompeny.vue

@@ -15,7 +15,8 @@
  <div>
    <Card>
      <div class="customTitle">
        <Icon custom="custom custom-gailan"></Icon>
        <!-- <Icon custom="custom custom-gailan"></Icon> -->
        <Icon custom="custom custom-caizhengquhua"></Icon>
        <span style="margin-left: 6px;">城投平台</span>
      </div>
    </Card>
@@ -39,9 +40,8 @@
          <Table border :columns="tab7Columns" :data="tab7TableList" :loading="loadingtab5" max-height="600">
            <template slot="action" slot-scope="params">
              <Tooltip content="查看" class="tableActionMargin" theme="light" transfer max-width="200" placement="top">
                <Icon custom="custom custom-chakan" size="18" 
                  @click="goqydsj(params.row)" />
                  <!-- :class="defaultassetsmode ? 'disabledIcon' : 'actionIcon'" -->
            <Icon custom="custom custom-chakan" size="18" @click="goqydsj(params.row)"  :class="defaultassetsmode ? 'disabledIcon' : 'actionIcon'" />
           
              </Tooltip>
            </template>
          </Table>
@@ -91,6 +91,7 @@
      keyword:'',
      loadingtab5:false,
      TotalItems:0,
      defaultassetsmode:false,
    }
  },
  mounted() {
@@ -101,6 +102,9 @@
  
  },
  methods: {
    goqydsj(row) {
      this.$router.push(`publicMessage_tool?name=${row.CompanyName}`)
    },
    tab7Selecttab1(value) {
      this.tab7shi = ''
      this.tab7qu = ''

 src/view/chengtou/zoneAnalyse.vue

@@ -20,29 +20,14 @@
        <div style="width: 400px;margin-left: 12px">
          <!-- <Cascader filterable :data="areaList" v-model="areaCascaderValue" change-on-select size="large"  @on-change="btncontrol"  placeholder="请选择区域"></Cascader> -->
          <!-- <cascaderMulti @on-change="btncontrol" size="large" :data="areaList" multiple></cascaderMulti> -->
          <el-cascader ref="cascader" v-model="areaCascaderValue" :props="props" :options="areaList" :change-on-select="true"
            @change="btncontrol" collapse-tags :clearable="true"></el-cascader>
          <!-- <el-cascader ref="cascader" :change-on-select="true" :props="defaultParams" :options="areaList"
            v-model="areaCascaderValue" collapse-tags :clearable="true" @change="btncontrol"></el-cascader> -->
          <!-- <el-button @click="defaultSelectSomeone">默认选中某项</el-button>
    <el-button @click="defaultSelectAll">默认选中全部</el-button>
            <el-cascader
      v-model="areaCascaderValue"
      clearable
      filterable
      :options="areaList"
      :props="{
        multiple: true
      }"
      :collapse-tags="true"
      placeholder="请选择"
      @change="selectHandle"
    >
      <template slot-scope="{ node, data }">
        <span>{{ data.label }}</span>
        <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
      </template>
    </el-cascader> -->

          <el-cascader :options="areaList" @change="btncontrol" ref="cascader" collapse-tags
            :props="{ multiple: true, checkStrictly: true, }" clearable></el-cascader>
          <!-- <el-cascader :options="areaList" @change="cardChange" ref="cascader" collapse-tags
            :props="{ multiple: true, checkStrictly: true, checkAll: true, expandTrigger: 'hover' }"
            clearable></el-cascader> -->




        </div>
@@ -129,15 +114,7 @@
  // components: { cascader },
  data() {
    return {
      props: { multiple: true, emitPath: false },
      // defaultParams: {
      //   label: 'label',
      //   value: 'value',
      //   children: 'children',
      //   multiple: true,
      //   // checkStrictly: true,
      //   // filterable: true
      // },
      props: { multiple: true, emitPath: false, checkStrictly: true },
      checkBtn: true,
      loadingplatform: false,
      checkShowList: [],
@@ -1573,8 +1550,7 @@
      yearnogo: false,
      colName: [],
      copyAreaCascaderValue:[],
      //   preSelected: [], // 上次选中的数据
      // originData: [], //  源数据平铺成一级节点
      flag:false,
    }
  },
  mounted() {
@@ -1593,6 +1569,7 @@
    this.$nextTick(() => {
      this.getPlatform()
    })

  },
  watch: {
    checkShowList(data) {
@@ -1602,127 +1579,49 @@
    }
  },
  methods: {
    // defaultSelectSomeone() {
    //   this.areaCascaderValue = [['2', '21']];
    // },
    // defaultSelectAll() {
    //   this.selectHandle([['全选']])
    // },

    // judgetAllSelected(node) {
    //   // 判断是否是全选,也就是看已选择的选中中包不包含"全选"
    //   let isAllSelected = false
    //   for(let i = 0; i < node.length; i++) {
    //       if(node[i][0] === '全选') {
    //         isAllSelected = true
    //         break;
    //       }
    //   }
    //   return isAllSelected
    // },
    // loopFlatData(list = [], parentNode = []) {
    //   list.length > 0 && list.forEach(e => {
    //     let pNode = [...parentNode]; // 注意这里必须是深拷贝，否则会由于引用类型赋值的是地址（指针），导致parentNode在pNode更新时，同时被更新
    //     if(e.children && e.children.length > 0) {
    //       pNode.push(e.value)// 1 11
    //       this.loopFlatData(e.children, pNode)

    // cardChange(event) {
    
    //   const currentSelected = event.map((items) => items[0]);
    //   const differenceMakers = [
    //     ...currentSelected.filter((item) => !this.earlySelected.includes(item)),
    //     ...this.earlySelected.filter((item) => !currentSelected.includes(item))
    //   ];
    //   if (differenceMakers.includes("全部")) {
    //     if (currentSelected.includes("全部")) {
    //       // 全選択
    //       this.areaCascaderValue = this.areaList.map(
    //         (item) => item["value"]
    //       );
    //       this.flag = true
    //     }else {
    //       if(e.label !== '全选') {
    //         if(parentNode.length > 0) {
    //           pNode.push(e.value)
    //           this.originData.push({ ...e, parentNode: pNode })
    //         }else {
    //           this.originData.push(e)
    //         }
    //       }
    //     }
    //   })
    // },
    // loopSelectData(list, parentNode = []) {
    //   list.length > 0 && list.forEach(e => {
    //     let pNode = [...parentNode]; // 注意这里必须是深拷贝，否则会由于引用类型赋值的是地址（指针），导致parentNode在pNode更新时，同时被更新
    //     if(e.children && e.children.length > 0) {
    //       pNode.push(e.value)// 1 11
    //       this.loopSelectData(e.children, pNode)
    //     }else {
    //       if(parentNode.length > 0) {
    //         this.areaCascaderValue.push([...parentNode, e.value])
    //       }else {
    //         this.areaCascaderValue.push([e.value])
    //       }
    //     }
    //   })
    // },
    // checkIsAddAllSelected() {
    //   let list = this.areaList; // 原始数据列表
    //   if(this.originData.length === 0) {
    //     this.loopFlatData(list) // 把所有的父子级平铺成一个一级列表
    //   }
    //   let origin = this.originData;
    //   let now = [...this.areaCascaderValue].filter(item => item[0] !== '全选')
    //   if(origin.length > now.length) {
    //     // 非全选时, 如果有之前选过全选,要把全选过滤掉
    //     this.areaCascaderValue = this.areaCascaderValue.filter(item => item[0] !== '全选')
    //   }else {
    //     // 当所有的数据都选择时, 要自动把全选勾选上
    //     if(this.areaCascaderValue[0] && this.areaCascaderValue[0][0] !== '全选') {
    //       this.areaCascaderValue = [['全选'], ...this.areaCascaderValue]
    //     }
    //   }
    // },
    // async selectHandle(node = []) {
    //   this.areaCascaderValue = []
    //   // 选中的数据格式: [['全选'], ['0'], ['1', '11', '111'], ['2', '21'],...]
    //   let list = this.areaList
    //   let current = []; // 获取当前选中的option, 因为element文档中没有获取当前选中的option的方法,所以我通过上一次和本地的选中数据进行对比来获取
    //   if(node.length >= this.preSelected.length) {
    //     let keys = this.preSelected.map(item => JSON.stringify(item))
    //     current = node.filter(item => !keys.includes(JSON.stringify(item)))
    //     console.log('选中某项', current);
    //   }else {
    //     // 取消选中
    //     let keys = node.map(item => JSON.stringify(item))
    //     current = this.preSelected.filter(item => !keys.includes(JSON.stringify(item)))
    //     console.log('取消选中', current);
    //   }
    //   // 根据element的选中数据格式, 每一个选项都是一个列表, 列表第一项为父级value, 第二项为选中的子级value, ...以此类推
    //   const currentValue = current.length > 0 ? current[0][0] || '' : ''
    //   if(currentValue === '全选') {
    //     if(this.judgetAllSelected(node)) {
    //       this.loopSelectData(list)
    //     }else {
    //       this.areaCascaderValue = []
    //       // 全選択解消
    //       this.areaCascaderValue = [];
    //       this.flag = false
    //     }
    //   }else {
    //     this.areaCascaderValue = node
    //     const options = this.areaList
    //       .map((item) => item["value"])
    //       .filter((item) => item);
    //     const optionsSelectedCurrent = currentSelected.filter((item) => item);
    //     if (options.length === optionsSelectedCurrent.length) {
    //       this.areaCascaderValue = this.areaList.map(
    //         (item) => item["value"]
    //       );
    //       this.flag = true
    //     } else if (options.length > optionsSelectedCurrent.length) {
    //       this.areaCascaderValue = this.flag ? this.areaList
    //         .filter((item) => item["value"])
    //         .filter((item) => item["value"] !== differenceMakers[0])
    //         .map((item) => item["value"]) : event.map((items) => items[0]);
    //       this.flag = false
    //     } else {
    //       this.areaCascaderValue = [];
    //   }
    //   this.checkIsAddAllSelected(); // 主要是勾选或取消非“全选”项时，对于全选的逻辑处理
    //   this.preSelected = this.areaCascaderValue; // 保存上一次的选择结果
    //   this.changeHandle();
    //   }
    //   this.earlySelected = this.areaCascaderValue;
    // },
    // changeHandle() {
    //   // 这里是处理成自己需要的数据格式, 需要把全选的这一选项过滤掉
    //   // 原始选择的数据格式[['全选'], ['1', '11'], ['2', '21'],...]
    //   console.log('changeHandle: ', this.areaCascaderValue);
    // },





















@@ -1916,19 +1815,19 @@
    },
    addAreaclick(params) {
      console.log(params);
      if(!params.Area){
        this.$Message.error("当前不支持省级和市级")
        $('.addZoneCard').css({ 'width': '200px' })
          $('.addModalwidth').css({ 'transition': 'width 0.5s', 'right': '145px', 'width': '200px' })
          return false
      }
      // if(!params.Area){
      //   this.$Message.error("当前不支持省级和市级")
      //   $('.addZoneCard').css({ 'width': '200px' })
      //     $('.addModalwidth').css({ 'transition': 'width 0.5s', 'right': '145px', 'width': '200px' })
      //     return false
      // }
      this.addModalShow = true
      this.showGo = true
      this.hideGo = false
      if (this.areaQueryArr.length < 5) {
        if (this.queryArr.indexOf(params.Area) < 0) {
          this.areaQueryArr.push(params.City + '-' + params.Area)
          this.queryArr.push(params.Area)
          this.areaQueryArr.push(params.Province + '' + params.City + '' + params.Area)
          this.queryArr.push(params.Province + '' + params.City + '' + params.Area)
        } else {
          this.$Message.error("当前的区域已添加请勿重复添加")
          $('.addZoneCard').css({ 'width': '200px' })
@@ -2055,7 +1954,7 @@
          //     value: "全部",
          //   })
            this.areaList = area
          //   // console.log(this.areaList);
          //   //   // console.log(this.areaList);
          // } else {
          //   this.areaList = [{
          //     label: "全部",
@@ -2063,12 +1962,12 @@
          //   }]
          // }
        } 
        // else {
        else {
        //   this.areaList = [{
        //     label: "全部",
        //     value: "全部",
        //   }]
        // }
        }
      }, res => {

      })
@@ -2102,8 +2001,10 @@
      })
    },
    getareaCascaderValue(list) {

      console.log(list);
      this.$nextTick(() => {

        this.copyAreaCascaderValue=[]
        this.areaCascaderValue = []
        for (let i = 0; i < list.length; i++) {
@@ -2117,9 +2018,10 @@

    },
    btncontrol() {
      this.$nextTick(() => {
 
      this.$nextTick(() => {
        this.areaCascaderValue = []
        this.$refs['cascader'].dropDownVisible = true
        console.log(this.$refs['cascader']);
        let list = this.$refs['cascader'].getCheckedNodes()
        this.getareaCascaderValue(list)
@@ -2163,100 +2065,7 @@
    },
  },
  computed: {
    // areaColumns

    //  areaColumnsClone () {
    //   let columns=[]
    //   columns.push({
    //     title: '序号',
    //     key: 'Province',
    //     align: 'center',
    //     minWidth:80,
    //     render:(h,params)=>{
    //       return h('span',params.row.GDPZL?params.row.GDPZL:'--')
    //     },
    //   })
    //   columns.push({
    //     title: '省份',
    //     key: 'Province',
    //     align: 'center',
    //     minWidth:80,
    //   })
    //   columns.push({
    //     title: '城市',
    //     key: 'City',
    //     align: 'center',
    //     minWidth:80,
    //   })
    //   columns.push({
    //     title: '区县',
    //     key: 'Area',
    //     align: 'center',
    //     minWidth:80,
    //   })
    //   columns.push({
    //     title: '行政级别',
    //     key: 'Level',
    //     align: 'center',
    //     minWidth:80,
    //   })
    //   columns.push({
    //     title: 'GDP总量',
    //     key: 'GDPZL',
    //     align: 'center',
    //     minWidth:100,
    //     render:(h,params)=>{
    //       return h('span',params.row.GDPZL?params.row.GDPZL:'--')
    //     },
    //   })
    //   columns.push({
    //     title: 'GDP增速(%)',
    //     key: 'GDPZS',
    //     align: 'center',
    //     minWidth:100,
    //     render:(h,params)=>{
    //       return h('span',params.row.GDPZS?params.row.GDPZS:'--')
    //     },
    //   })
    //   columns.push({
    //     title: '人均GDP(元)',
    //     key: 'RJGDP',
    //     align: 'right',
    //     render:(h,params)=>{
    //       return h('span',this.CustomMethods.numTo$(params.row.RJGDP))
    //     },
    //     minWidth:150,
    //     maxWidth:180,
    //   })
    //   columns.push({
    //     title: '一般公共预算收入(万元)',
    //     key: 'YSSR',
    //     align: 'right',
    //     render:(h,params)=>{
    //       return h('span',this.CustomMethods.numTo$(params.row.YSSR))
    //     },
    //     minWidth:150,
    //     maxWidth:180,
    //   })
    //   columns.push({
    //     title: '一般公共预算支出(万元)',
    //     key: 'YSZC',
    //     align: 'right',
    //     render:(h,params)=>{
    //       return h('span',this.CustomMethods.numTo$(params.row.YSZC))
    //     },
    //     minWidth:150,
    //     maxWidth:180,
    //   })
    //   columns.push({
    //     title: '操作',
    //     key: 'action',
    //     align: 'center',
    //     slot:'action',
    //     width:100
    //   })
    //   return columns
    // }
  }
}
</script>

 src/view/diligenceTools/checkCityInvestmentZone.vue

@@ -18,7 +18,13 @@
    <div style="margin-top: 12px">
      <Card>
        <span style="font-weight: bolder;font-size: 20px;display: inline-block">{{ this.areaQuery }}</span>
        <span style="font-weight: bolder;font-size: 16px;color: #008FE0;display: inline-block;margin-left: 20px">{{
        <span v-if="this.cityQuery === this.provinceQuery"
          style="font-weight: bolder;font-size: 16px;color: #008FE0;display: inline-block;margin-left: 20px">{{
            this.provinceQuery
          }}
        </span>
        <span v-else
          style="font-weight: bolder;font-size: 16px;color: #008FE0;display: inline-block;margin-left: 20px">{{
          this.provinceQuery
        }}
          - {{ this.cityQuery }}</span>
@@ -39,7 +45,7 @@
            </div>
          </div>
        </Poptip>
        <Tag color="gold"   style="font-size: 12px;margin-top: -1px;margin-left: 10px;">出让人</Tag>
        <Tag color="gold" style="font-size: 12px;margin-top: -1px;margin-left: 10px;">合并口径</Tag>
        <!--          <span style="border:1px solid #ccc;padding: 5px 0;margin-left: 50px;width:80px;display: inline-block;background:#fff;color: rgba(0, 143, 224, 1);text-align: center">本级</span>-->
                 <!-- <span style="border:1px solid rgba(0, 143, 224, 1);padding: 5px 0;width:80px;display: inline-block;background:rgba(0, 143, 224, 1);color: #fff;text-align: center">合并口径</span> -->
      </Card>
@@ -63,8 +69,8 @@
        <div v-show="tab === 'tab1'">
          <Card>
            <div style="display: flex">
              <div id="container" v-if="showMap" style="width: 50%;height: 400px"></div>
              <div style="width: 50%;height: 400px;">
              <div id="container" v-if="showMap" style="width: 50%;height: 300px"></div>
              <div style="width: 50%;height: 300px;">
                <div :class="tab1List.Introduce ? 'thingIntroduce' : 'nothingIntroduce'"
                  v-html="tab1List.Introduce ? tab1List.Introduce : '暂无数据'">
                </div>
@@ -120,7 +126,7 @@
                <td>{{ tab1List.ColK22 ? CustomMethods.numTo$(tab1List.ColK22) : '0.00' }}</td>
                <td>{{ tab1List.ColK22Ranking ? tab1List.ColK22Ranking : '--' }}</td>
                <td style="font-weight: bold;">城投平台数量</td>
                <td>{{ tab1List.PlatformNum ? CustomMethods.numTo$(tab1List.PlatformNum) : '0.00' }}</td>
                <td>{{ tab1List.PlatformNum ? Number.parseInt(CustomMethods.numTo$(tab1List.PlatformNum)) : '0' }}</td>
                <td>{{ tab1List.PlatformNumRanking ? tab1List.PlatformNumRanking : '--' }}</td>
              </tr>
            </table>
@@ -326,6 +332,7 @@
import $ from 'jquery'
import axios from "@/libs/api.request";
// import maps from "qqmap"
var MAP=null
export default {
  name: "checkCityInvestmentZone",
  data() {
@@ -442,13 +449,14 @@
    }
  },
  mounted() {

    this.areaQuery = this.$route.query.area
    this.levelQuery = this.$route.query.level
    if (this.levelQuery === '省级') {
      this.levelQuery = '市级'
    } else if (this.levelQuery === '市级') {
      this.levelQuery = '区县级'
    }
    // if (this.levelQuery === '省级') {
    //   this.levelQuery = '市级'
    // } else if (this.levelQuery === '市级') {
    //   this.levelQuery = '区县级'
    // }
    this.cityQuery = this.$route.query.city
    this.provinceQuery = this.$route.query.province
    this.kj = this.$route.query.kj
@@ -622,7 +630,7 @@
      this.cityQuery = this.zoneTwo
      this.areaQuery = this.zoneThree
      this.getzone()
      this.levelQuery = '区县级'
      // this.levelQuery = '区县级'
      this.getAreaData()
      //this.provinceQuery+this.cityQuery+this.areaQuery

@@ -949,6 +957,10 @@
      })
    },
    checkAreaclick(params) {
      this.provinceQuery = params.Province
      this.cityQuery = params.City
      this.areaQuery = params.Area
      // console.log(params);
      this.tab1List = {}
      this.loadingScroll = true
      let data = {
@@ -958,19 +970,16 @@
        area: params.Area,
        kj: this.kj
      }
      if (this.levelQuery === '市级') {
        data.province = ''
        // this.levelQuery = '区县级'
        // this.cityQuery = params.City
      } else if (this.levelQuery === '区县级') {
        data.province = ''
        data.city = ''
        // this.cityQuery = params.Area
      }
      // else if (this.levelQuery === '省级') {
      //   data.province = ''
      //   this.cityQuery = params.City
      // if (this.levelQuery === '省级') {
      //   // data.province = ''
      //   // this.levelQuery = '区县级'
      //   // this.cityQuery = params.City
      // } else if (this.levelQuery === '市级') {
      //   // data.province = ''
      //   // data.city = ''
      //   // this.cityQuery = params.Area
      // }

      axios.request({
        url: '/CityInvestment/GetAreaDetail',
        data,
@@ -996,7 +1005,7 @@
      }, res => {

      })
      // this.getzone(params)
      this.getzone(params)
    },
    changePageIndex(page) {
      this.pageIndex = page
@@ -1007,32 +1016,25 @@
    getzone(params) {
      this.loadingtab1 = true
      let data = {

      }
      if (params) {
        data = {
          pageIndex: this.pageIndex,
          pageSize: 5,
          year: this.yearDetail,
          level: this.levelQuery,
          level: params.Level,
          Areas: [{
            province: params.Province,
            city: params.City,
            area: params.Area,
          }],

          // kj:this.kj,
          orderByCol: this.orderByCol,
          orderByType: this.orderByType,
        }
        if (this.levelQuery === '市级') {
        if (params.Level === '省级') {
          data.level = '市级'
        } else if (params.Level === '市级') {
         data.level = '区县级'
        // this.levelQuery = '区县级'
        // this.cityQuery = params.City
      } else if (this.levelQuery === '区县级') {
        // data.province = ''
        // data.city = ''
        // this.cityQuery = params.Area
      }
      } else {
        data = {
@@ -1045,10 +1047,14 @@
            city: this.cityQuery,
            area: this.areaQuery,
          }],

          // kj:this.kj,
          orderByCol: this.orderByCol,
          orderByType: this.orderByType,
        }
        if (this.levelQuery === '省级') {
          data.level = '市级'

        } else if (this.levelQuery === '市级') {
          data.level = '区县级'
        }
      }
      axios.request({
@@ -1357,7 +1363,7 @@
      //     }
      //   }

      //   this.map=new qq.maps.Map(
      //   MAP=new qq.maps.Map(
      //     document.getElementById('container'),
      //     myOptions
      //   )
@@ -1367,15 +1373,10 @@
      //  let  childNodes=content.childNodes
      //  console.log(childNodes);

      // var f = document.getElementById("container");
      // var childs = f.childNodes;
      // for (var i = 0; i < childs.length; i++) {
      //   // alert(childs[i].nodeName); 
      //   f.removeChild(childs[i]);
      // }

      var center = new TMap.LatLng(39.984104, 116.307503);
      //初始化地图
      var map = new TMap.Map("container", {
      MAP = new TMap.Map("container", {
        rotation: 20,//设置地图旋转角度
        pitch: 30, //设置俯仰角度（0~45）
        zoom: 8,//设置地图缩放级别
@@ -1462,6 +1463,9 @@
      this.getTab7List()
    },
    changeTab(data) {
      if (MAP) {
        MAP.destroy()
      }
      if (this.tab === "tab1") {
        this.showMap = false
        this.getAreaData()
@@ -1887,7 +1891,7 @@
      //   align: 'center',
      //   minWidth: 100,
      // })
      if (this.levelQuery === '市级') {
      if (this.levelQuery === '省级') {
        columns.push({
          title: '地级市',
          key: 'City',
@@ -1907,7 +1911,7 @@
          },
        })
      }
      if (this.levelQuery === '区县级') {
      if (this.levelQuery === '市级') {
        columns.push({
          title: '区县',
          key: 'Area',
@@ -1985,8 +1989,27 @@
      })
      return columns
    }
  },
  destroyed() {


    if (MAP) {
      console.log(1111);
      MAP.destroy()
  }
}

  // watch: {
  //     '$route': {
  //         handler(to, from){
  //           console.log(from)
  //         },
  //         deep: true, // 深度监听
  //         immediate: true, // 第一次初始化渲染就可以监听到
  //     }
  // }

}
</script>

<style>

 src/view/diligenceTools/contrastCityInvestmentZone.vue

@@ -7,14 +7,17 @@
        <span style="color:rgb(70, 76, 91);margin:0 5px">>></span>
        <span>区域对比</span>
        <span style="display: inline-block;position: absolute;right: 12px;">
          <Button size="large" icon="md-arrow-back" type="primary" style="font-size: 14px;margin-top: -9.5px" @click="backfund">返回</Button>
          <Button size="large" icon="md-arrow-back" type="primary" style="font-size: 14px;margin-top: -9.5px"
            @click="backfund">返回</Button>
        </span>
      </div>
    </Card>
    <div style="margin-top: 12px">
      <Card class="contrastCLass">
        <Tag v-for="item in areaQueryArr" closable @on-close="handleClose2">{{item}}</Tag>
        <span @click="clickAddArea" style="vertical-align: middle;display: inline-block;margin-left: 10px"><Icon style="font-size: 27px;" custom="custom custom-tianjianeirong"></Icon></span>
        <!-- <span @click="clickAddArea" style="vertical-align: middle;display: inline-block;margin-left: 10px">
          <Icon style="font-size: 27px;" custom="custom custom-tianjianeirong"></Icon>
        </span> -->
      </Card>
    </div>
    <div style="margin-top: 12px">
@@ -22,11 +25,11 @@
        <div>
          <Tabs v-model="tab" @on-click="changeTab" type="card" style="margin-top: 12px;">
            <TabPane label="经济情况" name="tab2"></TabPane>
            <TabPane label="财政一般预算" name="tab3"></TabPane>
            <TabPane label="财政基金收入" name="tab4"></TabPane>
            <TabPane label="国有资本及社保基金" name="tab5"></TabPane>
            <TabPane label="区域债务" name="tab6"></TabPane>
            <TabPane label="区域融资平台" name="tab7"></TabPane>
            <TabPane label="一般公共预算收支" name="tab3"></TabPane>
            <TabPane label="政府性基金收支" name="tab4"></TabPane>
            <TabPane label="国有资本预算收支" name="tab5"></TabPane>
            <TabPane label="区域债务及综合财力" name="tab6"></TabPane>
            <!-- <TabPane label="城投平台" name="tab7"></TabPane> -->
          </Tabs>
        </div>
        <div v-show="tab==='tab2'">
@@ -34,12 +37,15 @@
            <div style="width: 200px" class="zhibiaoClass">
              <Row  style="vertical-align: middle;display: inline-block;margin-bottom: 12px">
                <Col span="24">
                  <DatePicker transfer placement="bottom-start" @on-change="contrastDate"  :clearable=false format="yyyy年" size="large" v-model="areaTime"  type="year"  placeholder="请选择年份" style="width: 100%" class="ipt_width"></DatePicker>
                <DatePicker transfer placement="bottom-start" @on-change="contrastDate" :clearable=false format="yyyy年"
                  size="large" v-model="areaTime" type="year" placeholder="请选择年份" style="width: 100%" class="ipt_width">
                </DatePicker>
                </Col>
              </Row>
            </div>
            <div style="width: 200px;margin-left: 20px" class="zhibiaoClass_xiala">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标" v-model="zhibiao">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标"
                v-model="zhibiao">
                <Option v-for="item in zhibiaoList" :value="item.Desc2">{{item.Desc2}}</Option>
              </Select>
            </div>
@@ -53,12 +59,15 @@
            <div style="width: 200px" class="zhibiaoClass">
              <Row  style="vertical-align: middle;display: inline-block;margin-bottom: 12px">
                <Col span="24">
                  <DatePicker transfer placement="bottom-start" @on-change="contrastDate"  :clearable=false format="yyyy年" size="large" v-model="areaTime"  type="year"  placeholder="请选择年份" style="width: 100%" class="ipt_width"></DatePicker>
                <DatePicker transfer placement="bottom-start" @on-change="contrastDate" :clearable=false format="yyyy年"
                  size="large" v-model="areaTime" type="year" placeholder="请选择年份" style="width: 100%" class="ipt_width">
                </DatePicker>
                </Col>
              </Row>
            </div>
            <div style="width: 200px;margin-left: 20px" class="zhibiaoClass_xiala">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标" v-model="zhibiao">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标"
                v-model="zhibiao">
                <Option v-for="item in zhibiaoList" :value="item.Desc2">{{item.Desc2}}</Option>
              </Select>
            </div>
@@ -72,12 +81,15 @@
            <div style="width: 200px" class="zhibiaoClass">
              <Row  style="vertical-align: middle;display: inline-block;margin-bottom: 12px">
                <Col span="24">
                  <DatePicker transfer placement="bottom-start" @on-change="contrastDate"  :clearable=false format="yyyy年" size="large" v-model="areaTime"  type="year"  placeholder="请选择年份" style="width: 100%" class="ipt_width"></DatePicker>
                <DatePicker transfer placement="bottom-start" @on-change="contrastDate" :clearable=false format="yyyy年"
                  size="large" v-model="areaTime" type="year" placeholder="请选择年份" style="width: 100%" class="ipt_width">
                </DatePicker>
                </Col>
              </Row>
            </div>
            <div style="width: 200px;margin-left: 20px" class="zhibiaoClass_xiala">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标" v-model="zhibiao">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标"
                v-model="zhibiao">
                <Option v-for="item in zhibiaoList" :value="item.Desc2">{{item.Desc2}}</Option>
              </Select>
            </div>
@@ -91,12 +103,15 @@
            <div style="width: 200px" class="zhibiaoClass">
              <Row  style="vertical-align: middle;display: inline-block;margin-bottom: 12px">
                <Col span="24">
                  <DatePicker transfer placement="bottom-start" @on-change="contrastDate"  :clearable=false format="yyyy年" size="large" v-model="areaTime"  type="year"  placeholder="请选择年份" style="width: 100%" class="ipt_width"></DatePicker>
                <DatePicker transfer placement="bottom-start" @on-change="contrastDate" :clearable=false format="yyyy年"
                  size="large" v-model="areaTime" type="year" placeholder="请选择年份" style="width: 100%" class="ipt_width">
                </DatePicker>
                </Col>
              </Row>
            </div>
            <div style="width: 200px;margin-left: 20px" class="zhibiaoClass_xiala">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标" v-model="zhibiao">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标"
                v-model="zhibiao">
                <Option v-for="item in zhibiaoList" :value="item.Desc2">{{item.Desc2}}</Option>
              </Select>
            </div>
@@ -110,12 +125,15 @@
            <div style="width: 200px" class="zhibiaoClass">
              <Row  style="vertical-align: middle;display: inline-block;margin-bottom: 12px">
                <Col span="24">
                  <DatePicker transfer placement="bottom-start" @on-change="contrastDate"  :clearable=false format="yyyy年" size="large" v-model="areaTime"  type="year"  placeholder="请选择年份" style="width: 100%" class="ipt_width"></DatePicker>
                <DatePicker transfer placement="bottom-start" @on-change="contrastDate" :clearable=false format="yyyy年"
                  size="large" v-model="areaTime" type="year" placeholder="请选择年份" style="width: 100%" class="ipt_width">
                </DatePicker>
                </Col>
              </Row>
            </div>
            <div style="width: 200px;margin-left: 20px" class="zhibiaoClass_xiala">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标" v-model="zhibiao">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标"
                v-model="zhibiao">
                <Option v-for="item in zhibiaoList" :value="item.Desc2">{{item.Desc2}}</Option>
              </Select>
            </div>
@@ -129,12 +147,15 @@
            <div style="width: 200px" class="zhibiaoClass">
              <Row  style="vertical-align: middle;display: inline-block;margin-bottom: 12px">
                <Col span="24">
                  <DatePicker transfer placement="bottom-start" @on-change="contrastDate"  :clearable=false format="yyyy年" size="large" v-model="areaTime"  type="year"  placeholder="请选择年份" style="width: 100%" class="ipt_width"></DatePicker>
                <DatePicker transfer placement="bottom-start" @on-change="contrastDate" :clearable=false format="yyyy年"
                  size="large" v-model="areaTime" type="year" placeholder="请选择年份" style="width: 100%" class="ipt_width">
                </DatePicker>
                </Col>
              </Row>
            </div>
            <div style="width: 200px;margin-left: 20px" class="zhibiaoClass_xiala">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标" v-model="zhibiao">
              <Select @on-select="zhibiaoSelecttab2" :max-tag-count="1" size="large" multiple placeholder="请选择指标"
                v-model="zhibiao">
                <Option v-for="item in zhibiaoList" :value="item.Desc2">{{item.Desc2}}</Option>
              </Select>
            </div>
@@ -144,13 +165,7 @@
          </div>
        </div>
      </Card>
      <Modal v-model="addAreaModel"
             footer-hide
             width="520"
             sticky
             reset-drag-position
             :mask="true"
             draggable
      <Modal v-model="addAreaModel" footer-hide width="520" sticky reset-drag-position :mask="true" draggable
             :mask-closable="false">
        <p slot="header">
          <Icon custom="custom custom-tianjia" style="margin-right: 10px;"></Icon>
@@ -164,8 +179,8 @@
          <Button size="large" custom-icon="custom custom-queding" style="margin-bottom: 12px" type="primary"
                  @click="confirmSenior">确认
          </Button>
          <Button size="large" custom-icon="custom custom-quxiao" style="margin-bottom: 12px;margin-left:24px" type="error"
                  @click="addAreaModel=false">取消
          <Button size="large" custom-icon="custom custom-quxiao" style="margin-bottom: 12px;margin-left:24px"
            type="error" @click="addAreaModel = false">取消
          </Button>
        </div>
      </Modal>
@@ -185,7 +200,7 @@
      tab:'tab2',
      map:null,
      areaTime:'2021',
      zhibiao:'',
      zhibiao: [],
      loadingtab2:false,
      tab2TableList:[],
      nianfen:'',
@@ -202,14 +217,16 @@
    }
  },
  mounted() {
    console.log(JSON.parse(JSON.stringify(this.$route.query)));
    //this.areaQuery=this.$route.query.area
    this.areaQueryArr=JSON.parse(JSON.stringify(this.$route.query.area))
    this.yeararr=(JSON.parse(JSON.stringify(this.$route.query.year)).toString())
    this.areaTime=new Date(this.yeararr)
    this.reportName="经济情况"
    this.getAreaList()
    this.getTab2List()
    this.getzhibiaoList()
    this.getTab2List()

  },
  methods:{
    /**
@@ -365,6 +382,7 @@
      this.addAreaList()
    },
    getTab2List(){
    //  this.zhibiao=[]
      this.loadingtab2=true
      let getArea
      let getAreaArr=[]
@@ -415,15 +433,16 @@
              title:b,
              key:b,
              minWidth:150,
              align:"right"
              align: "right",
            })
          }
          this.tab2Columns=c

        } else {

        }
          console.log(this.tab2Columns);
        this.zhibiaoSelecttab2()
        } else {
          this.zhibiaoSelecttab2()
        }
        
        $('.contrastZone .ivu-table-body').animate({scrollTop: 0}, 'slow')
      }, res => {

@@ -433,6 +452,7 @@
     * 指标下拉事件
     ***/
    zhibiaoSelecttab2(){
      
      let a=[]
      this.loadingtab2=true
      this.$nextTick(()=>{
@@ -464,7 +484,7 @@
          this.zhibiaoList.forEach((val, index) => {
            a.push({ Desc1: val.Desc1, Desc2: val.Desc2 })
          })
          this.zhibiao = a
          // this.zhibiao = a
        } else {

        }
@@ -473,8 +493,10 @@
      })
    },
    changeTab(data){
      this.zhibiao=[]
      if(this.tab==='tab2'){
        this.reportName="经济情况"
        
        this.getzhibiaoList()
        this.getTab2List()
      }else
@@ -513,18 +535,23 @@
  line-height: 35px;
  height: 35px;
}

.contrastCLass .ivu-tag .ivu-icon-ios-close{
  top: -3px;
}

.contrastCLass .ivu-tag-text{
  font-size: 14px;
}

.zhibiaoClass .ivu-select-large.ivu-select-multiple .ivu-tag{
  font-size: 14px;
}

.zhibiaoClass_xiala .ivu-select-large.ivu-select-multiple .ivu-tag{
  font-size: 14px;
}

.zhibiaoClass_xiala .ivu-select-multiple .ivu-tag span:not(.ivu-select-max-tag){
  max-width:60px;
}

 src/view/enterpriseControl/bankPunishEvent.vue

@@ -3,6 +3,7 @@
    <Card v-if="componentsType != 'noTitle'">
      <div class="customTitle">
        <Icon custom="custom custom-zulin-copy"></Icon>
        <!-- <Icon custom="custom custom-shixiangguanli"></Icon> -->
        <span style="margin-left: 6px;">银保监处罚事件</span>
      </div>
    </Card>

 src/view/rentExchangeZF/rentExchangeCompanyZF.vue

@@ -5,7 +5,9 @@
      <Card class="customTitle">
        <div>
          <!-- <Icon type="ios-keypad"/> -->
          <span class="ivu-icon custom custom-yinhangliushuifenxi_b"></span>
          <Icon v-if="this.$router.currentRoute.name==='zongheEvaluate'" custom="custom custom-jiegou1"></Icon>
          <span v-else class="ivu-icon custom custom-yinhangliushuifenxi_b"></span>
         
          
          <span v-if="this.$router.currentRoute.name==='zongheEvaluate'" style="cursor: pointer;margin-left: 5px">综合评估</span>
          <span v-else style="cursor: pointer;margin-left: 5px">企业评估-政信公司</span>