diff --git a/src/App.vue b/src/App.vue index 15e6cba..28ca457 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,15 +7,24 @@ + + + + + + diff --git a/src/components/GdMap/mapUtil.js b/src/components/GdMap/mapUtil.js index d4ee672..3d793c0 100644 --- a/src/components/GdMap/mapUtil.js +++ b/src/components/GdMap/mapUtil.js @@ -200,20 +200,20 @@ export function MapUtil(map) { typeof data.jyqx == "string" ? JSON.parse(data.jyqx) : data.jyqx - ? data.jyqx - : []; + ? data.jyqx + : []; let txzb = typeof data.txzb == "string" ? JSON.parse(data.txzb) : data.txzb - ? data.txzb - : []; + ? data.txzb + : []; let pbcl = typeof data.pbcl == "string" ? JSON.parse(data.pbcl) : data.pbcl - ? data.pbcl - : []; + ? data.pbcl + : []; let list = []; let cl = pbcl && pbcl.length > 0 ? true : false; // 车辆 let zb = txzb && txzb.length > 0 ? true : false; // 智能装备 @@ -344,8 +344,8 @@ export function MapUtil(map) { item.count <= 10 ? 1.4 : item.count > 10 && item.count <= 50 - ? 1.6 - : 1.9; + ? 1.6 + : 1.9; let obj = { properties: { mag }, type: "Feature", @@ -449,7 +449,7 @@ export function MapUtil(map) { }); delete _that._self.gpsZb[id]; } - } catch (err) {} + } catch (err) { } } }; @@ -766,8 +766,8 @@ export function MapUtil(map) { }; /**geojson 创建边界 - * let data = { - * type: "FeatureCollection", + * let data = { + * type: "FeatureCollection", * features: [ * { geometry: { @@ -778,7 +778,7 @@ export function MapUtil(map) { }, type: "Feature", } - * ] + * ] }; */ MapUtil.prototype.createBoundarys = (res) => { diff --git a/src/components/MyComponents/ChooseUser/index.vue b/src/components/MyComponents/ChooseUser/index.vue index e5b79d3..4edb24b 100644 --- a/src/components/MyComponents/ChooseUser/index.vue +++ b/src/components/MyComponents/ChooseUser/index.vue @@ -242,7 +242,7 @@ const handleSelectionChange = (val) => { display: none; } .el-dialog{ - background: #050e33; + /* background: #050e33; */ } .el-dialog__title{ color: #fff; diff --git a/src/components/MyComponents/RichOnly/index.vue b/src/components/MyComponents/RichOnly/index.vue index f35c429..90e4567 100644 --- a/src/components/MyComponents/RichOnly/index.vue +++ b/src/components/MyComponents/RichOnly/index.vue @@ -279,7 +279,7 @@ watch( + + diff --git a/src/components/fzq/fxq.vue b/src/components/fzq/fxq.vue new file mode 100644 index 0000000..a10d5b0 --- /dev/null +++ b/src/components/fzq/fxq.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/src/components/fzq/iframe.vue b/src/components/fzq/iframe.vue new file mode 100644 index 0000000..fd1b9fe --- /dev/null +++ b/src/components/fzq/iframe.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/components/fzq/index.vue b/src/components/fzq/index.vue new file mode 100644 index 0000000..3edd707 --- /dev/null +++ b/src/components/fzq/index.vue @@ -0,0 +1,256 @@ +