Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

zhengpz

2021-08-14 3b0ed1b4ac9b0cc34b435d15f2ac55f70734102d

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

 src/components/map/main.vue

@@ -90,91 +90,91 @@
    },
    mounted () {
        // 本地开发使用
        this.ol2d = new OlMap({
            layers: [
                new OlLayerTile({
                    zIndex: 4,
                    title: '影像',
                    source: new XYZ({
                        url: "https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal" // 行政区划
                    })
                })
                // ,
                // new OlLayerTile({
                //     zIndex: 5,
                //     title: '道路+中文注记',
                //     source: new XYZ({
                //         url: 'http://t3.tianditu.com/DataServer?T=cta_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0' // 注记
                //     })
                // })
            ],

            // 注意地图控件的写法
            controls: defaults().extend([
                new FullScreen(),
                new ScaleLine(),
                new MousePosition(),
                new Rotate(),
                new Attribution()
            ]),
            target: 'track_map',
            view: new OlView({
                center: [0, 0],
                zoom: 2,
                projection: 'EPSG:4326'
            })
        })

        // var projection = getProjection("EPSG:4326");
        // var projectionExtent = projection.getExtent();
        // var size = getWidth(projectionExtent) / 256;
        // var resolutions = [];
        // for (var z = 2; z < 19; ++z) {//计算比例尺
        //     resolutions[z] = size / Math.pow(2, z);
        // }

        // // 正式服务器上使用
        // this.ol2d = new OlMap({
        //     layers: [
        //         new OlLayerTile({//矢量地图

        //             source: new WMTS({
        //                 url: "http://47.49.21.207:7001/PGIS_S_TileMapServer/Maps/YX",
        //                 layer: "JX14YGJCIMGL7_L14",
        //                 style: "default",
        //                 matrixSet: "JX14YGJCIMGL7_L14",
        //                 format: "image/png",
        //                 wrapX: true,
        //                 tileGrid: new WMTSTileGrid({
        //                     origin: getTopLeft(projectionExtent),
        //                     //resolutions: res.slice(0, 15),
        //                     resolutions: resolutions,
        //                     matrixIds: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
        //                 })
        //             }),

        //         new OlLayerTile({
        //             zIndex: 4,
        //             title: '影像',
        //             source: new XYZ({
        //                 url: "https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal" // 行政区划
        //             })
        //         })
        //         // ,
        //         // new OlLayerTile({
        //         //     zIndex: 5,
        //         //     title: '道路+中文注记',
        //         //     source: new XYZ({
        //         //         url: 'http://t3.tianditu.com/DataServer?T=cta_w&x={x}&y={y}&l={z}&tk=e9533f5acb2ac470b07f406a4d24b4f0' // 注记
        //         //     })
        //         // })
        //     ],

        //     // 注意地图控件的写法
        //     controls: defaults().extend([
        //         new FullScreen(),
        //         new ScaleLine(),
        //         // new MousePosition(),
        //         new MousePosition(),
        //         new Rotate(),
        //         new Attribution()
        //     ]),
        //     target: 'track_map',
        //     view: new OlView({
        //         center: [115.85883507433789, 28.708432053474827],
        //         projection: projection,
        //         zoom: 11,
        //         maxZoom: 15,
        //         minZoom: 1

        //         center: [0, 0],
        //         zoom: 2,
        //         projection: 'EPSG:4326'
        //     })
        // })

        var projection = getProjection("EPSG:4326");
        var projectionExtent = projection.getExtent();
        var size = getWidth(projectionExtent) / 256;
        var resolutions = [];
        for (var z = 2; z < 19; ++z) {//计算比例尺
            resolutions[z] = size / Math.pow(2, z);
        }

        // 正式服务器上使用
        this.ol2d = new OlMap({
            layers: [
                new OlLayerTile({//矢量地图

                    source: new WMTS({
                        url: "http://47.49.21.207:7001/PGIS_S_TileMapServer/Maps/YX",
                        layer: "JX14YGJCIMGL7_L14",
                        style: "default",
                        matrixSet: "JX14YGJCIMGL7_L14",
                        format: "image/png",
                        wrapX: true,
                        tileGrid: new WMTSTileGrid({
                            origin: getTopLeft(projectionExtent),
                            //resolutions: res.slice(0, 15),
                            resolutions: resolutions,
                            matrixIds: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
                        })
                    }),

                })
            ],

            // 注意地图控件的写法
            controls: defaults().extend([
                new FullScreen(),
                new ScaleLine(),
                // new MousePosition(),
                new Rotate(),
                new Attribution()
            ]),
            target: 'track_map',
            view: new OlView({
                center: [115.85883507433789, 28.708432053474827],
                projection: projection,
                zoom: 11,
                maxZoom: 15,
                minZoom: 1

            })
        })

        this.parentParameter();

        window.ol2d = this.ol2d

 src/styles/element-ui.scss

@@ -582,3 +582,8 @@
    border-bottom: 1px solid rgba($color: #000000, $alpha: 0.1) !important;
  }
}

//
.el-range-editor--mini .el-range-input {
  background-color: transparent !important;
}

 src/views/permit/permit.vue

@@ -55,7 +55,7 @@
            :size="size"
            :type="type"
            @click.stop="viewLicense(row)"
            v-if="row.type != '2'"
            v-if="row.type == '0'"
            >打印许可证
          </el-button>
        </template>
@@ -276,7 +276,7 @@
            ],
          },
          {
            label: "成立日期",
            label: "注册时间",
            prop: "establishtime",
            type: "date",
            format: "yyyy-MM-dd",
@@ -284,7 +284,7 @@
            rules: [
              {
                required: true,
                message: "请输入成立日期",
                message: "请输入注册时间",
                trigger: "blur",
              },
            ],

 src/views/recordk/recordk.vue

@@ -131,7 +131,7 @@
            ],
          },
          {
            label: "成立日期",
            label: "注册时间",
            prop: "establishtime",
            overHidden: true,
            type: "date",
@@ -140,7 +140,7 @@
            rules: [
              {
                required: true,
                message: "请输入成立日期",
                message: "请输入注册时间",
                trigger: "blur",
              },
            ],

 src/views/revoke/revoke.vue

@@ -131,7 +131,7 @@
            ],
          },
          {
            label: "成立日期",
            label: "注册时间",
            prop: "establishtime",
            type: "date",
            format: "yyyy-MM-dd",
@@ -139,7 +139,7 @@
            rules: [
              {
                required: true,
                message: "请输入成立日期",
                message: "请输入注册时间",
                trigger: "blur",
              },
            ],

 src/views/securityCompany/armed.vue

@@ -89,7 +89,7 @@
            width: 120,
          },
          {
            label: "成立日期",
            label: "注册时间",
            prop: "establishtime",
            type: "date",
            format: "yyyy-MM-dd",

 src/views/securityCompany/column.js

@@ -22,7 +22,7 @@
        width: 95,
    },
    {
        label: "成立日期",
        label: "注册时间",
        prop: "establishtime",
        type: "date",
        format: "yyyy-MM-dd",

 src/views/securityCompany/companyDetails.vue

@@ -42,7 +42,7 @@
                <el-row>
                  <el-col span="12">
                    <el-col span="12">
                      <el-form-item label="成立日期">
                      <el-form-item label="注册时间">
                        <el-input
                          disabled="true"
                          v-model="form.establishtime"

 src/views/securityCompany/confess.vue

@@ -205,7 +205,7 @@
        //     width: 95,
        //   },
        //   {
        //     label: "成立日期",
        //     label: "注册时间",
        //     prop: "establishtime",
        //     type: "date",
        //     format: "yyyy-MM-dd",

 src/views/securityCompany/security.vue

@@ -205,7 +205,7 @@
        //     width: 95,
        //   },
        //   {
        //     label: "成立日期",
        //     label: "注册时间",
        //     prop: "establishtime",
        //     type: "date",
        //     format: "yyyy-MM-dd",

 src/views/securityCompany/securityCrossRegion.vue

@@ -205,7 +205,7 @@
        //     width: 95,
        //   },
        //   {
        //     label: "成立日期",
        //     label: "注册时间",
        //     prop: "establishtime",
        //     type: "date",
        //     format: "yyyy-MM-dd",

 src/views/securityCompany/train.vue

@@ -194,7 +194,7 @@
            width: 120,
          },
          {
            label: "成立日期",
            label: "注册时间",
            prop: "establishtime",
            type: "date",
            format: "yyyy-MM-dd",

 src/views/unitPermission/accraditation.vue

@@ -87,7 +87,7 @@
            width: 120,
          },
          {
            label: "成立日期",
            label: "注册时间",
            prop: "establishtime",
            type: "date",
            format: "yyyy-MM-dd",