dcim-topology2d 1.1.6 → 2.0.5

package/core/src/common.js

@@ -4,14 +4,19 @@ import {AnimateLayer} from './animateLayer';
 import {RenderLayer} from './renderLayer';
 import {Offscreen} from './offscreen';
 import {Line, Node, Point} from './models';
-import {setConfItemNode, setStatisticalData} from './healps';
-import {s8, formatPadding, getRect, setInitNodeDataValidat, setDefaultNodeValidat} from './utils';
-import { useStore, clearStore, syncMqttData } from './store'
-import {POLL} from './poll';
-import axios from 'axios';
+import {
+    s8,
+    formatPadding,
+    getRect,
+    setInitNodeDataValidat,
+    setDefaultNodeValidat,
+    setConnectionTagForConf,
+    setInitConfData,
+    getParams,
+} from './utils';
+import {useStore, clearStore, commonStore} from './store'
 import * as mqtt from './mqtt.min';
-import { destroyEcharts } from "../../static";
-
+import {setElementSwitchTabState} from './element';
 var MoveInType;
 (function (MoveInType) {
     MoveInType[MoveInType["None"] = 0] = "None";
@@ -29,7 +34,6 @@ var Common = /** @class */ (function () {
     function Common(parent, options) {
         var _this = this;
         _this.moveInType = MoveInType;
-        this.mqttDataSouse = axios.CancelToken.source();
         this.mouseDown = null;
         this.renderTimer = 0;
         this.lastRender = 0;
@@ -85,7 +89,6 @@ var Common = /** @class */ (function () {
                     _this.offscreen.render();
                     break;
             }
-            _this.divLayer.playNext(e.data.nextAnimate);
             _this.dispatch('animateEnd', e);
         });
         this.subcribeTableData = Store.subscribe('SYNC:tableData', function (data) {
@@ -113,7 +116,6 @@ var Common = /** @class */ (function () {
             }
         };
         this.openCount = 0;
-        this.timmerByTopology = null;
         this.lastTranlated = {x: 0, y: 0};
         this.moveIn = {
             type: 'None',
@@ -126,17 +128,6 @@ var Common = /** @class */ (function () {
             lineControlPoint: null,
             eventNode: null
         };
-        this.initType = ''; // 初始化类型
-        this.pathRewrite = '';
-        this.initData = null; // 初始化数据
-        this.tagParams = {}; // 数据属性的集合，对应不同的事件类型
-        this.assetPoperties = {}; // 固定的资产详情的集合
-        this.isExistAssetKey = false; // 是否存在固定的资产详情
-        this.pollTime = { // 轮询的方式的定时器
-            Poll: null,
-            Poll1: null,
-            Poll2: null,
-        };
         this.tip = '';
         this.rendering = false;
         this.isFullScreen = false;
@@ -176,34 +167,101 @@ var Common = /** @class */ (function () {
         this.createMarkdownTip();
         window.topology = this;
     }
+    Common.prototype.categoryDataParams = function (data){
+        getParams(this.id, data);
+    };
+    Common.prototype.getParams = function (assetId){
+        const params = {
+            doorIds: this.store.mqttParams.doorIds,
+            tagIds: this.store.mqttParams.tagIds.join(","),
+            assetIds: this.store.mqttParams.assetIds.join(","),
+            areaIds: this.store.mqttParams.areaIds.join(","),
+            routingkey: this.store.mqttParams.routingkey,
+            echart: this.store.mqttParams.tagEcharts.join(","),
+            echartData: this.store.mqttParams.echartData
+        }
+        if (this.store.mqttParams.echartAssemblyData.length) params.echartAssemblyData = [...this.store.mqttParams.echartAssemblyData];
+        if(assetId) {
+            params.varValueIds = this.store.mqttParams.varVaule.join(",");
+        }else {
+            if(this.store.mqttParams.assetIds.length && this.store.mqttParams.varVaule.length) {
+                const assetId = this.store.mqttParams.assetIds[this.store.mqttParams.assetIds.length -1];
+                for(let va = 0; va < this.store.mqttParams.varVaule.length; va++) {
+                    this.store.mqttParams.varVaule[va] = `${assetId}_${this.store.mqttParams.varVaule[va]}`;
+                }
+                params.varValueIds = this.store.mqttParams.varVaule.join(",");
+            }else {
+                params.varVaule = this.store.mqttParams.varVaule.join(",");
+            }
+        }
+        return params;
+    };
+    // 根据图表id数据获取测点数据
+    Common.prototype.getTagIdsForEchartsIds = function (data){
+        this.store.mqttParams.echartAssemblyData = data;
+    };
+    // 根据指标地址数据获取测点数据
+    Common.prototype.getTagIdsForKpiAddrs = function (data){
+        let tagIds = [];
+        data.map((item) => {
+            tagIds.push(item.tagId);
+        });
+        this.store.mqttParams.tagIds = tagIds;
+    };
+    // 获取绑定值类型参数
+    Common.prototype.getVarValueIdsForVarData = function (data){
+        const ids = [];
+        data.map((item) => {
+            if(item.varVal) ids.push(item.assetVarIds);
+        })
+        this.store.mqttParams.varVaule = ids;
+    };
+    // 固定资产详情数据赋值
+    Common.prototype.renderForAssetPoperties = function (asset, data){
+        if(!Object.keys(asset).length) return;
+        data.map((node) => {
+            if (node.data && Array.isArray(node.data) && node.data.length) {
+                node.data.map((item) => {
+                    if (item.key === 'assetKey' && asset[item.value]) {
+                        if (['imgUrl', 'principleImg'].includes(item.value)) {
+                            node.text = '';
+                            node.image = `${this.store.mqttParams.pathRewrite}${asset[item.value]}`;
+                        } else {
+                            node.text = asset[item.value];
+                        }
+                    }
+                })
+            }
+            if (node.children && node.children.length) {
+                renderForAssetPoperties(asset, node.children);
+            }
+        });
+    };
 
-    Common.prototype.conversionData = function (obj, type) {
+    Common.prototype.conversionData = function (obj) {
         this.clear();
-        let data = JSON.parse(JSON.stringify(obj));
-        if (!data) {
-            data = {pens: []};
+        if (!obj) {
+            obj = {pens: []};
         }
+        let data = JSON.parse(JSON.stringify(obj));
         Object.assign(this.store.data, data);
         this.store.data.pens = [];
         this.openCount = 0
+        const type = this.store.options.type;
         // for old data.
         if (data.nodes) {
             for (var _i = 0, _a = data.nodes; _i < _a.length; _i++) {
-                setInitNodeDataValidat(_a[_i], this.id);
+                setInitNodeDataValidat(_a[_i], this.id, type, _i);
                 const item = new Node(_a[_i]);
                 this.store.data.pens.push(item);
-                this.store.pens[item.id] = item;
-                this.setSwitchTabData(item, _i);
-                // 初始化图表数据
-                if (item.name === 'echarts' && item.data && type !== 'mqtt') {
-                    item.data.echarts.option = setStatisticalData(item, 'def');
-                }
+                ///this.store.pens[item.id] = item;
+                setConnectionTagForConf(item);
             }
             for (var _b = 0, _c = data.lines; _b < _c.length; _b++) {
                 _c[_b].TID = this.id;
                 const item = new Line(_c[_b]);
                 this.store.data.pens.push(item);
-                this.store.pens[item.id] = item;
+                //this.store.pens[item.id] = item;
             }
         }
         // end.
@@ -211,19 +269,15 @@ var Common = /** @class */ (function () {
             for (var _d = 0, _e = data.pens; _d < _e.length; _d++) {
                 const item = _e[_d];
                 if (!item.from) {
-                    setInitNodeDataValidat(item, this.id);
+                    setInitNodeDataValidat(item, this.id, type, _d);
                     const node = new Node(item);
                     this.store.data.pens.push(node);
-                    this.store.pens[item.id] = node;
-                    this.setSwitchTabData(node, _d);
-                    // 初始化图表数据
-                    if (node.name === 'echarts' && node.data && type !== 'mqtt') {
-                        node.data.echarts.option = setStatisticalData(node, 'def');
-                    }
+                    //this.store.pens[item.id] = node;
+                    setConnectionTagForConf(node);
                 } else {
                     const linNode = new Line(item);
                     this.store.data.pens.push(linNode);
-                    this.store.pens[item.id] = linNode;
+                    //this.store.pens[item.id] = linNode;
                 }
             }
         }
@@ -235,37 +289,6 @@ var Common = /** @class */ (function () {
         this.store.parentElem.scrollLeft = 0;
         this.store.parentElem.scrollTop = 0;
     };
-    Common.prototype.setSwitchTabData = function (node, index, type) {
-        if (type) {
-            let topologyChangeData = Store.get('TCD:topologyChangeData');
-            if (topologyChangeData) {
-                const switchTabData = node.tags.find((t) => {
-                    return t.includes('switchTabType');
-                });
-                const switchTabTypeData = topologyChangeData[`${switchTabData}Data`];
-                if (switchTabTypeData) {
-                    delete switchTabTypeData[node.id];
-                    for (let switchNode of Object.values(switchTabTypeData)) {
-                        if (switchNode.tagOrder > index) switchNode.tagOrder--;
-                    }
-                }
-            }
-            return;
-        }
-        if (node.tags && node.tags.length > 0) {
-            const tagTypeData = node.tags.find((t) => {
-                return t === 'statisticType' || t.includes('switchTabType');
-            });
-            if (tagTypeData) {
-                node.tagOrder = index;
-                let topologyChangeData = Store.get('TCD:topologyChangeData');
-                if (!topologyChangeData) topologyChangeData = {};
-                if (!topologyChangeData[`${tagTypeData}Data`]) topologyChangeData[`${tagTypeData}Data`] = {};
-                topologyChangeData[`${tagTypeData}Data`][node.id] = node;
-                Store.set('TCD:topologyChangeData', topologyChangeData);
-            }
-        }
-    };
     Common.prototype.canvasResize = function (size) {
         try {
             this.canvas.resize(size);
@@ -417,117 +440,70 @@ var Common = /** @class */ (function () {
     };
     // 获取表格分页数据
     Common.prototype.getSyncTableDataFromServer = async function (data, node) {
-        const path = this.pathRewrite ? this.pathRewrite + '/user/cockpit/mqtt-echart' : '/user/cockpit/mqtt-echart';
-        const ret = await axios.post(path, data);
-        //console.log('ret.data==========', ret, ret.data)
-        const tableData = {};
-        tableData[node.id] = {loading: true};
-        Store.set('SYNC:tableData', tableData);
-        if (ret.data && ret.data.data) {
-            console.log(ret.data.data)
-            tableData[node.id] = {
-                loading: false,
-                tableBody: ret.data.data.rows,
-                total: ret.data.data.total
-            }
-            Store.set('SYNC:tableData', tableData);
-            this.render();
-        }
-        if (ret.error) {
-            console.log('获取数据失败==================')
-        } else {
-            console.log('获取数据成功==================')
-        }
-
+        // const path = this.pathRewrite ? mqttEchartApi.replace('/topo-api', this.pathRewrite): mqttEchartApi;
+        // const ret = await axios.post(path, data);
+        // //console.log('ret.data==========', ret, ret.data)
+        // const tableData = {};
+        // tableData[node.id] = {loading: true};
+        // Store.set('SYNC:tableData', tableData);
+        // if (ret.data && ret.data.data) {
+        //     console.log(ret.data.data)
+        //     tableData[node.id] = {
+        //         loading: false,
+        //         tableBody: ret.data.data.rows,
+        //         total: ret.data.data.total
+        //     }
+        //     Store.set('SYNC:tableData', tableData);
+        //     this.render();
+        // }
+        // if (ret.error) {
+        //     console.log('获取数据失败==================')
+        // } else {
+        //     console.log('获取数据成功==================')
+        // }
     };
     Common.prototype.switchStaticsCheckType = function (node, staticTypeNode) {
+        const staticType = staticTypeNode.dcimStaticForType;
+        if(!staticType || staticType === 'NONE') return;
         // 点击切换统计图统计类别
         const switchTabData = node.tags.find((t) => {
             return t.includes('switchTabType');
         }); // 获取按钮组类型
         if(!switchTabData) return;
-        const topologyChangeData = Store.get('TCD:topologyChangeData'); // 获取所有按钮组和按类型统计图组数据
+        const topologyChangeData = commonStore[node.TID].switchTabDataPool; // 获取所有按钮组和按类型统计图组数据
         const changeNode = topologyChangeData[`${switchTabData}Data`]; // 分别获取按钮组数据
+        if(!changeNode[node.id]) return;
         // 如果存在按钮组节点数据
-        if (changeNode[node.id]) {
-            for (let switchNode of Object.values(changeNode)) {
-                if (this.store.data.pens[switchNode.tagOrder]) {
-                    this.store.data.pens[switchNode.tagOrder].activeImgeIndex = switchNode.id !== node.id;
+        const tabAreaData = topologyChangeData[`${switchTabData}AreaData`];
+        for (let switchNode of Object.values(changeNode)) {
+            const penNode = this.store.data.pens[switchNode.order];
+            if(!penNode) return;
+            penNode.activeImgeIndex = switchNode.id !== node.id;
+            if(staticType === 'SH'){
+                // 对显示隐藏的功能进行交互处理
+                const areaNode = tabAreaData[switchNode.bindStaticId];
+                if(areaNode && this.store.data.pens[areaNode.order]) {
+                    const tagNode = this.store.data.pens[areaNode.order];
+                    tagNode.visible = !(switchNode.id !== node.id);
+                    setElementSwitchTabState(tagNode);
                 }
             }
         }
-        if (node.bindStaticId) {
-            const statisticTypeData = topologyChangeData.statisticTypeData;
-            if(!statisticTypeData) return;
-            const findCurentEchart = statisticTypeData[node.bindStaticId]; // 获取当前点中的节点绑定的统计图表数据
+        // 对绑定的图表进行数据处理
+        if (node.bindStaticId && ['DAY', 'WEEK', 'MONTH', 'YEAR'].includes(staticType)) {
+            const findCurentEchart = tabAreaData[node.bindStaticId]; // 获取当前点中的节点绑定的统计图表数据
             if (findCurentEchart && findCurentEchart.data.params) {
-                findCurentEchart.data.params['staticForType'] = staticTypeNode.dcimStaticForType; // 统计类型赋值
-                const mqttSyncData = Store.get('mqtt:responseData');
-                if (mqttSyncData) setConfItemNode(findCurentEchart, mqttSyncData);
+                const cn = this.store.data.pens[findCurentEchart.order];
+                cn.data.params['staticForType'] = staticType; // 统计类型赋值
+                cn.elementRendered = false;
             }
         }
+        this.store.data.dataResize = 1;
         this.render();
     };
     Common.prototype.s8 = function () {
         return s8()
     };
-    // Common.prototype.openSocket = function (url) {
-    //     this.closeSocket();
-    //     if (url || this.store.data.websocket) {
-    //         this.socket = new Socket(url || this.store.data.websocket, this.store.data);
-    //     }
-    // };
-    // Common.prototype.closeSocket = function () {
-    //     if (this.socket) {
-    //         this.socket.close();
-    //     }
-    // };
-    Common.prototype.openMqtt = function (url, options) {
-        this.closeMqtt();
-        if (url || this.store.data.mqttUrl) {
-            url = url || this.store.data.mqttUrl;
-            const mqttTopics = this.initData && this.initData.mqttTopics ? this.initData.mqttTopics : this.store.data.mqttTopics;
-            options = options || this.store.data.mqttOptions
-            let topics = mqttTopics
-            this.isEnd = false;
-            // let num = 0; // 记录推送的次数，用于判单丢失情况
-            //console.log('mqtt.connect======', url)
-            this.mqttClient = mqtt.connect(url, options);
-            var _this = this;
-            this.mqttClient.on('message', function (topic, message) {
-                //console.log('openMqtt11===================', topic, message)
-                if (!_this.store.data.pens.length || !topic || topic != _this.store.data.mqttTopics) {
-                    return;
-                }
-                if (!this.isEnd) {
-                    _this.doMqttDrow(message.toString())
-                }
-            });
-            if (topics) {
-                this.mqttClient.subscribe(topics.split(','));
-            }
-        }
-    };
-    Common.prototype.openPoll = function (message, val) {
-        if (message) {
-            this.poll = new POLL(this.store.data, message, val);
-        }
-    };
-    Common.prototype.clearInterValAll = function () {
-        clearTimeout(this.timmerByTopology);
-        this.timmerByTopology = null;
-    };
-    Common.prototype.closeMqtt = function () {
-        if (this.mqttClient) {
-            this.isEnd = true
-            this.mqttClient.end();
-        }
-    };
-    Common.prototype.closePoll = function () {
-        for (let key in this.pollTime) {
-            clearInterval(this.pollTime[key])
-        }
-    };
     Common.prototype.setNodeText = function () {
         this.inputObj.text = this.input.value;
         this.input.style.zIndex = '-1';
@@ -719,396 +695,82 @@ var Common = /** @class */ (function () {
         if (this.store.options.on) {
             this.store.options.on(event, data);
         }
-        if (event === 'node' && data.name == 'tablePagination' && this.store.options.type !== 'topology') {
-            const tableNodes = Store.get('FORM:tableData').data.tableNodes[data.paginationData.bindFromTableId];
-            const pageSize = data.paginationData.pageSize;
-            const offset = (parseInt(data.paginationData.pageNumber) - 1) * pageSize;
-            const params = {
-                id: tableNodes.id, // 表格ID
-                limit: data.paginationData.pageSize,
-                offset: offset
-            };
-            this.getSyncTableDataFromServer(params, tableNodes);
-        }
-    };
-    Common.prototype.onContent = async function (resetDCIM, data, type) {
-        //this.shareComponentData = data.shareComponent // 共享组件数据
-        if (resetDCIM) {
-            if (resetDCIM.pathRewrite != '') {
-                this.pathRewrite = resetDCIM.pathRewrite // 路径重写
-            }
-            if (resetDCIM.mqttUrl) {
-                data.mqttUrl = resetDCIM.mqttUrl
-                data.mqttOptions.username = resetDCIM.mqttUsername
-                data.mqttOptions.password = resetDCIM.mqttPassword
-            }
-        }
-        this.initType = type
-        this.initData = data
-        const canvasData = data ? data : this.store.data
-        //this.topologyDetailData = initData
-        const url = canvasData.mqttUrl
-        // if(url && url.indexOf('://') > -1){
-        this.onContentForEventType('Mqtt')
+        // 先注释掉
+        // if (event === 'node' && data.name == 'tablePagination' && this.store.options.type !== 'topology') {
+        //     const tableNodes = Store.get('FORM:tableData').data.tableNodes[data.paginationData.bindFromTableId];
+        //     const pageSize = data.paginationData.pageSize;
+        //     const offset = (parseInt(data.paginationData.pageNumber) - 1) * pageSize;
+        //     const params = {
+        //         id: tableNodes.id, // 表格ID
+        //         limit: data.paginationData.pageSize,
+        //         offset: offset
+        //     };
+        //     this.getSyncTableDataFromServer(params, tableNodes);
         // }
-        if (canvasData.pollUrl) {
-            this.onContentForEventType('Poll')
-        }
-        if (canvasData.pollUrl1) {
-            this.onContentForEventType('Poll1')
-        }
-        if (canvasData.pollUrl2) {
-            this.onContentForEventType('Poll2')
-        }
     };
-    Common.prototype.onContentForEventType = async function (eventType) {
-        // 获取属性中数据的集合
-        if (!this.initType) await this.initTagParams(eventType);
-        let tagParams = this.tagParams[eventType]
-        if (eventType === 'Mqtt') {
-            // 连接测试，MQTT
-            this.onMqttContent(tagParams)
-        } else if (eventType.indexOf('Poll') > -1) {
-            // 连接测试，轮询地址
-            this.onPollContent(tagParams, eventType)
-        }
-    };
-    Common.prototype.clearTagParams = function (eventType) {
-        this.tagParams[eventType] = {};
-        this.tagParams[eventType].tagIds = [];
-        this.tagParams[eventType].kpiAddrs = [];
-        this.tagParams[eventType].tagEcharts = [];
-        this.tagParams[eventType].assetIds = [];
-        this.tagParams[eventType].areaIds = [];
-        // this.tagParams[eventType].cockpitLayoutData = [];//统计图表组件类型ID
-        this.tagParams[eventType].echartData = [];//统计图表组件类型ID
-    };
-    Common.prototype.initTagParams = async function (eventType) {
-        this.clearTagParams(eventType)
-        const pensData = this.store.data.pens
-        let tagParams = this.getTagParams(pensData, eventType);
-        // 详情页面，即URL配置了资产id的页面
-        let assetId = this.getUrlParams('assetId')
-        // console.log('详情页面，即URL配置了资产id的页面',assetId,eventType, tagParams)
-        if (assetId && eventType === 'Mqtt') {
-            //if(assetId){
-            // 获取属性中绑定指标数据的集合
-            await this.getTagParamsForKpiAddrs(assetId, tagParams)
-            // 存在固定的资产详情，更新页面数据
-            // if(this.assetPoperties && this.isExistAssetKey === true){
-            if (this.assetPoperties) {
-                // 更新画布上固定的资产详情对应的值
-                //const canvasPens = this.pathRewrite ? canvasData.pens : this.canvas.data.pens
-                this.renderForAssetPoperties(pensData);
-            }
+    Common.prototype.onContent = function (resetDCIM, data) {
+        if(!data) data = this.store.data;
+        let connectParams =  {
+            mqttUrl: data.mqttUrl,
+            username: data.mqttOptions.username,
+            password: data.mqttOptions.password,
+            mqttTopics: data.mqttTopics,
+            clientId: s8()
+        };
+        if (resetDCIM && resetDCIM.mqttUrl) {
+            connectParams.mqttUrl = resetDCIM.mqttUrl;
+            connectParams.username = resetDCIM.mqttUsername;
+            connectParams.password = resetDCIM.mqttPassword;
         }
+        // 连接测试，MQTT
+        this.openMqtt(connectParams);
     };
-    Common.prototype.getTagParams = function (pens, eventType) {
+    Common.prototype.openMqtt = function (connectParams) {
         const _this = this;
-        pens.forEach((pen) => {
-            if (pen.children != undefined && pen.children.length > 0) {
-                _this.getTagParams(pen.children, eventType)
-            } else {
-                _this.getTagParamsChildren(pen, eventType)
-            }
-        })
-        return this.tagParams[eventType]
-    };
-    Common.prototype.getTagParamsChildren = function (pen, eventType) {
-        let tagIds = []
-        let kpiAddrs = []
-        let assetIds = []
-        let areaIds = []
-        let tagEcharts = []
-        // let cockpitLayoutData = []
-        let echartData = []
-        let isEventType = false;
-        for (var _b = 0, _c = pen.events; _b < _c.length; _b++) {
-            var event_1 = _c[_b];
-            if ((event_1.type === 3 && eventType === 'Mqtt') || (event_1.type === 4 && eventType === 'Poll')
-                    || (event_1.type === 5 && eventType === 'Poll1') || (event_1.type === 6 && eventType === 'Poll2')) {
-                isEventType = true;
-            }
+        _this.closeMqtt();
+        if(!connectParams.mqttUrl) return;
+        _this.isEnd = false;
+        const url = connectParams.mqttUrl.replace('ip', location.hostname);
+        _this.mqttClient = mqtt.connect(url, connectParams);
+        _this.mqttClient.on('message', function (topic, message) {
+            //console.log('openMqtt11===================', topic, message)
+            if (!topic || topic != connectParams.mqttTopics) return;
+            if (!this.isEnd) _this.doMqttDrow(message.toString());
+        });
+        const topics = connectParams.mqttTopics;
+        if (topics) {
+            this.mqttClient.subscribe(topics.split(','));
         }
-        if (isEventType === true) {
-            if (pen.data != undefined && this.checkType(pen.data) === 'Array' && pen.data.length > 0) {
-                pen.data.forEach((item) => {
-                    if (item.key === 'tagId') {
-                        tagIds.push(item.value)
-                    }
-                    if (item.key === 'kpiAddr') {
-                        kpiAddrs.push(item.value)
-                    }
-                    if (item.key === 'assetKey') {
-                        this.isExistAssetKey = true
-                    }
-                    if (item.key === 'assetId') {
-                        assetIds.push(item.value)
-                    }
-                    if (item.key === 'areaId') {
-                        areaIds.push(item.value)
-                    }
-                })
-            }
-                    // else if(pen.data != undefined && this.checkType(pen.data) === 'Object' && pen.tags != undefined && this.checkType(pen.tags) === 'Array' && pen.tags.length>0){
-                    //     pen.tags.forEach((item)=>{
-                    //         if( item.indexOf('echart') > -1){
-                    //             tagEcharts.push(item)
-                    //         }
-                    //     })
-            // }
-            else if (pen.data != undefined && this.checkType(pen.data) === 'Object' && this.checkType(pen.data.params) === 'Object') {
-
-                // pen.data.echarts && pen.data.echarts.option.series.length > 1 ? echartData.push(pen.data.params.id) : cockpitLayoutData.push(pen.data.params.id)
-                echartData.push(pen.data.params.id)
-
-            }
-            this.tagParams[eventType].tagIds = [...new Set(this.tagParams[eventType].tagIds.concat(tagIds))]
-            this.tagParams[eventType].kpiAddrs = [...new Set(this.tagParams[eventType].kpiAddrs.concat(kpiAddrs))]
-            this.tagParams[eventType].assetIds = [...new Set(this.tagParams[eventType].assetIds.concat(assetIds))]
-            this.tagParams[eventType].areaIds = [...new Set(this.tagParams[eventType].areaIds.concat(areaIds))]
-            this.tagParams[eventType].tagEcharts = [...new Set(this.tagParams[eventType].tagEcharts.concat(tagEcharts))]
-            // this.tagParams[eventType].cockpitLayoutData = [...new Set(this.tagParams[eventType].cockpitLayoutData.concat(cockpitLayoutData))]
-            this.tagParams[eventType].echartData = [...new Set(this.tagParams[eventType].echartData.concat(echartData))]
+    };
+    Common.prototype.closeMqtt = function () {
+        if (this.mqttClient) {
+            this.isEnd = true
+            this.mqttClient.end();
         }
     };
-    Common.prototype.getMqttData = async function (tagParams, panelData) {
-        let ret = null;
-        let data = {};
-        let path = '';
-        let assetData = null;
-        let pathRewrite = this.pathRewrite;
+    Common.prototype.doMqttDrow = function (ret) {
         let canvasData = this.store.data;
-        let mqttTopics = this.store.data.mqttTopics;
-        let tagParamsData = tagParams;
-        let detailJson = null;
-        Store.set('TIMEOUT:currentPage', `locationPath${this.s8()}`);
-        if (panelData) {
-            this.store.data.mqttTopics = mqttTopics
-            pathRewrite = panelData.pathRewrite;
-            canvasData = JSON.parse(JSON.stringify(panelData.data));
-            mqttTopics = panelData.mqttTopics;
-            if (panelData.assetId) {
-                const detailData = await this.getTagParamsForKpiAddrs(panelData.assetId, tagParams, pathRewrite);
-                if (detailData.data) {
-                    tagParamsData.tagIds = detailData.tagIds;
-                    assetData = detailData.data.asset;
-                    detailJson = detailData.data;
-                    tagParamsData.echartAssemblyData = detailJson.echartAssemblyData;
-                }
-            }
-        }
-        tagParamsData.locationPath = Store.get('TIMEOUT:currentPage');
-        if (!tagParams) {
-            data = this.theData
-            path = this.thePath
-        } else {
-            data = {
-                tagIds: tagParamsData.tagIds.join(","),
-                assetIds: tagParamsData.assetIds.join(","),
-                areaIds: tagParamsData.areaIds.join(","),
-                routingkey: mqttTopics,
-                echart: tagParamsData.tagEcharts.join(","),
-                echartData: tagParamsData.echartData
-            }
-            if (tagParamsData.echartAssemblyData) {
-                data.echartAssemblyData = tagParamsData.echartAssemblyData;
-            }
-            //const pathRewrite = panelData ? panelData.pathRewrite : this.pathRewrite
-            path = pathRewrite ? pathRewrite + '/user/cockpit/mqtt-data' : '/user/cockpit/mqtt-data'
-            this.thePath = path
-            this.theData = data
-        }
-        let drawedData = null
-        data.cancelToken = this.mqttDataSouse.token;
-        ret = await axios.post(path, data).catch(function(th) {
-            if(axios.isCancel(th)) {
-                console.log('请求取消了----', th.message);
-            } else {
-                console.log('请求失败----')
-            }
-        });
-        if (ret.data && ret.data.data) {
-            if (assetData) ret.data.data.asset = assetData;
-            drawedData = ret.data.data;
-            if(panelData) {
-                syncMqttData.data = drawedData; // 初始化调用
-                Store.set('mqtt:responseData', drawedData);
-            }else {
-                syncMqttData.data = null;
-                this.mqttDataDrawing(canvasData, drawedData);
-            }
-        }
-        this.clearInterValAll();
-        this.timmerByTopology = setTimeout(() => {
-            const locationPath = Store.get('TIMEOUT:currentPage');
-            if (locationPath === tagParamsData.locationPath) {
-                this.getMqttData(tagParamsData);
-            }
-        }, 180000); // 每3分钟定时请求，超过3分钟未收到MQTT将停止推送数据 180000
-        if (ret.error) {
-            return null;
-        } else {
-            return {
-                mqttData: drawedData,
-                // detailData: detailJson
-            }
-        }
+        ret = JSON.parse(ret);
+        //console.log('处理消息', ret)
+        this.mqttDataDrawing(canvasData.pens, ret)
     };
-    Common.prototype.mqttDataDrawing = function (data, retData, detailJson) {
-        const syncData = retData
-        //const detailData = detailJson ? detailJson.data : [];
+    Common.prototype.mqttDataDrawing = function (data, retData) {
         // console.log('收到消息', syncData)
-        Store.set('mqtt:responseData', syncData);
-        data.pens.map((item) => {
+        this.store.monitorAlarm = false;
+        data.map((item) => {
+            if(this.store.options.type === 'topology') setInitConfData(this.id, item);
+            setDefaultNodeValidat(item, retData);
             if (item.children && item.children.length) {
-                item.children.map((_item) => {
-                    setDefaultNodeValidat(_item, syncData);
-                })
-            } else {
-                setDefaultNodeValidat(item, syncData);
+                this.mqttDataDrawing(item.children, retData);
             }
-        })
+        });
         //console.log('执行完毕-----', this.store.data.pens)
         this.render();
         this.animate(true);
+        // 九所的 服务器状态监测功能中用到
+        if(this.store.options.storeSubscribe) Store.set(this.generateStoreKey('M:monitor'), this.store.monitorAlarm);
         return data
     };
-    Common.prototype.getTagParamsForKpiAddrs = async function (assetId, tagParams, apiStr) {
-        let params = {
-            assetId: assetId,
-            tagIds: tagParams.tagIds.join(","),
-            kpiAddrs: tagParams.kpiAddrs.join(","),
-            echartAssemblyIds: tagParams.echartData,
-        }
-        let pathRewrite = apiStr ? apiStr : this.pathRewrite
-        const path = pathRewrite ? pathRewrite + '/place/place_monitor/getPlaceAssetDetail' : '/place/place_monitor/getPlaceAssetDetail'
-        let ret = await axios.post(path, params);
-        // 遍历得到属性中绑定指标数据的集合
-        const tagIds = this.getTagIdsForKpiAddrs(ret.data);
-        // 详情页面，固定的资产详情的数据集合
-        this.assetPoperties = ret.asset
-
-        return {
-            data: ret.data,
-            echartAssemblyData: ret.echartAssemblyData,
-            tagIds: tagIds
-        }
-    };
-    Common.prototype.getTagIdsForKpiAddrs = function (data) {
-        let tagIds = [];
-        const delData = this.pathRewrite ? data : data.data;
-        if (delData && delData.length > 0) {
-            delData.forEach((item) => {
-                tagIds.push(item.tagId);
-            })
-            this.tagParams.detailAssetData = data;
-            this.tagParams.Mqtt.tagIds = tagIds;
-        }
-        return tagIds
-    };
-    Common.prototype.renderForAssetPoperties = function (pens) {
-        const _this = this;
-        pens.forEach((pen) => {
-            if (pen.children != undefined) {
-                _this.renderForAssetPoperties(pen.children)
-            } else {
-                _this.renderForAssetPopertiesChildren(pen)
-            }
-        })
-    };
-    Common.prototype.renderForAssetPopertiesChildren = function (pen) {
-        if (pen.data != undefined && pen.data != '' && typeof pen.data === 'object' && Array.isArray(pen.data) && pen.data.length > 0) {
-            pen.data.forEach((item) => {
-                Object.keys(this.assetPoperties).forEach(key => {
-                    if (item.key === 'assetKey') {
-                        if (item.value === key) {
-                            if (key === 'imgUrl' || key === 'principleImg') {
-                                pen.text = ''
-                                pen.image = this.pathRewrite ? this.pathRewrite + this.assetPoperties[key] : this.assetPoperties[key]
-                            } else {
-                                pen.text = this.assetPoperties[key]
-                            }
-                        }
-                    }
-                })
-            })
-        }
-    };
-    Common.prototype.onMqttContent = async function (tagParams) {
-        if (!this.initType) this.store.data.mqttTopics = 'mqtt-' + s8();
-        // 告知MQTT属性中数据的集合
-        const ret = !this.initType ? await this.getMqttData(tagParams) : this.initType;
-        if (ret) {
-            let mqttUrlStr = this.store.data.mqttUrl, mqttOption = this.store.data.mqttOptions
-            if (this.initData) {
-                const {mqttUrl, mqttOptions} = this.initData
-                mqttUrlStr = mqttUrl
-                mqttOption = mqttOptions
-            }
-            mqttOption.clientId = s8()
-            this.openMqtt(mqttUrlStr, mqttOption);
-        } else {
-            console.log('请求出错')
-        }
-    };
-    Common.prototype.onPollContent = function (tagParams, eventType) {
-        const index = eventType[4] ? eventType[4] : ''
-        // const url = 'pollUrl'+index;
-        // const second = 'pollSecond'+index;
-        const pollUrl = this.store.data['pollUrl' + index]
-        const pollSecond = this.store.data['pollSecond' + index]
-        this.onpollStop(eventType);
-        if (pollUrl && pollSecond) {
-            this.renderForPoll(tagParams, pollUrl, eventType);
-            if (pollSecond != 0) { // 轮询
-                let millisecond = parseInt(pollSecond * 1000)
-                this.pollTime[eventType] = setInterval(() => {
-                    this.renderForPoll(tagParams, pollUrl, eventType);
-                }, millisecond);
-            }
-        }
-    };
-    Common.prototype.onpollStop = function (eventType) {
-        if (this.pollTime[eventType]) {
-            clearInterval(this.pollTime[eventType])
-        }
-    };
-    Common.prototype.renderForPoll = async function (tagParams, pollUrl, eventType) {
-        let data = {
-            tagIds: tagParams.tagIds.join(","),
-            // assetIds: tagParams.assetIds.join(","),
-            // echart: tagParams.tagEcharts.join(",")
-        }
-        const _this = this
-        axios.post(pollUrl, data)
-                .then((res) => {
-                    _this.openPoll(res, eventType);
-                })
-                .catch((error) => {
-                    console.log('轮询地址，连接失败', error)
-                    _this.onpollStop(eventType);
-                });
-    };
-    Common.prototype.getUrlParams = function (name) {
-        var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')
-        var r = window.location.search.substr(1).match(reg)
-        if (r != null) return unescape(r[2])
-        return null
-    };
-    Common.prototype.checkType = function (data) {
-        return Object.prototype.toString.call(data).slice(8, -1)
-    };
-    Common.prototype.mqttLostMessage = function () {
-        // console.log('发送请求mqtt-data')
-        this.getMqttData(this.tagParams.Mqtt);
-    };
-    Common.prototype.doMqttDrow = function (ret) {
-        let canvasData = this.store.data;
-        ret = JSON.parse(ret);
-        //console.log('处理消息', ret)
-        this.mqttDataDrawing(canvasData, ret)
-    };
     Common.prototype.hidePenByTag = function (pens, val) {
         const _this = this;
         pens.forEach((pen) => {
@@ -1163,15 +825,11 @@ var Common = /** @class */ (function () {
                 }
             }
         }
-        this.render();
     };
     Common.prototype.destroyStatic = function () {
-        this.mqttDataSouse.cancel();
         this.clear('destroy');
-        this.clearInterValAll();
         //this.closeSocket();
         this.closeMqtt();
-        this.closePoll();
         cancelAnimationFrame(this.renderTimer);
         this.subcribe.unsubscribe();
         this.subcribeRender.unsubscribe();
@@ -1187,9 +845,7 @@ var Common = /** @class */ (function () {
         this.offscreen.destroy();
         this.offscreen = null;
         this.store.parentElem = null;
-        destroyEcharts();
         Store.set('form:tableData', null);
-        Store.set('TIMEOUT:currentPage', `empty${this.s8()}`);
         Store.set('FORM:tableData', {
             data: {
                 tableNodes: {},