From 598e9622c41868740efa04cce4b2f68320235342 Mon Sep 17 00:00:00 2001 From: lxz Date: Tue, 9 Jan 2024 18:33:44 +0800 Subject: [PATCH] test --- package-lock.json | 11 + package.json | 6 +- src/App.vue | 33 +- src/api.js | 5 +- src/common/EventBus.js | 2 + src/common/push.js | 751 ++++++++++++++++++++++++++ src/components/Header.vue | 10 +- src/components/areaList.vue | 2 +- src/components/areaMap.vue | 117 ++-- src/components/farmerMap.vue | 8 +- src/components/index/centerBottom.vue | 42 +- src/components/index/leftBottom.vue | 1 - src/components/index/leftTop.vue | 44 +- src/components/index/rightBottom.vue | 84 +++ src/store/index.js | 6 +- src/view/home.vue | 109 +--- static/jsonData/gulin_geo.js | 52 ++ static/jsonData/hejiang_geo.js | 55 ++ static/jsonData/jiangyang_geo.js | 47 ++ static/jsonData/longmatan_geo.js | 41 ++ static/jsonData/luxian_geo.js | 64 ++- static/jsonData/naxi_geo.js | 43 ++ static/jsonData/xuantan.js | 80 --- static/jsonData/xuyong_geo.js | 47 +- yarn.lock | 5 + 25 files changed, 1386 insertions(+), 279 deletions(-) create mode 100644 src/common/EventBus.js create mode 100644 src/common/push.js create mode 100644 src/components/index/rightBottom.vue create mode 100644 static/jsonData/gulin_geo.js create mode 100644 static/jsonData/hejiang_geo.js create mode 100644 static/jsonData/jiangyang_geo.js create mode 100644 static/jsonData/longmatan_geo.js create mode 100644 static/jsonData/naxi_geo.js delete mode 100644 static/jsonData/xuantan.js diff --git a/package-lock.json b/package-lock.json index e3a2759..23bb3d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "echarts": "^5.4.3", "echarts-gl": "^2.0.9", "flv.js": "^1.6.2", + "mitt": "^3.0.1", "pinia": "^2.1.7", "postcss-pxtorem": "^5.1.1", "vue": "^3.3.8", @@ -1635,6 +1636,11 @@ "node": ">= 0.6" } }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "node_modules/nanoid": { "version": "3.3.7", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz", @@ -3404,6 +3410,11 @@ "mime-db": "1.52.0" } }, + "mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "nanoid": { "version": "3.3.7", "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz", diff --git a/package.json b/package.json index 573165f..6f1fc45 100644 --- a/package.json +++ b/package.json @@ -16,11 +16,11 @@ "echarts": "^5.4.3", "echarts-gl": "^2.0.9", "flv.js": "^1.6.2", + "mitt": "^3.0.1", + "pinia": "^2.1.7", "postcss-pxtorem": "^5.1.1", "vue": "^3.3.8", - "vue-router": "^4.2.5", - "pinia": "^2.1.7" - + "vue-router": "^4.2.5" }, "devDependencies": { "@vitejs/plugin-vue": "^4.5.0", diff --git a/src/App.vue b/src/App.vue index d637296..e598b15 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,25 +1,40 @@ diff --git a/src/api.js b/src/api.js index 5ee308c..efd5922 100644 --- a/src/api.js +++ b/src/api.js @@ -5,6 +5,7 @@ import axios from "axios"; // 创建axios 实例 const instacne = axios.create({ + // baseURL:"http://192.168.1.10:8686", // baseURL: "http://ceshi-suyuan.lihaink.cn/", baseURL: "https://suyuan.lihaink.cn/", @@ -77,6 +78,8 @@ export function deviceCountLandApi(params) { export function centralCountApi(params) { return instacne.get('/api/dataview.land/centralCount', { params }) } - +export function townsCenter(params) { + return instacne.get('/common/geo/towns', { params }) +} // /api/dataview.land/centralCount?areaCode=510521&streetCode=510521100 // /api/dataview.land/deviceCount?areaCode=510521&streetCode=510521100&land_id=18 \ No newline at end of file diff --git a/src/common/EventBus.js b/src/common/EventBus.js new file mode 100644 index 0000000..69f267a --- /dev/null +++ b/src/common/EventBus.js @@ -0,0 +1,2 @@ +import mitt from 'mitt' +export const globalEventBus = mitt() diff --git a/src/common/push.js b/src/common/push.js new file mode 100644 index 0000000..78271ad --- /dev/null +++ b/src/common/push.js @@ -0,0 +1,751 @@ + + +export const Push = function Push(options) { + this.doNotConnect = 0; + options = options || {}; + options.heartbeat = options.heartbeat || 25000; + options.pingTimeout = options.pingTimeout || 10000; + this.config = options; + this.uid = 0; + this.channels = {}; + this.connection = null; + this.pingTimeoutTimer = 0; + Push.instances.push(this); + this.createConnection(); +} + +Push.prototype.checkoutPing = function() { + var _this = this; + _this.checkoutPingTimer && clearTimeout(_this.checkoutPingTimer); + _this.checkoutPingTimer = setTimeout(function () { + _this.checkoutPingTimer = 0; + if (_this.connection.state === 'connected') { + _this.connection.send('{"event":"pusher:ping","data":{}}'); + if (_this.pingTimeoutTimer) { + clearTimeout(_this.pingTimeoutTimer); + _this.pingTimeoutTimer = 0; + } + _this.pingTimeoutTimer = setTimeout(function () { + _this.connection.closeAndClean(); + if (!_this.connection.doNotConnect) { + _this.connection.waitReconnect(); + } + }, _this.config.pingTimeout); + } + }, this.config.heartbeat); +}; + +Push.prototype.channel = function (name) { + return this.channels.find(name); +}; +Push.prototype.allChannels = function () { + return this.channels.all(); +}; +Push.prototype.createConnection = function () { + if (this.connection) { + throw Error('Connection already exist'); + } + var _this = this; + var url = this.config.url; + function updateSubscribed () { + for (var i in _this.channels) { + _this.channels[i].subscribed = false; + } + } + this.connection = new Connection({ + url: url, + app_key: this.config.app_key, + onOpen: function () { + _this.connection.state ='connecting'; + _this.checkoutPing(); + }, + onMessage: function(params) { + if(_this.pingTimeoutTimer) { + clearTimeout(_this.pingTimeoutTimer); + _this.pingTimeoutTimer = 0; + } + + params = JSON.parse(params.data); + var event = params.event; + var channel_name = params.channel; + + if (event === 'pusher:pong') { + _this.checkoutPing(); + return; + } + if (event === 'pusher:error') { + throw Error(params.data.message); + } + var data = JSON.parse(params.data), channel; + if (event === 'pusher_internal:subscription_succeeded') { + channel = _this.channels[channel_name]; + channel.subscribed = true; + channel.processQueue(); + channel.emit('pusher:subscription_succeeded'); + return; + } + if (event === 'pusher:connection_established') { + _this.connection.socket_id = data.socket_id; + _this.connection.updateNetworkState('connected'); + _this.subscribeAll(); + } + if (event.indexOf('pusher_internal') !== -1) { + console.log("Event '"+event+"' not implement"); + return; + } + channel = _this.channels[channel_name]; + if (channel) { + channel.emit(event, data); + } + }, + onClose: function () { + updateSubscribed(); + }, + onError: function () { + updateSubscribed(); + } + }); +}; +Push.prototype.disconnect = function () { + this.connection.doNotConnect = 1; + this.connection.close(); +}; + +Push.prototype.subscribeAll = function () { + if (this.connection.state !== 'connected') { + return; + } + for (var channel_name in this.channels) { + //this.connection.send(JSON.stringify({event:"pusher:subscribe", data:{channel:channel_name}})); + this.channels[channel_name].processSubscribe(); + } +}; + +Push.prototype.unsubscribe = function (channel_name) { + if (this.channels[channel_name]) { + delete this.channels[channel_name]; + if (this.connection.state === 'connected') { + this.connection.send(JSON.stringify({event:"pusher:unsubscribe", data:{channel:channel_name}})); + } + } +}; +Push.prototype.unsubscribeAll = function () { + var channels = Object.keys(this.channels); + if (channels.length) { + if (this.connection.state === 'connected') { + for (var channel_name in this.channels) { + this.unsubscribe(channel_name); + } + } + } + this.channels = {}; +}; +Push.prototype.subscribe = function (channel_name) { + if (this.channels[channel_name]) { + return this.channels[channel_name]; + } + if (channel_name.indexOf('private-') === 0) { + return createPrivateChannel(channel_name, this); + } + if (channel_name.indexOf('presence-') === 0) { + return createPresenceChannel(channel_name, this); + } + return createChannel(channel_name, this); +}; +Push.instances = []; + +function createChannel(channel_name, push) +{ + var channel = new Channel(push.connection, channel_name); + push.channels[channel_name] = channel; + channel.subscribeCb = function () { + push.connection.send(JSON.stringify({event:"pusher:subscribe", data:{channel:channel_name}})); + } + channel.processSubscribe(); + return channel; +} + +function createPrivateChannel(channel_name, push) +{ + var channel = new Channel(push.connection, channel_name); + push.channels[channel_name] = channel; + channel.subscribeCb = function () { + __ajax({ + url: push.config.auth, + type: 'POST', + data: {channel_name: channel_name, socket_id: push.connection.socket_id}, + success: function (data) { + data = JSON.parse(data); + data.channel = channel_name; + push.connection.send(JSON.stringify({event:"pusher:subscribe", data:data})); + }, + error: function (e) { + throw Error(e); + } + }); + }; + channel.processSubscribe(); + return channel; +} + +function createPresenceChannel(channel_name, push) +{ + return createPrivateChannel(channel_name, push); +} + +/*window.addEventListener('online', function(){ + var con; + for (var i in Push.instances) { + con = Push.instances[i].connection; + con.reconnectInterval = 1; + if (con.state === 'connecting') { + con.connect(); + } + } +});*/ + + +function Connection(options) { + this.dispatcher = new Dispatcher(); + __extends(this, this.dispatcher); + var properies = ['on', 'off', 'emit']; + for (var i in properies) { + this[properies[i]] = this.dispatcher[properies[i]]; + } + this.options = options; + this.state = 'initialized'; //initialized connecting connected disconnected + this.doNotConnect = 0; + this.reconnectInterval = 1; + this.connection = null; + this.reconnectTimer = 0; + this.connect(); +} + +Connection.prototype.updateNetworkState = function(state){ + var old_state = this.state; + this.state = state; + if (old_state !== state) { + this.emit('state_change', { previous: old_state, current: state }); + } +}; + +Connection.prototype.connect = function () { + this.doNotConnect = 0; + if (this.state === 'connected') { + console.log('networkState is "' + this.state + '" and do not need connect'); + return; + } + if (this.reconnectTimer) { + clearTimeout(this.reconnectTimer); + this.reconnectTimer = 0; + } + + this.closeAndClean(); + + var options = this.options; + var websocket = new WebSocket(options.url+'/app/'+options.app_key); + + this.updateNetworkState('connecting'); + + var _this = this; + websocket.onopen = function (res) { + _this.reconnectInterval = 1; + if (_this.doNotConnect) { + _this.updateNetworkState('disconnected'); + websocket.close(); + return; + } + if (options.onOpen) { + options.onOpen(res); + } + }; + + if (options.onMessage) { + websocket.onmessage = options.onMessage; + } + + websocket.onclose = function (res) { + websocket.onmessage = websocket.onopen = websocket.onclose = websocket.onerror = null; + _this.updateNetworkState('disconnected'); + if (!_this.doNotConnect) { + _this.waitReconnect(); + } + if (options.onClose) { + options.onClose(res); + } + }; + + websocket.onerror = function (res) { + _this.close(); + if (!_this.doNotConnect) { + _this.waitReconnect(); + } + if (options.onError) { + options.onError(res); + } + }; + this.connection = websocket; +} + +Connection.prototype.closeAndClean = function () { + if(this.connection) { + var websocket = this.connection; + websocket.onmessage = websocket.onopen = websocket.onclose = websocket.onerror = null; + try { + websocket.close(); + } catch (e) {} + this.updateNetworkState('disconnected'); + } +}; + +Connection.prototype.waitReconnect = function () { + if (this.state === 'connected' || this.state === 'connecting') { + return; + } + if (!this.doNotConnect) { + this.updateNetworkState('connecting'); + var _this = this; + if (this.reconnectTimer) { + clearTimeout(this.reconnectTimer); + } + this.reconnectTimer = setTimeout(function(){ + _this.connect(); + }, this.reconnectInterval); + if (this.reconnectInterval < 1000) { + this.reconnectInterval = 1000; + } else { + // 每次重连间隔增大一倍 + this.reconnectInterval = this.reconnectInterval * 2; + } + // 有网络的状态下，重连间隔最大2秒 + if (this.reconnectInterval > 2000 && navigator.onLine) { + _this.reconnectInterval = 2000; + } + } +} + +Connection.prototype.send = function(data) { + if (this.state !== 'connected') { + console.trace('networkState is "' + this.state + '", can not send ' + data); + return; + } + this.connection.send(data); +} + +Connection.prototype.close = function(){ + this.updateNetworkState('disconnected'); + this.connection.close(); +} + +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) {d[p] = b[p];} + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; + +function Channel(connection, channel_name) { + this.subscribed = false; + this.dispatcher = new Dispatcher(); + this.connection = connection; + this.channelName = channel_name; + this.subscribeCb = null; + this.queue = []; + __extends(this, this.dispatcher); + var properies = ['on', 'off', 'emit']; + for (var i in properies) { + this[properies[i]] = this.dispatcher[properies[i]]; + } +} + +Channel.prototype.processSubscribe = function () { + if (this.connection.state !== 'connected') { + return; + } + this.subscribeCb(); +}; + +Channel.prototype.processQueue = function () { + if (this.connection.state !== 'connected' || !this.subscribed) { + return; + } + for (var i in this.queue) { + this.queue[i](); + } + this.queue = []; +}; + +Channel.prototype.trigger = function (event, data) { + if (event.indexOf('client-') !== 0) { + throw new Error("Event '" + event + "' should start with 'client-'"); + } + var _this = this; + this.queue.push(function () { + _this.connection.send(JSON.stringify({ event: event, data: data, channel: _this.channelName })); + }); + this.processQueue(); +}; + +//////////////// +var Collections = (function () { + var exports = {}; + function extend(target) { + var sources = []; + for (var _i = 1; _i < arguments.length; _i++) { + sources[_i - 1] = arguments[_i]; + } + for (var i = 0; i < sources.length; i++) { + var extensions = sources[i]; + for (var property in extensions) { + if (extensions[property] && extensions[property].constructor && + extensions[property].constructor === Object) { + target[property] = extend(target[property] || {}, extensions[property]); + } + else { + target[property] = extensions[property]; + } + } + } + return target; + } + + exports.extend = extend; + function stringify() { + var m = ["Push"]; + for (var i = 0; i < arguments.length; i++) { + if (typeof arguments[i] === "string") { + m.push(arguments[i]); + } + else { + m.push(safeJSONStringify(arguments[i])); + } + } + return m.join(" : "); + } + + exports.stringify = stringify; + function arrayIndexOf(array, item) { + var nativeIndexOf = Array.prototype.indexOf; + if (array === null) { + return -1; + } + if (nativeIndexOf && array.indexOf === nativeIndexOf) { + return array.indexOf(item); + } + for (var i = 0, l = array.length; i < l; i++) { + if (array[i] === item) { + return i; + } + } + return -1; + } + + exports.arrayIndexOf = arrayIndexOf; + function objectApply(object, f) { + for (var key in object) { + if (Object.prototype.hasOwnProperty.call(object, key)) { + f(object[key], key, object); + } + } + } + + exports.objectApply = objectApply; + function keys(object) { + var keys = []; + objectApply(object, function (_, key) { + keys.push(key); + }); + return keys; + } + + exports.keys = keys; + function values(object) { + var values = []; + objectApply(object, function (value) { + values.push(value); + }); + return values; + } + + exports.values = values; + function apply(array, f, context) { + for (var i = 0; i < array.length; i++) { + f.call(context || (window), array[i], i, array); + } + } + + exports.apply = apply; + function map(array, f) { + var result = []; + for (var i = 0; i < array.length; i++) { + result.push(f(array[i], i, array, result)); + } + return result; + } + + exports.map = map; + function mapObject(object, f) { + var result = {}; + objectApply(object, function (value, key) { + result[key] = f(value); + }); + return result; + } + + exports.mapObject = mapObject; + function filter(array, test) { + test = test || function (value) { + return !!value; + }; + var result = []; + for (var i = 0; i < array.length; i++) { + if (test(array[i], i, array, result)) { + result.push(array[i]); + } + } + return result; + } + + exports.filter = filter; + function filterObject(object, test) { + var result = {}; + objectApply(object, function (value, key) { + if ((test && test(value, key, object, result)) || Boolean(value)) { + result[key] = value; + } + }); + return result; + } + + exports.filterObject = filterObject; + function flatten(object) { + var result = []; + objectApply(object, function (value, key) { + result.push([key, value]); + }); + return result; + } + + exports.flatten = flatten; + function any(array, test) { + for (var i = 0; i < array.length; i++) { + if (test(array[i], i, array)) { + return true; + } + } + return false; + } + + exports.any = any; + function all(array, test) { + for (var i = 0; i < array.length; i++) { + if (!test(array[i], i, array)) { + return false; + } + } + return true; + } + + exports.all = all; + function encodeParamsObject(data) { + return mapObject(data, function (value) { + if (typeof value === "object") { + value = safeJSONStringify(value); + } + return encodeURIComponent(base64_1["default"](value.toString())); + }); + } + + exports.encodeParamsObject = encodeParamsObject; + function buildQueryString(data) { + var params = filterObject(data, function (value) { + return value !== undefined; + }); + return map(flatten(encodeParamsObject(params)), util_1["default"].method("join", "=")).join("&"); + } + + exports.buildQueryString = buildQueryString; + function decycleObject(object) { + var objects = [], paths = []; + return (function derez(value, path) { + var i, name, nu; + switch (typeof value) { + case 'object': + if (!value) { + return null; + } + for (i = 0; i < objects.length; i += 1) { + if (objects[i] === value) { + return {$ref: paths[i]}; + } + } + objects.push(value); + paths.push(path); + if (Object.prototype.toString.apply(value) === '[object Array]') { + nu = []; + for (i = 0; i < value.length; i += 1) { + nu[i] = derez(value[i], path + '[' + i + ']'); + } + } + else { + nu = {}; + for (name in value) { + if (Object.prototype.hasOwnProperty.call(value, name)) { + nu[name] = derez(value[name], path + '[' + JSON.stringify(name) + ']'); + } + } + } + return nu; + case 'number': + case 'string': + case 'boolean': + return value; + } + }(object, '$')); + } + + exports.decycleObject = decycleObject; + function safeJSONStringify(source) { + try { + return JSON.stringify(source); + } + catch (e) { + return JSON.stringify(decycleObject(source)); + } + } + + exports.safeJSONStringify = safeJSONStringify; + return exports; +})(); + +var Dispatcher = (function () { + function Dispatcher(failThrough) { + this.callbacks = new CallbackRegistry(); + this.global_callbacks = []; + this.failThrough = failThrough; + } + Dispatcher.prototype.on = function (eventName, callback, context) { + this.callbacks.add(eventName, callback, context); + return this; + }; + Dispatcher.prototype.on_global = function (callback) { + this.global_callbacks.push(callback); + return this; + }; + Dispatcher.prototype.off = function (eventName, callback, context) { + this.callbacks.remove(eventName, callback, context); + return this; + }; + Dispatcher.prototype.emit = function (eventName, data) { + var i; + for (i = 0; i < this.global_callbacks.length; i++) { + this.global_callbacks[i](eventName, data); + } + var callbacks = this.callbacks.get(eventName); + if (callbacks && callbacks.length > 0) { + for (i = 0; i < callbacks.length; i++) { + callbacks[i].fn.call(callbacks[i].context || (window), data); + } + } + else if (this.failThrough) { + this.failThrough(eventName, data); + } + return this; + }; + return Dispatcher; +}()); + +var CallbackRegistry = (function () { + function CallbackRegistry() { + this._callbacks = {}; + } + CallbackRegistry.prototype.get = function (name) { + return this._callbacks[prefix(name)]; + }; + CallbackRegistry.prototype.add = function (name, callback, context) { + var prefixedEventName = prefix(name); + this._callbacks[prefixedEventName] = this._callbacks[prefixedEventName] || []; + this._callbacks[prefixedEventName].push({ + fn: callback, + context: context + }); + }; + CallbackRegistry.prototype.remove = function (name, callback, context) { + if (!name && !callback && !context) { + this._callbacks = {}; + return; + } + var names = name ? [prefix(name)] : Collections.keys(this._callbacks); + if (callback || context) { + this.removeCallback(names, callback, context); + } + else { + this.removeAllCallbacks(names); + } + }; + CallbackRegistry.prototype.removeCallback = function (names, callback, context) { + Collections.apply(names, function (name) { + this._callbacks[name] = Collections.filter(this._callbacks[name] || [], function (oning) { + return (callback && callback !== oning.fn) || + (context && context !== oning.context); + }); + if (this._callbacks[name].length === 0) { + delete this._callbacks[name]; + } + }, this); + }; + CallbackRegistry.prototype.removeAllCallbacks = function (names) { + Collections.apply(names, function (name) { + delete this._callbacks[name]; + }, this); + }; + return CallbackRegistry; +}()); +function prefix(name) { + return "_" + name; +} + +function __ajax(options){ + options=options||{}; + options.type=(options.type||'GET').toUpperCase(); + options.dataType=options.dataType||'json'; + params=formatParams(options.data); + + var xhr; + if(window.XMLHttpRequest){ + xhr=new XMLHttpRequest(); + }else{ + xhr=ActiveXObject('Microsoft.XMLHTTP'); + } + + xhr.onreadystatechange=function(){ + if(xhr.readyState === 4){ + var status=xhr.status; + if(status>=200 && status<300){ + options.success&&options.success(xhr.responseText,xhr.responseXML); + }else{ + options.error&&options.error(status); + } + } + } + + if(options.type==='GET'){ + xhr.open('GET',options.url+'?'+params,true); + xhr.send(null); + }else if(options.type==='POST'){ + xhr.open('POST',options.url,true); + xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); + xhr.send(params); + } +} + +function formatParams(data){ + var arr=[]; + for(var name in data){ + arr.push(encodeURIComponent(name)+'='+encodeURIComponent(data[name])); + } + return arr.join('&'); +} + +// export const push = { +// a:6 +// } \ No newline at end of file diff --git a/src/components/Header.vue b/src/components/Header.vue index 41d2db5..64f3b46 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -5,9 +5,9 @@
{{ area|| '泸县' }} + :src="u('DW')" alt=""> {{ areaStore.userInfo.name|| '泸县' }}
- +
@@ -35,6 +35,12 @@ import { ref, reactive, onMounted, watch } from "vue" import areaList from "./areaList.vue"; import { useRouter, useRoute } from 'vue-router' +import { areaObj } from "@/store/index.js" + +const areaStore = areaObj() + + + const u = (name) => { return `/static/index/${name}.png` } diff --git a/src/components/areaList.vue b/src/components/areaList.vue index c5fc531..adeae7c 100644 --- a/src/components/areaList.vue +++ b/src/components/areaList.vue @@ -40,7 +40,7 @@ const choseTownFn = (item) => { // router.replace('/townDetail?id=' + id) } -axios.get(`https://crmeb-test.shop.lihaink.cn/api/city/get_street?area_code=${510521}`) +axios.get(`https://crmeb-test.shop.lihaink.cn/api/city/get_street?area_code=${userInfoStore.userInfo.areaCode}`) .then(function (response) { userInfoStore.changeareaCodeList(response.data.data) diff --git a/src/components/areaMap.vue b/src/components/areaMap.vue index 5a0be34..bca3da0 100644 --- a/src/components/areaMap.vue +++ b/src/components/areaMap.vue @@ -36,16 +36,26 @@ \ No newline at end of file diff --git a/src/components/farmerMap.vue b/src/components/farmerMap.vue index f4bba1a..3d360e1 100644 --- a/src/components/farmerMap.vue +++ b/src/components/farmerMap.vue @@ -35,12 +35,18 @@ import { ref, onMounted, defineEmits } from "vue" import * as echarts from 'echarts'; import "echarts-gl" -import geoJson from "/static/jsonData/luxian_geo.js" +import geoJsonLuxian from "/static/jsonData/luxian_geo.js" +// import geoJson from "/static/jsonData/luxian_geo.js" import { useRoute } from "vue-router" import { areaObj } from "@/store/index.js" import { landListApi } from "@/api.js" const icon = "https:\/\/ceshi-worker-task.lihaink.cn\/uploads\/images\/20231204\/202312041608529c9e21252.png" + +let geoJson = geoJsonLuxian + + + const emit = defineEmits(['changeLand']) const pointerFn2 = (lists) => { let list = [] diff --git a/src/components/index/centerBottom.vue b/src/components/index/centerBottom.vue index 088751d..2e1e81a 100644 --- a/src/components/index/centerBottom.vue +++ b/src/components/index/centerBottom.vue @@ -3,23 +3,28 @@ \ No newline at end of file diff --git a/src/components/index/leftBottom.vue b/src/components/index/leftBottom.vue index e1522cb..b537f3d 100644 --- a/src/components/index/leftBottom.vue +++ b/src/components/index/leftBottom.vue @@ -53,7 +53,6 @@ plantProductCountApi( correctionListFn(res.data.list).forEach(item => { -console.log(item) config2.data.push( [item[0].kind, ``,item[1]? item[1].kind:'', item[1]? ``:""] diff --git a/src/components/index/leftTop.vue b/src/components/index/leftTop.vue index f83c914..67c518e 100644 --- a/src/components/index/leftTop.vue +++ b/src/components/index/leftTop.vue @@ -1,26 +1,29 @@ \ No newline at end of file diff --git a/src/components/index/rightBottom.vue b/src/components/index/rightBottom.vue new file mode 100644 index 0000000..301a543 --- /dev/null +++ b/src/components/index/rightBottom.vue @@ -0,0 +1,84 @@ + + \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 9293dce..8dd538f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,6 +7,7 @@ export const areaObj = defineStore('counter', { userInfo: { areaCode:'', streetCode:'', + name:"" }, areaCodeList:[], @@ -19,9 +20,10 @@ export const areaObj = defineStore('counter', { }), getters: {}, actions: { - changeUserInfoFn(areaCode,streetCode='') { + changeUserInfoFn(areaCode,streetCode='',name) { this.userInfo.areaCode = areaCode - this.userInfo.streetCode = streetCode||'' + this.userInfo.streetCode = streetCode||'', + this.userInfo.name= name }, changeAddress(c,a){ this.address.city=c diff --git a/src/view/home.vue b/src/view/home.vue index 736ad8d..79337e1 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -2,13 +2,13 @@
- +
- +
- +
@@ -32,77 +32,43 @@
- +
- +
-
-
-
-
{{ - item.title }}
-
-
-
-
实时监测影像
- - - - - -
- - -
-
+
+ +