Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_Web

Jin Lei

2023-11-15 58420e9f2c549a9fbb9ab3613b7067faa38ccdcc

Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_Web

 src/components/left/layerTree/Layer.vue

@@ -1109,6 +1109,8 @@
  }

  .el-tree {
    height: 300px;
    overflow: auto;
    background: transparent;
    color: #fff;
  }

 src/components/map/viewer1.vue

@@ -80,8 +80,8 @@
        class="aboutDialog"
        title="企业信息"
        append-to-body
        width="60%"
        height="60%"
        width="50%"
        height="55%"
        style="overflow: auto"
        :visible.sync="QYbox"
        :before-close="dialogClose"
@@ -115,13 +115,14 @@
            style="width: 100%"
            :data="tableData"
            highlight-current-row
            height="50"
          >
            <el-table-column type="index" width="50"></el-table-column>
            <el-table-column
              property="企业名称"
              label="企业名称"
            ></el-table-column>
            <el-table-column
            <!-- <el-table-column
              property="企业类型"
              label="企业类型"
            ></el-table-column>
@@ -137,12 +138,21 @@
              property="法人"
              label="法人"
              width="100"
            ></el-table-column>
            ></el-table-column> -->
            <el-table-column
              property="注册地址"
              label="注册地址"
              width="200"
            ></el-table-column>
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <el-button
                  @click="handleClick(scope.row)"
                  type="text"
                  size="small"
                  >详情</el-button
                >
              </template>
            </el-table-column>
          </el-table>
          <div
            slot="footer"
@@ -728,7 +738,13 @@
      }
      return table;
    },

    handleClick(row) {
      window.open(
        "https://qylweb.bda.gov.cn/alldetails/#/newEnterprisedetails?uscc=" +
          row["统一社会信用代码"] +
          "&systemName=中小微"
      );
    },
    detectZoom() {
      var ratio = 0,
        screen = window.screen,
@@ -1297,6 +1313,10 @@
  height: 80% !important;
  overflow: auto;
}
.el-table /deep/ .el-button--text {
  /* color: #fff; */
  font-size: 14px;
}

.el-table thead {
  font-weight: 500;

 static/layers.json

@@ -4,6 +4,27 @@
    "open": true,
    "children": [
        {
            "id": "CE402B81",
            "name": "组织人事部",
            "children": [
                {
                    "id": "A349C2B7",
                    "sourceType": "wmse",
                    "name": "亦企服务岗",
                    "urls": "http://10.10.4.121:8070/gisserver/wmsserver/yiqifuwugang-1102",
                    "maximumLevel": 26,
                    "alpha": 1,
                    "zIndex": 4,
                    "Level": "0,26",
                    "checked": false,
                    "rename": false
                }
            ],
            "rename": false,
            "checked": false,
            "expanded": false
        },
        {
            "id": "482040AD",
            "name": "宣传文化部",
            "children": [
@@ -3703,7 +3724,7 @@
                }
            ],
            "rename": false,
            "expanded": true,
            "expanded": false,
            "checked": false
        },
        {
@@ -4575,7 +4596,6 @@
                                    "zIndex": 2,
                                    "rename": false
                                },
                                
                                {
                                    "id": "A6D6DE13",
                                    "sourceType": "gdmap",

 static/layers2.json

@@ -474,6 +474,18 @@
            "name": "城市规划",
            "children": [
                {
                    "id": "A349C2B7",
                    "sourceType": "wmse",
                    "name": "亦企服务岗",
                    "urls": "http://10.10.4.121:8070/gisserver/wmsserver/yiqifuwugang-1102",
                    "maximumLevel": 26,
                    "alpha": 1,
                    "zIndex": 4,
                    "Level": "0,26",
                    "checked": false,
                    "rename": false
                },
                {
                    "id": "chengshiguihua_xiangmumingcheng_tms",
                    "name": "亦庄新城规划图",
                    "sourceType": "local-map",
@@ -4801,7 +4813,8 @@
                }
            ],
            "rename": false,
            "expanded": false
            "expanded": false,
            "checked": false
        },
        {
            "id": "65B2146A",
@@ -4822,7 +4835,9 @@
                    "rename": false
                }
            ],
            "rename": false
            "rename": false,
            "expanded": false,
            "checked": false
        },
        {
            "id": "B5F8764D",