上饶市警务平台后台管理前端
zhongrj
2023-02-17 46df86ef5f24f62d2d8fe52a338efdb8b4c62727
textarea 字体颜色样式修改,安保活动树接口修改
9 files modified
17495 ■■■■■ changed files
package-lock.json 17381 ●●●●● patch | view | raw | blame | history
src/api/system/dept.js 8 ●●●●● patch | view | raw | blame | history
src/components/map/dcMap.vue 38 ●●●● patch | view | raw | blame | history
src/components/map/dcSearchMap.vue 34 ●●●● patch | view | raw | blame | history
src/styles/element-ui.scss 1 ●●●● patch | view | raw | blame | history
src/views/security/security.vue 19 ●●●●● patch | view | raw | blame | history
src/views/securityManage/securityManage.vue 5 ●●●●● patch | view | raw | blame | history
src/views/securityManageCar/securityManageCar.vue 5 ●●●●● patch | view | raw | blame | history
src/views/system/user.vue 4 ●●●● patch | view | raw | blame | history
package-lock.json
Diff too large
src/api/system/dept.js
@@ -79,3 +79,11 @@
  })
}
export const getPoliceStationTree = (params) => {
  return request({
    url: '/api/blade-system/dept/getPoliceStationTree',
    method: 'get',
    params: params
  })
}
src/components/map/dcMap.vue
@@ -48,26 +48,26 @@
            })
            //加载地图
            //   global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //       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',
            //       format: 'image/jpeg',
            //       show: true,
            //       maximumLevel: 18
            //     })
            //   )
            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                    url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
                    layer: "wmts_4326_361100",
                    style: "default",
                    format: "image/png",
                    tileMatrixSetID: "c",
                    tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
                    tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
              global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                  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',
                  format: 'image/jpeg',
                  show: true,
                  maximumLevel: 18
                })
            )
              )
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
            //         url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
            //         layer: "wmts_4326_361100",
            //         style: "default",
            //         format: "image/png",
            //         tileMatrixSetID: "c",
            //         tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
            //         tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
            //     })
            // )
            //添加图层
            self.polygonLayer = new global.DC.VectorLayer('polygonLayer')
src/components/map/dcSearchMap.vue
@@ -48,27 +48,27 @@
                })
                //加载地图
                // global.searchViewer.imageryLayers.addImageryProvider(
                //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                //         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',
                //         format: 'image/jpeg',
                //         show: true,
                //         maximumLevel: 18
                //     })
                // )
                global.searchViewer.imageryLayers.addImageryProvider(
                    new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                        url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
                        layer: "wmts_4326_361100",
                        style: "default",
                        format: "image/png",
                        tileMatrixSetID: "c",
                        tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
                        tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
                    new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                        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',
                        format: 'image/jpeg',
                        show: true,
                        maximumLevel: 18
                    })
                )
                // global.searchViewer.imageryLayers.addImageryProvider(
                //     new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                //         url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
                //         layer: "wmts_4326_361100",
                //         style: "default",
                //         format: "image/png",
                //         tileMatrixSetID: "c",
                //         tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
                //         tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
                //     })
                // )
                //添加图层
                self.pointLayer = new global.DC.VectorLayer('polygonLayer')
                global.searchViewer.addLayer(self.pointLayer)
src/styles/element-ui.scss
@@ -265,6 +265,7 @@
//多行输入
.el-textarea__inner {
  background-color: $inputB1 !important;
  color: #fff !important;
}
// 数字type input
src/views/security/security.vue
@@ -109,10 +109,12 @@
              message: "请输入活动名称",
              trigger: "blur"
            }],
            overHidden:true,
          },
          {
            label: "负责单位",
            prop: "company",
            hide:true,
          },
          {
            label: "负责人",
@@ -141,9 +143,7 @@
            click: () => {
              this.placeBox = !this.placeBox
            },
            // addDisplay: false,
            // editDisplay: false,
            // viewDisplay: false,
            overHidden:true,
          },
          {
            label: "经度",
@@ -182,15 +182,16 @@
            label: "所属辖区",
            prop: "deptId",
            type: "tree",
            dicUrl: "api/blade-system/dept/lazy-list",
            dicUrl: "api/blade-system/dept/getPoliceStationTree",
            props: {
              label: 'deptName',
              label: 'name',
              value: 'id',
              children: 'children'
            },
            search: true,
            searchSpan: 4,
            span: 24,
            defaultExpandAll:"true",
            width: 110,
            rules: [{
              required: true,
@@ -262,12 +263,18 @@
            label: "人数",
            prop: "number",
            width: 60,
            rules: [{
              required: true,
              message: "请输入人数",
              trigger: "blur"
            }],
          },
          {
            label: "活动内容",
            prop: "content",
            type: "textarea",
            span: 24
            span: 24,
            hide:true,
          },
        ]
      },
src/views/securityManage/securityManage.vue
@@ -94,9 +94,10 @@
            prop: "deptId",
            type: "tree",
            disabled: true,
            dicUrl: "api/blade-system/dept/lazy-list",
            dicUrl: "api/blade-system/dept/getPoliceStationTree",
            defaultExpandAll:"true",
            props: {
              label: 'deptName',
              label: 'name',
              value: 'id',
              children: 'children'
            },
src/views/securityManageCar/securityManageCar.vue
@@ -102,9 +102,10 @@
            label: "所属辖区",
            prop: "deptId",
            type: "tree",
            dicUrl: "api/blade-system/dept/lazy-list",
            dicUrl: "api/blade-system/dept/getPoliceStationTree",
            defaultExpandAll:"true",
            props: {
              label: 'deptName',
              label: 'name',
              value: 'id',
              children: 'children'
            },
src/views/system/user.vue
@@ -422,7 +422,7 @@
                            {
                                label: "所属角色",
                                prop: "roleId",
                                multiple: true,
                                // multiple: true,
                                type: "tree",
                                dicData: [],
                                props: {
@@ -450,7 +450,7 @@
                                label: "所属单位",
                                prop: "deptId",
                                type: "tree",
                                multiple: true,
                                // multiple: true,
                                dicData: [],
                                props: {
                                    label: "title"