Browse Source

Merge branch 'dev-bug-temp2'

feature/account
dai 3 years ago
parent
commit
17a421f3f1
  1. BIN
      src/assets/img/shuju/grid/IS_KC.png
  2. BIN
      src/assets/img/shuju/grid/sr_gc.png
  3. 7
      src/views/modules/visual/command/cpts/map.vue
  4. 4
      src/views/modules/visual/command/index.vue

BIN
src/assets/img/shuju/grid/IS_KC.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/assets/img/shuju/grid/sr_gc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 597 B

7
src/views/modules/visual/command/cpts/map.vue

@ -531,10 +531,9 @@ export default {
strokeOpacity: 0.1, strokeOpacity: 0.1,
stroke: "#000", stroke: "#000",
}); });
scene.addLayer(dotBgLayer);
dotLayer = new PointLayer({ dotLayer = new PointLayer({
zIndex: 21, zIndex: 20,
}) })
.source(dotData) .source(dotData)
.shape("categoryKey", (k) => k) .shape("categoryKey", (k) => k)
@ -543,6 +542,8 @@ export default {
offsets: [0, 0], offsets: [0, 0],
layerType: "fillImage", layerType: "fillImage",
}); });
scene.addLayer(dotBgLayer);
scene.addLayer(dotLayer); scene.addLayer(dotLayer);
dotBgLayer.on("click", (e) => { dotBgLayer.on("click", (e) => {
@ -567,7 +568,7 @@ export default {
}); });
dotLayer2 = new PointLayer({ dotLayer2 = new PointLayer({
zIndex: 31, zIndex: 30,
}) })
.source(dotData) .source(dotData)
.shape("categoryKey", (k) => k + "2") .shape("categoryKey", (k) => k + "2")

4
src/views/modules/visual/command/index.vue

@ -334,7 +334,7 @@ export default {
yjdw: require("@/assets/img/shuju/command/ico/yjdw.png"), yjdw: require("@/assets/img/shuju/command/ico/yjdw.png"),
sr_gy: require("@/assets/img/shuju/command/ico/sr_gy.png"), sr_gy: require("@/assets/img/shuju/command/ico/sr_gy.png"),
sr_gc: require("@/assets/img/shuju/command/ico/sr_gc.png"), sr_gc: require("@/assets/img/shuju/grid/sr_gc.png"),
whdw: require("@/assets/img/shuju/command/ico/whdw.png"), whdw: require("@/assets/img/shuju/command/ico/whdw.png"),
sr_ggld: require("@/assets/img/shuju/command/ico/sr_ggld.png"), sr_ggld: require("@/assets/img/shuju/command/ico/sr_ggld.png"),
lwh: require("@/assets/img/shuju/command/ico/lwh.png"), lwh: require("@/assets/img/shuju/command/ico/lwh.png"),
@ -424,7 +424,7 @@ export default {
IS_DB: require("@/assets/img/shuju/command/ico3/IS_DB.png"), IS_DB: require("@/assets/img/shuju/command/ico3/IS_DB.png"),
IS_MB: require("@/assets/img/shuju/command/ico3/IS_MB.png"), IS_MB: require("@/assets/img/shuju/command/ico3/IS_MB.png"),
anzhibangjiao: require("@/assets/img/shuju/command/ico3/anzhibangjiao.png"), anzhibangjiao: require("@/assets/img/shuju/command/ico3/anzhibangjiao.png"),
IS_KC: require("@/assets/img/shuju/command/ico3/IS_KC.png"), IS_KC: require("@/assets/img/shuju/grid/IS_KC.png"),
IS_XFRY: require("@/assets/img/shuju/command/ico3/IS_XFRY.png"), IS_XFRY: require("@/assets/img/shuju/command/ico3/IS_XFRY.png"),
IS_SD: require("@/assets/img/shuju/command/ico3/IS_SD.png"), IS_SD: require("@/assets/img/shuju/command/ico3/IS_SD.png"),
IS_SN: require("@/assets/img/shuju/command/ico3/IS_SN.png"), IS_SN: require("@/assets/img/shuju/command/ico3/IS_SN.png"),

Loading…
Cancel
Save