.env.development

@@ -4,9 +4,7 @@ NODE_ENV = 'development'
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
 # VITE_API_URL = 'http://192.168.34.155:19111'
-# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
-# VITE_API_URL = 'http://192.168.34.221:19112' #雄哥本地
-# VITE_API_URL = 'http://192.168.34.221:28890' #雄哥本地
+VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
 # VITE_API_URL = 'http://182.90.224.237:51234'  #雄哥远程
 # VITE_API_URL = 'http://192.168.34.221:28889'
 # VITE_API_URL = 'http://121.196.214.246/api'
@@ -26,29 +24,18 @@ NODE_ENV = 'development'
 # VITE_API_URL = 'http://182.90.224.237:15551'
 # 七参数标准版(演示平台)
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
-# 包头化工
-# VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
 # agjt
 # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
 # 苏立信/重庆市南岸区
-VITE_API_URL = 'http://101.43.164.214:11111'
+# VITE_API_URL = 'http://101.43.164.214:11111'
 # 中科安信
 # VITE_API_URL = 'http://8.136.222.164:8808'
 # 中科佳成
-VITE_API_URL = 'http://1.13.185.209:8089'
+# VITE_API_URL = 'http://1.13.185.209:8089'
 # 九柱
 # VITE_API_URL = 'http://jxjzw.zhgdyun.com:11111'
-# 四川网诚
-# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
-# VITE_API_URL = 'http://jxj.zhgdyun.com:34568'
-# 九柱集团
-# VITE_API_URL = 'http://218.95.151.122:31004'
-# 包头化工
-# VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
-# 大连金笔
-# VITE_API_URL = 'http://101.43.164.214:11126'
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
 

.env.production

@@ -6,11 +6,10 @@ NODE_ENV = "production"
 # VITE_API_URL = "http://139.9.66.234:6688"
 # VITE_API_URL = "http://jxj.zhgdyun.com:6688"
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
-# VITE_API_URL = 'http://jxj.zhgdyun.com:33981'
 # 沈阳合盈线上
 # VITE_API_URL = "http://101.43.164.214:45022"
 # 嘉兴王江泾公用码头
-VITE_API_URL = "http://183.249.224.118:9003"
+# VITE_API_URL = "http://183.249.224.118:9003"
 
 # 百色  新项目通用地址
 # VITE_API_URL = 'http://101.43.164.214:11111'
@@ -29,30 +28,11 @@ VITE_API_URL = "http://183.249.224.118:9003"
 # 中科安信
 # VITE_API_URL = 'http://8.136.222.164:8808'
 # 中科佳成
-VITE_API_URL = 'http://1.13.185.209:8089'
+# VITE_API_URL = 'http://1.13.185.209:8089'
 # 合肥启程(乌丹)
 # VITE_API_URL = 'http://192.168.100.4:9809'
 # 九柱
-# VITE_API_URL = 'http://jxjzw.zhgdyun.com:11111'
-# 同济
-# VITE_API_URL = 'http://192.168.110.220:9809'
-# 四川网诚
-# VITE_API_URL = 'http://192.168.9.249:9820'
-# 九柱集团
-# VITE_API_URL = 'http://218.95.151.122:31004'
-# 包头化工
-# VITE_API_URL = 'http://jxj.zhgdyun.com:18000'
-# 大连金笔
-# VITE_API_URL = 'http://101.43.164.214:11126'
-# 新能源智慧基建管理平台|中新建电力集团(内网)
-# VITE_API_URL = 'http://10.30.102.4:9820'
-# 新能源智慧基建管理平台|中新建电力集团(外网)
-# VITE_API_URL = 'http://117.146.73.156:9820'
-# 国维科技
-# VITE_API_URL = 'http://10.216.103.99:9820'
-# 新能源智慧基建管理平台
-# VITE_API_URL = 'http://121.37.106.37:9820'
-# VITE_API_URL = 'http://121.37.106.37:9809'
+VITE_API_URL = 'http://jxjzw.zhgdyun.com:11111'
 # 打包
 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
 

.merge_file_a03828

@@ -42,6 +42,3 @@ export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
 // export const COMPANY: string = "xjnb"; // 新建宁波项目
 // export const COMPANY: string = "ahsa"; // 安徽水安项目
 // export const COMPANY: string = "zkax"; // 中科安信项目
-// export const COMPANY: string = "ztsyj"; // 中铁十一局
-// export const COMPANY: string = "allxm"; // 安立路项目
-

index.html

@@ -117,8 +117,7 @@
         }
     </script>
     <script type="module" src="/src/main.ts"></script>
-    <!-- <script src="https://webapi.amap.com/maps?v=2.0&key=8d7b8cd643454bec7737b3423647be21&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.MouseTool,AMap.Geocoder,AMap.Driving" defer="defer"></script> -->
-    <script src="/maps.js"></script>
+    <script src="https://webapi.amap.com/maps?v=2.0&key=8d7b8cd643454bec7737b3423647be21&plugin=AMap.Autocomplete,AMap.PlaceSearch,AMap.MouseTool,AMap.Geocoder,AMap.Driving" defer="defer"></script>
     <script src="/jquery-1.12.4.min.js"></script>
     <!-- 用于前端与插件交互 -->
     <script src="/jsencrypt.min.js"></script>
@@ -131,8 +130,7 @@
 			libpath="<%= BASE_URL %>lib/"
 			include="jquery,jquery.range,bootstrap,bootstrap-checkbox,font-awesome,web-icons,layer,haoutil,nprogress,toastr,admui,turf,cesium,mars3d,mars3d-widget"
 		></script> -->
-    <script src="/BimfaceSDKLoader@latest-release.js" charset="utf-8"></script>
-    <!-- <script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js" charset="utf-8"></script> -->
+    <script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js" charset="utf-8"></script>
     <script>
         // 禁用鼠标滚动事件
         document.addEventListener(

package-lock.json

@@ -14,7 +14,7 @@
 				"@element-plus/icons-vue": "^2.0.10",
 				"@vueup/vue-quill": "^1.0.0-alpha.40",
 				"@vueuse/core": "^9.12.0",
-				"@wangeditor/editor": "^5.1.23",
+				"@wangeditor/editor": "^5.1.12",
 				"@wangeditor/editor-for-vue": "^5.1.12",
 				"amfe-flexible": "^2.2.1",
 				"axios": "^1.2.1",
@@ -3963,7 +3963,7 @@
 		},
 		"node_modules/@wangeditor/editor": {
 			"version": "5.1.23",
-			"resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
+			"resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz",
 			"integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
 			"dependencies": {
 				"@uppy/core": "^2.1.1",
@@ -19422,7 +19422,7 @@
 		},
 		"@wangeditor/editor": {
 			"version": "5.1.23",
-			"resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
+			"resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz",
 			"integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
 			"requires": {
 				"@uppy/core": "^2.1.1",

package.json

@@ -26,7 +26,7 @@
 		"@element-plus/icons-vue": "^2.0.10",
 		"@vueup/vue-quill": "^1.0.0-alpha.40",
 		"@vueuse/core": "^9.12.0",
-		"@wangeditor/editor": "^5.1.23",
+		"@wangeditor/editor": "^5.1.12",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"amfe-flexible": "^2.2.1",
 		"axios": "^1.2.1",

public/BimfaceSDKLoader@latest-release.js

@@ -1,162 +0,0 @@
-! function() { "use strict"; var e = window.hostConfig || { APIHost: "https://api.bimface.com", resourceHost: "https://m.bimface.com", staticHost: "https://static.bimface.com", dataEnvType: "BIMFACE", securityApi: !0 };
-    void 0 === Object.assign && (Object.assign = function(e) { if (null == e) throw new TypeError("Cannot convert undefined or null to object"); for (var t = Object(e), o = 1; o < arguments.length; o++) { var n = arguments[o]; if (null != n)
-                for (var r in n) Object.prototype.hasOwnProperty.call(n, r) && (t[r] = n[r]) } return t }); let t = Object.freeze({ Release: "Release", Debug: "Debug" }),
-        o = Object.freeze({ Normal: "Normal", DrawingView: "drawingView" }),
-        n = Object.freeze({ BIMFACE: "BIMFACE", Local: "Local" }),
-        r = Object.freeze({ zh_CN: "zh_CN", en_GB: "en_GB", sv_SE: "sv_SE", zh_TW: "zh_TW" }),
-        a = Object.freeze({ Normal: "Normal", Bake: "Bake" });
-    window.BimfaceSDKLoaderConfig = function() { if (window.hostConfig) { for (let t in window.hostConfig) e[t] = window.hostConfig[t];
-            e.securityApi = window.hostConfig.securityApi } return { staticHost: `${e.staticHost}/api`, APIHost: e.APIHost, language: "zh_CN", viewToken: null, configuration: t.Release, dataEnvType: e.dataEnvType || "BIMFACE", viewType: o.Normal, visualStyle: a.Bake, version: "", securityApi: e.securityApi } }, window.BimfaceEnvOption = n, window.BimfaceLanguageOption = r, window.BimfaceConfigrationOption = t, window.BimfaceViewTypeOption = o; let i = function(e) { let t = e.split("/"); return t.pop(), t.join("/") + "/" }; var s = function(e, t) { for (var o = 0; o < t.length; o++) t[o] = e + t[o] },
-        c = function(e) { var t = e.sdkVersion,
-                n = e.options,
-                r = n.configuration,
-                a = [],
-                i = [`/${t}/${n.language}.js`, `/${t}/Application${r}.js`]; return a = function(e, t) { return "drawingView" == e.renderType || t.viewType == o.DrawingView }(e.metadata, e.options) ? [...a, ...i, `/${t}/Drawing.css`, `/${t}/bimface.bufferfly.js`, `/${t}/Drawing${r}.js`] : [...a, ...i, `/${t}/Bimface.css`, `/${t}/thirdparty.js`, `/${t}/lib/loaders/BimTilesLoader.js`, `/${t}/Bimface${r}.js`], a };
-    window.postProcessing = function(e) { var o = e.metadata,
-            n = e.options,
-            r = e.successCb,
-            a = c(e);
-        s(n.staticHost, a), o.databagId = `${o.databagId}`, n.path ? (o.path = n.path, o.dataPath = "./") : n.resourcePath && (o.path = n.resourcePath.replace("viewToken", "")), o.sdkPath = n.sdkPath, 0 == a.length ? r(o) : d(a, (function() { if (n.build === t.Debug && n.dataPath) { let e = n.dataPath.split("/");
-                r({ databagId: e.pop(), path: e.join("/") }) }
-            r(o) })) }; var d = function(e, o, n) { var r = e.length,
-                a = 0,
-                i = function(l) { if (l && "error" == l.message && l.element.indexOf("bimface.index") > -1) { a = 0; var f = n.options;
-                        f.build, t.Release; var h = c(n); return s(f.staticHost, h), void d(h, o) }++a == r ? o() : u(e[a], i) };
-            u(e[a], i) },
-        l = [],
-        u = function(e, t) { if (!(l.indexOf(e.split("/").pop()) > -1)) { var o, n = document.getElementsByTagName("head")[0]; return e.indexOf(".css") > -1 ? ((o = document.createElement("link")).setAttribute("href", e), o.setAttribute("rel", "stylesheet")) : (o = document.createElement("script")).setAttribute("src", e), o.url = e, n.appendChild(o), o.addEventListener("load", (function() { l.push(this.url.split("/").pop()), t && t({ message: "success" }) })), o.addEventListener("error", (function() { t && t({ element: e, message: "error" }) })), o }
-            t() };
-    window.loadResource = d;
-    class f extends class { constructor(e) { this.indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.msIndexedDB, this.indexedDB || console.log("IndexedDB not supported"), this._db = null, this._opt = e }
-        open(e, t) { const o = e || this._opt.name,
-                n = t || this._opt.version || 1,
-                r = this.indexedDB.open(o, n); return new Promise(((e, t) => { r.onsuccess = t => { this._db = r.result, e(this._db) }, r.onupgradeneeded = e => { let t = this._db = e.target.result;
-                    (this._opt.storeList || []).forEach((e => !t.objectStoreNames.contains(e) && t.createObjectStore(e))) }, r.onerror = e => { t(e) } })) }
-        getDB() { return new Promise(((e, t) => { this._db ? e(this._db) : this.open().then(e).catch(t) })) }
-        addObject(e, t, o) { return new Promise(((n, r) => { this.getDB().then((a => { const i = a.transaction(e, "readwrite");
-                    i.objectStore(e).put(t, o).onsuccess = e => { n(e.target.result) }, i.onerror = e => { r(e) } })).catch(r) })) }
-        getObject(e, t) { return new Promise(((o, n) => { this.getDB().then((r => { const a = r.transaction(e, "readonly");
-                    a.objectStore(e).get(t).onsuccess = e => { let t = e.target.result;
-                        t ? o(t) : n(e) }, a.onerror = e => { n(e) } })).catch(n) })) }
-        deleteObject(e, t) { return new Promise(((o, n) => { this.getDB().then((r => { const a = r.transaction(e, "readwrite");
-                    a.objectStore(e).delete(t).onsuccess = e => { o(e.target.result) }, a.onerror = e => { n(e) } })).catch(n) })) }
-        clearStore(e) { return new Promise(((t, o) => { this.getDB().then((n => { const r = n.transaction(e, "readwrite");
-                    r.objectStore(e).clear().onsuccess = e => { t(e.target.result) }, r.onerror = e => { o(e) } })).catch(o) })) }
-        deleteDB(e) { return new Promise((t => { this.indexedDB.deleteDatabase(e), t() })) }
-        getAllKeys(e) { return new Promise(((t, o) => { this.getDB().then((n => { const r = n.transaction(e, "readonly");
-                    r.objectStore(e).getAllKeys().onsuccess = e => t(e.target.result), r.onerror = o })).catch(o) })) }
-        getAll(e) { return new Promise(((t, o) => { this.getDB().then((n => { const r = n.transaction(e, "readonly");
-                    r.objectStore(e).getAll().onsuccess = e => t(e.target.result), r.onerror = o })).catch(o) })) } } { constructor() { super({ name: "Bf_Loader", version: 1, storeList: ["d", "t"] }) }
-        getDatabagInfo(e, t) { return new Promise(((o, n) => { t ? this.getObject("d", e).then((e => this.addTemp(e, t).then((() => o(e))).catch(n))).catch(n) : this.getObject("d", e).then(o).catch(n) })) }
-        addDatabagInfo(e, t) { return new Promise(((o, n) => { const r = e.modelId,
-                    a = () => Promise.all([this.addObject("d", e, r), this.addTemp(e, t)]).then(o).catch(n);
-                this.getDatabagInfo(r).then((t => { t.databagId !== e.databagId && this.deleteDB(`Bf_${data.databagId}`), a() })).catch((() => { a() })) })) }
-        deleteDatabagInfo(e) { return new Promise(((t, o) => { this.deleteObject("d", e).then(t).catch(o) })) }
-        addTemp(e, t) { return new Promise(((o, n) => { this.clearStore("t").then((() => { this.addObject("t", e, t).then(o).catch(n) })).catch(n) })) }
-        getTemp(e) { return new Promise(((t, o) => { this.getObject("t", e).then(t).catch(o) })) }
-        deleteStorageByModelId(e) { return new Promise((t => { this.getDatabagInfo(e).then((o => { let n = "gisView" === o.renderType ? `Bg_${o.modelId}` : `Bf_${o.databagId}`;
-                    Promise.allSettled([this.deleteDB(n), this.deleteDatabagInfo(e)]).then(t) })).catch(t) })) }
-        getStoredModelIds() { return this.getAllKeys("d") }
-        getStoredModelInfo() { return new Promise(((e, t) => { this.getAll("d").then((t => { let o = t.map((e => { let { modelId: t, name: o, renderType: n } = e; return { modelId: t, name: o, type: n } }));
-                    e(o) })).catch(t) })) } } var h = function(e, t, o) { if (e.metadata) return o(e.metadata); const r = n => { if (e.enableStorage && e.modelId) {
-                    (new f).getDatabagInfo(e.modelId, e.viewToken).then((e => o && o(e))).catch((() => { console.error("[BIMFACE ERROR]: failed get model info from storage"), t && t(n) })) } else t && t(n) }; if (!e.viewToken && "Local" !== e.dataEnvType) return void r(); const a = e.dataEnvType !== n.Local,
-                i = a && e.securityApi;! function(e) { var t, o = Object.assign({ type: "get", data: null, success: null, failure: null }, e);
-                (t = window.XMLHttpRequest ? new XMLHttpRequest : new ActiveXObject("Microsoft.XMLHTTP")).onreadystatechange = function() { if (4 == t.readyState) { var e = t.status;
-                        e >= 200 && e < 300 || 304 == e || 0 === e && "file:" === window.location.protocol ? o.success && o.success(t.responseText, t.responseXML) : o.failure && o.failure(e) } }, t.open(o.type, o.url, o.async), t.send(o.data) }({ type: i ? "post" : "get", url: a && !i ? `${e.url}?viewToken=${e.viewToken}` : e.url, async: !0, data: i ? e.data : void 0, requestHeader: e.requestHeader, success: function(t) { var n = JSON.parse(t); if ("Local" !== e.dataEnvType && "success" !== n.code) return n.message && console.error(`[BIMFACE ERROR]: ${n.message}`), void r(t); if (n = n.data || n, e.enableStorage) {
-                        (new f).addDatabagInfo(n, e.viewToken).then((() => o && o(n))).catch((() => o && o(n))) } else o && o(n) }, failure: r }) },
-        p = function(e, t, n) { h(e, n, (function(n) { var r = function(e, t) { let n, r = t.version; if (e.renderVersion, /\d+?\.\d+?\.\d+/.test(r) && r.split(".")[0] >= 3) { window.bimfaceSdkVersion = r; const [e, t, o] = r.split("."); "6" === t && Number(o) < 143 && (r = `Bimface@${r}`) } else if ("Debug" == t.build) r = "Bimface", n = "Application";
-                    else if (t.sdkPath) r = n = "bimface";
-                    else if (t.viewType == o.DrawingView && "drawingView" != e.renderType) { var a = e.subRenders; if (a && 0 != a.length)
-                            for (var i = 0; i < a.length; i++) a[i].renderType == o.DrawingView && (r = a[i].jsSDKVersion, n = a[i].jsSDKVersion) } else r = e.jsSDKVersion, n = e.jsSDKVersion; return { ui: n, sdk: r } }(n, e);
-                window.BimfaceLoaderConfig.fullStaticHost = "Local" == BimfaceLoaderConfig.dataEnvType ? e.staticHost + "/bimface" : e.staticHost + "/" + r.sdk; var a = { metadata: n, options: e, successCb: t, sdkVersion: r.sdk, uiVersion: r.ui },
-                    i = window.BimfaceLoaderConfig.fullStaticHost + "/bimface.index.js";
-                d([i], (function() { postProcessing(a) }), a) })) },
-        g = function(e, t) { var o = "bimView" == e.renderType ? "3DView" : e.renderType,
-                n = (e.subRenders, { dataEnvType: t.dataEnvType, viewToken: t.viewToken, staticHost: t.staticHost, APIHost: t.APIHost, viewType: o }); return Object.assign(n, e) },
-        w = { getStorage() { return this.storage = this.storage || new f, this.storage }, deleteStorageByModelId(e) { return this.getStorage().deleteStorageByModelId(e) }, getStoredModelIds() { return this.getStorage().getStoredModelIds() }, getStoredModelInfo() { return this.getStorage().getStoredModelInfo() }, store(e) { let { url: t, viewToken: o, storeMaterialOverride: n, successCallback: r, progressCallback: a, errorCallback: i, conditions: s, storeByQueue: c } = e; const d = c && c.enable,
-                    l = d && (c.delay || 2e3); if (!o) return;
-                t = t || [], r = r || function() {}, a = a || function() {}, i = i || function() {}; const u = new BimfaceSDKLoaderConfig;
-                u.enableStorage = !0, u.viewToken = o, BimfaceSDKLoader.load(u).then((e => { if ("3DView" == e.viewType) { const c = document.createElement("div");
-                        c.style.width = "1px", c.style.height = "1px", c.style.opacity = "0", c.style.position = "absolute", c.style.zIndex = "-1", c.style.top = "0px", c.style.left = "0px", document.body.appendChild(c); const u = new Glodon.Bimface.Viewer.Viewer3DConfig;
-                        u.domElement = c, u.enableStorage = !0, u.enableViewHouse = !1, u.enableCSMShadow = !1, u.enableSSAO = !1, u.enableLogarithmicDepthBuffer = !1; const f = new Glodon.Bimface.Viewer.Viewer3D(u),
-                            h = new Promise((t => { const r = () => { requestAnimationFrame((() => { f.destroy(), document.body.removeChild(c), t() })) }; if ("true" == e.config.toBimtiles) return f.addModel(e, null, { forceLoadBIMTiles: !0 }), f.getViewer().registerEventListener(CLOUD.EVENTS.ON_LOAD_PROGRESS, (function(e) { var t = e.progress,
-                                        o = t.loaded / t.total * 100;
-                                    a(o) })), void f.getViewer().registerEventListener(CLOUD.EVENTS.ON_MODEL_CACHE_COMPLETE, (function(e) { r() }));
-                                f.addModel(e), d || f.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.ViewLoading, (e => a(e.progress))); let i = !1;
-                                f.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded, (() => { if (i) return; const e = () => { i = !0; const e = f.getDefaultModel(),
-                                            t = e.getCloudViewer().getModelManager().getModel(e.modelId),
-                                            n = [...t._handler.layerProvider.getAllLayerIdxData().layerKeys],
-                                            s = [...t._handler.layerProvider.getLayerKeyAttributes()]; let c = 0; const d = {},
-                                            u = () => { if (a(Math.floor(100 * (c + 1) / n.length)), c === n.length) return void r();
-                                                n[c].split("-").forEach(((e, t) => d[s[t]] = e)); const e = f.getDefaultModel();
-                                                e && e.destroy(); const t = isNaN(l) ? 2e3 : Number(l);
-                                                setTimeout((() => { f.addView(o) }), t), c++ };
-                                        f.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.ModelAdded, (() => { f.showExclusiveComponentsByObjectData([d], null, u) })), u() };
-                                    n ? f.loadMaterialOverrideSet(f.getModel().modelId, o, (function() { s ? f.showExclusiveComponentsByObjectData(s, null, r) : d ? e() : (f.showAllComponents(), f.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.DemandLoaded, r)) })) : s ? f.showExclusiveComponentsByObjectData(s, null, r) : d ? e() : r() })) }));
-                        Promise.all([h, f._storeData(t)]).then(r).catch(i) } })).catch() } },
-        m = function() { return m = Object.assign || function(e) { for (var t, o = 1, n = arguments.length; o < n; o++)
-                    for (var r in t = arguments[o]) Object.prototype.hasOwnProperty.call(t, r) && (e[r] = t[r]); return e }, m.apply(this, arguments) };
-
-    function b(e, t, o, n) { return new(o || (o = Promise))((function(r, a) {
-            function i(e) { try { c(n.next(e)) } catch (e) { a(e) } }
-
-            function s(e) { try { c(n.throw(e)) } catch (e) { a(e) } }
-
-            function c(e) { var t;
-                e.done ? r(e.value) : (t = e.value, t instanceof o ? t : new o((function(e) { e(t) }))).then(i, s) }
-            c((n = n.apply(e, t || [])).next()) })) }
-
-    function v(e, t) { var o, n, r, a, i = { label: 0, sent: function() { if (1 & r[0]) throw r[1]; return r[1] }, trys: [], ops: [] }; return a = { next: s(0), throw: s(1), return: s(2) }, "function" == typeof Symbol && (a[Symbol.iterator] = function() { return this }), a;
-
-        function s(a) { return function(s) { return function(a) { if (o) throw new TypeError("Generator is already executing."); for (; i;) try { if (o = 1, n && (r = 2 & a[0] ? n.return : a[0] ? n.throw || ((r = n.return) && r.call(n), 0) : n.next) && !(r = r.call(n, a[1])).done) return r; switch (n = 0, r && (a = [2 & a[0], r.value]), a[0]) {
-                            case 0:
-                            case 1:
-                                r = a; break;
-                            case 4:
-                                return i.label++, { value: a[1], done: !1 };
-                            case 5:
-                                i.label++, n = a[1], a = [0]; continue;
-                            case 7:
-                                a = i.ops.pop(), i.trys.pop(); continue;
-                            default:
-                                if (!(r = i.trys, (r = r.length > 0 && r[r.length - 1]) || 6 !== a[0] && 2 !== a[0])) { i = 0; continue } if (3 === a[0] && (!r || a[1] > r[0] && a[1] < r[3])) { i.label = a[1]; break } if (6 === a[0] && i.label < r[1]) { i.label = r[1], r = a; break } if (r && i.label < r[2]) { i.label = r[2], i.ops.push(a); break }
-                                r[2] && i.ops.pop(), i.trys.pop(); continue }
-                        a = t.call(e, i) } catch (e) { a = [6, e], n = 0 } finally { o = r = 0 }
-                    if (5 & a[0]) throw a[1]; return { value: a[0] ? a[1] : void 0, done: !0 } }([a, s]) } } }
-    window.hostConfig = window.hostConfig || { APIHost: "https://api.bimface.com", resourceHost: "https://m.bimface.com", staticHost: "https://static.bimface.com", dataEnvType: "BIMFACE", securityApi: !0 }; var y = function() { window.hostConfig = window.hostConfig || { APIHost: "https://api.bimface.com", resourceHost: "https://m.bimface.com", staticHost: "https://static.bimface.com", dataEnvType: "BIMFACE", securityApi: !0 }; var e = m({}, window.hostConfig); return e.staticHost = window.hostConfig.staticHost + "/api", e },
-        D = function() {
-            function e(e) { this._config = e } return e.prototype.getModuleData = function(e) { var t = this; return new Promise((function(o, n) { var r;
-                    (r = { type: "post", data: e, url: t._config.APIHost + "/inside/databag" }, new Promise((function(e, t) { var o = m(m({}, { type: "get", data: null }), r),
-                            n = new XMLHttpRequest;
-                        n.onreadystatechange = function() { if (4 == n.readyState) { var o = n.status; if (o >= 200 && o < 300 || 304 == o || 0 === o && "file:" === window.location.protocol) { var r = void 0; try { r = JSON.parse(n.responseText) } catch (e) { throw e }
-                                    e({ json: r, responseText: n.responseText, responseXML: n.responseXML }) } else t(o) } }, n.open(o.type, o.url, o.async), n.send(o.data) }))).then((function(e) { e.json.data ? o(e.json.data) : n(e.json) })) })) }, e.prototype.loadScript = function(e) { return new Promise((function(t, o) { var n = document.createElement("script");
-                    n.setAttribute("src", e), n.onload = function() { t(!0) }, n.onerror = function(e) { o(e), console.error(e) }, document.getElementsByTagName("head")[0].append(n) })) }, e.prototype.loadCss = function(e) { return new Promise((function(t, o) { var n = document.createElement("link");
-                    n.setAttribute("href", e), n.setAttribute("rel", "stylesheet"), n.onload = function() { t(!0) }, n.onerror = function(e) { o(e), console.error(e) }, document.getElementsByTagName("head")[0].append(n) })) }, e.prototype.getStaticMainSrc = function(e) { return this._config.staticHost + "/Glodon/" + ("Debug" === this._config.build ? "Bimface" : e) }, e.prototype.loadSDKLoader = function() { var e = this; return new Promise((function(t, o) { if (window.BimfaceSDKLoader) t(!0);
-                    else { var n = e._config.staticHost + "/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js";
-                        e.loadScript(n).then((function() { return t(!0) })).catch((function() { return o() })) } })) }, e.prototype.loadUIComponents = function(e) { var t = this; return new Promise((function(o, n) { var r, a, i; if (null === (i = null === (a = null === (r = window.Glodon) || void 0 === r ? void 0 : r.Bimface) || void 0 === a ? void 0 : a.Tiles) || void 0 === i ? void 0 : i.UI) return o(!0); var s = t.getStaticMainSrc(e) + "/bimface.ui.css";
-                    t.loadCss(s).then((function() { return o(!0) })).catch((function() { return n() })) })) }, e }(),
-        B = window.Glodon || {};
-    window.Glodon = B; var T = B.Bimface = B.Bimface || {},
-        S = T.Module = T.Module || {},
-        E = function() {
-            function e(e) { this._loadedModule = {}, this._config = e, this._helper = new D(e) } return e.prototype.loadModule = function(e) { return b(this, void 0, void 0, (function() { var t, o, n, r, a; return v(this, (function(i) { switch (i.label) {
-                            case 0:
-                                return t = new window.BimfaceSDKLoaderConfig, (t = m(m({}, t), this._config)).viewToken = e.viewToken, [4, window.BimfaceSDKLoader.load(t).catch((function(e) { return console.log(e) }))];
-                            case 1:
-                                return i.sent(), [4, this._helper.loadSDKLoader()];
-                            case 2:
-                                return i.sent(), [4, this._helper.getModuleData(e.viewToken)];
-                            case 3:
-                                return "moduleData" != (o = i.sent()).modelType && "clashDetective" != o.modelType ? [2, Promise.reject("[BIMFACE ERROR]: Invalid ViewToken, viewToken: [" + e.viewToken + "]")] : (o.viewToken = e.viewToken, n = o.jsSDKVersion, [4, this._helper.loadUIComponents(n)]);
-                            case 4:
-                                return i.sent(), this._loadedModule[e.moduleType] ? [3, 6] : (this._helper.loadCss(this._helper.getStaticMainSrc(n) + "/modules/" + e.moduleType + ".css"), [4,
-                                    import (this._helper.getStaticMainSrc(n) + "/modules/" + e.moduleType + ".js")
-                                ]);
-                            case 5:
-                                r = i.sent(), this._loadedModule[e.moduleType] = r.default, i.label = 6;
-                            case 6:
-                                for (a in this._loadedModule[e.moduleType]) this._loadedModule[e.moduleType][a].setCurrentModuleData && this._loadedModule[e.moduleType][a].setCurrentModuleData(o); return [2, o] } })) })) }, e }();
-    S.ModuleManager = E, S.ModuleManagerConfig = y; var P = { Version: "2024-7-31-17-15", load: function(e, o, r) { window.BimfaceLoaderConfig = e, null == e.build && (e.build = t.Release); var a = function(e) { let o = Object.assign({}, e),
-                    r = "/Glodon"; return e.path ? (o.dataEnvType = n.Local, o.url = o.path, o.staticHost = o.sdkPath || i(o.path), o.resourcePath = i(o.path), o.path = i(o.path), r = o.sdkPath ? "" : "/jssdk") : e.resourcePath ? (o.dataEnvType = n.Local, o.url = o.resourcePath, o.resourcePath = i(o.resourcePath)) : (o.sdkPath && (r = "", o.staticHost = o.sdkPath), o.data = e.viewToken, o.url = `${e.APIHost}/inside/databag`), o.staticHost += r, e.build != t.Debug && o.configuration != t.Release || (o.configuration = ""), o.configuration = o.configuration ? `-${o.configuration.toLowerCase()}` : "", o }(e); if (!o && !r) return new Promise(((t, o) => { p(a, (function(o) { t(g(o, e)) }), o) }));
-            p(a, (function(t) { o && o(g(t, e)) }), (function(e) { r && r() })) }, Storage: w };
-    window.BimfaceSDKLoader = P }();

public/static/bim.html

@@ -1,116 +1,108 @@
 <!DOCTYPE html>
 <html>
-
-<head>
-    <meta charset="utf-8" />
-    <title>My first BIMFACE app</title>
-</head>
-
-<body>
-    <style>
-         ::v-deep #cloud-main-canvas {
-            width: 100%;
-            height: 100%;
-        }
-    </style>
-    <div id="domId" style="width: 100%; height: 98vh"></div>
-    <script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js" charset="utf-8"></script>
-    <script>
-        // var token = JSON.parse(localStorage.getItem('bimToken'));
+	<head>
+		<meta charset="utf-8" />
+		<title>My first BIMFACE app</title>
+	</head>
+	<body>
+		<style>
+			::v-deep #cloud-main-canvas {
+				width: 100%;
+				height: 100%;
+			}
+		</style>
+		<div id="domId" style="width: 100%; height: 98vh"></div>
+		<script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js" charset="utf-8"></script>
+		<script>
+			// var token = JSON.parse(localStorage.getItem('bimToken'));
         //  console.log('取到的token',token);
+			let viewer3D;
+			let app;
+			let viewToken = "06c56a5e060d42659f29c078af03536e";
+			console.log('viewToken',viewToken);
+			let loaderConfig = new BimfaceSDKLoaderConfig();
+			loaderConfig.viewToken = viewToken;
+			BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
+			function successCallback(viewMetaData) {
+				let domShow = document.getElementById("domId");
+				let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig();
+				webAppConfig.domElement = domShow;
+				app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig);
+				app.addView(viewToken);
+				viewer3D = app.getViewer();
+			}
 
+			function failureCallback(error) {
+				console.log(error);
+			}
+			// window.addEventListener("message", async function(e) {
+			// 	// const modelId = e.data.modelId
+			// 	const data = e.data || {};
+			// 	if (data.token) {
+			// 	// removeModel(modelId)
+			// 	document.getElementById("domId").innerHTML = "";
+			// 	await bimCallback(data.token);
+			// 	if (data.hideArr && data.colorArr) {
+			// 		configValue.hideArr = data.hideArr;
+			// 		configValue.colorArr = data.colorArr;
+			// 	}
+			// 	}
+			// 	// console.log(e.data, '父级页面传来的数据')
+			// 	// setTimeout(() => {
+			// 	//   window.parent.postMessage({ msg: 'hello' })
+			// 	// }, 2000)
+			// });
+			// const bimCallback = (viewToken) => {
+			// 	// let viewToken = '11b0d307c09f43bfa5fa3922bcce0342'
+			// 	let loaderConfig = new BimfaceSDKLoaderConfig();
+			// 	loaderConfig.viewToken = viewToken;
+			// 	BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
+			// 	function successCallback(viewMetaData) {
+			// 	let domShow = document.getElementById("domId");
+			// 	let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig();
+			// 	webAppConfig.domElement = domShow;
+			// 	app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig);
+			// 	app.addView(viewToken);
+			// 	viewer3D = app.getViewer();
+			// 	// 监听添加view完成的事件
+			// 	viewer3D.addEventListener(
+			// 		Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded,
+			// 		function() {
+			// 		// 调用viewer3D对象的Method，可以继续扩展功能
+			// 		// 从viewer3D对象中获取模型对象model3D
+			// 		model3D = viewer3D.getModel();
+			// 		// 获取模型状态
+			// 		modelState = viewer3D.getCurrentState();
+			// 		// 渲染3D模型
+			// 		viewer3D.render();
+			// 		// 操作模型
+			// 		renderConfigModel();
+			// 		}
+			// 	);
+			// 	}
 
-
-        window.addEventListener("message", async function(e) {
-            // const modelId = e.data.modelId
-            // const data = e.data || {};
-            // if (data.token) {
-            // // removeModel(modelId)
-            // document.getElementById("domId").innerHTML = "";
-            // await bimCallback(data.token);
-            // if (data.hideArr && data.colorArr) {
-            // 	configValue.hideArr = data.hideArr;
-            // 	configValue.colorArr = data.colorArr;
-            // }
-            // }
-            console.log(e.data, '父级页面传来的数据')
-            let viewer3D;
-            let app;
-            // let viewToken = "06c56a5e060d42659f29c078af03536e";
-            let viewToken = e.data.token;
-            console.log('viewToken', viewToken);
-            let loaderConfig = new BimfaceSDKLoaderConfig();
-            loaderConfig.viewToken = viewToken;
-            BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
-
-            function successCallback(viewMetaData) {
-                let domShow = document.getElementById("domId");
-                let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig();
-                webAppConfig.domElement = domShow;
-                app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig);
-                app.addView(viewToken);
-                viewer3D = app.getViewer();
-            }
-
-            function failureCallback(error) {
-                console.log(error);
-            }
-            // setTimeout(() => {
-            //   window.parent.postMessage({ msg: 'hello' })
-            // }, 2000)
-        });
-        // const bimCallback = (viewToken) => {
-        // 	// let viewToken = '11b0d307c09f43bfa5fa3922bcce0342'
-        // 	let loaderConfig = new BimfaceSDKLoaderConfig();
-        // 	loaderConfig.viewToken = viewToken;
-        // 	BimfaceSDKLoader.load(loaderConfig, successCallback, failureCallback);
-        // 	function successCallback(viewMetaData) {
-        // 	let domShow = document.getElementById("domId");
-        // 	let webAppConfig = new Glodon.Bimface.Application.WebApplication3DConfig();
-        // 	webAppConfig.domElement = domShow;
-        // 	app = new Glodon.Bimface.Application.WebApplication3D(webAppConfig);
-        // 	app.addView(viewToken);
-        // 	viewer3D = app.getViewer();
-        // 	// 监听添加view完成的事件
-        // 	viewer3D.addEventListener(
-        // 		Glodon.Bimface.Viewer.Viewer3DEvent.ViewAdded,
-        // 		function() {
-        // 		// 调用viewer3D对象的Method，可以继续扩展功能
-        // 		// 从viewer3D对象中获取模型对象model3D
-        // 		model3D = viewer3D.getModel();
-        // 		// 获取模型状态
-        // 		modelState = viewer3D.getCurrentState();
-        // 		// 渲染3D模型
-        // 		viewer3D.render();
-        // 		// 操作模型
-        // 		renderConfigModel();
-        // 		}
-        // 	);
-        // 	}
-
-        // 	function failureCallback(error) {
-        // 	console.log(error);
-        // 	}
-        // };
-        // function renderConfigModel() {
-        // 	// 恢复模型状态
-        // 	viewer3D.setState(modelState);
-        // 	viewer3D.render();
-        // }
-        // console.log(666)
-        // bimCallback("06c56a5e060d42659f29c078af03536e");
-        // 监听父组件的信息传递
-        // window.addEventListener("message", async function(e) {
-        // 	// const modelId = e.data.modelId
-        // 	const data = e.data || {};
-        // 	console.log(data,'发送的值')
-        // 	if (data.token) {
-        // 		// removeModel(modelId)
-        // 		document.getElementById("domId").innerHTML = "";
-        // 		await bimCallback("06c56a5e060d42659f29c078af03536e");
-        // 	}
-        // });
-    </script>
-</body>
-
-</html>
+			// 	function failureCallback(error) {
+			// 	console.log(error);
+			// 	}
+			// };
+			// function renderConfigModel() {
+			// 	// 恢复模型状态
+			// 	viewer3D.setState(modelState);
+			// 	viewer3D.render();
+			// }
+			// console.log(666)
+			// bimCallback("06c56a5e060d42659f29c078af03536e");
+			// 监听父组件的信息传递
+			// window.addEventListener("message", async function(e) {
+			// 	// const modelId = e.data.modelId
+			// 	const data = e.data || {};
+			// 	console.log(data,'发送的值')
+			// 	if (data.token) {
+			// 		// removeModel(modelId)
+			// 		document.getElementById("domId").innerHTML = "";
+			// 		await bimCallback("06c56a5e060d42659f29c078af03536e");
+			// 	}
+			// });
+		</script>
+	</body>
+</html>

src/api/modules/aIEarlyWarn.ts

@@ -17,11 +17,6 @@ export const getAlarmList = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/selectAiAnalyseHardWareAlarmList`, params, { headers: { noLoading: true } });
 };
 
-// 4.分页查询设备报警记录列表
-export const getAlarmPageList = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/selectPageList`, params, { headers: { noLoading: true } });
-};
-
 // 查询当前实时数据
 export const getRealTimeTotal = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/countAiAnalyseHardWareAlarmTotal`, params, { headers: { noLoading: true } });

src/api/modules/agjtCommandApi.ts

@@ -148,9 +148,7 @@ export const getStatsDirectorateBigScreenApi = (params: {}, showLoading: boolean
 };
 // centerTop评分数据接口
 export const getStatScoreApi = (params: {}, showLoading: boolean) => {
-	return http.get(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/getStatScore`, params, {
-		headers: { noLoading: showLoading }
-	});
+	return http.get(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/getStatScore`, params, { headers: { noLoading: showLoading } });
 };
 
 // 项目人员考勤
@@ -231,29 +229,6 @@ export const selectHierarchyEnterpriseListApi = (params: {}) => {
 export const getXzParentChildTaskListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/xzTaskProgress/getParentChildList`, params, { headers: { noLoading: true } });
 };
-export const getXzMilestoneListApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/xzMilestone/list`, params, { headers: { noLoading: true } });
-};
+
+
 // 甘特图接口结束位置
-// 获取月度安全综合评分（五种）
-export const getFiveScoresApi = (params: {}, showLoading: boolean) => {
-	return http.post(BASEURL + `/xmgl/safetyInspectionStandardBigScreen/getFiveScores`, params, {
-		headers: { noLoading: showLoading }
-	});
-};
-// 获取月度安全综合评分（十种）
-export const getScoresApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/safetyInspectionStandardBigScreen/getScores`, params, { headers: { noLoading: true } });
-};
-// 获取分项检查评分表列表
-export const getTypeRecordListApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/safetyInspectionStandardBigScreen/getTypeRecordList`, params, {
-		headers: { noLoading: true }
-	});
-};
-// 获取分项检查评分表详情
-export const getScoresDetailsApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/safetyInspectionStandardBigScreen/getScoresDetails`, params, {
-		headers: { noLoading: true }
-	});
-};

src/api/modules/agjtLiveApi.ts

@@ -43,21 +43,6 @@ export const configWeekVideoListApi = (params: {}, noLoading: boolean) => {
 	return http.get(BASEURL + `/xmgl/educationConfigWeekVideo/list`, params, { headers: { noLoading: noLoading } });
 };
 
-//现场大屏视频API
-export const getLiveScreenProgramPage = (params: {}, noLoading: boolean) => {
-	return http.get(BASEURL + `/xmgl/xzLiveScreenProgram/page`, params, { headers: { noLoading: noLoading } });
-};
-
-//现场大屏保存弹幕API
-export const getLiveScreenDanmuSaveObj = (params: {}, noLoading: boolean) => {
-	return http.post(BASEURL + `/xmgl/xzLiveScreenDanmu/saveObj`, params, { headers: { noLoading: noLoading } });
-};
-
-//现场大屏保存弹幕API
-export const getLiveScreenDanmuPage = (params: {}, noLoading: boolean) => {
-	return http.get(BASEURL + `/xmgl/xzLiveScreenDanmu/page`, params, { headers: { noLoading: noLoading } });
-};
-
 //获取劳务实名制信息API---上
 export const selectPersonTypeAndEduStatisticsApi = (params: {}, noLoading: boolean) => {
 	// return http.post(BASEURL + `/xmgl/workerInfo/selectPersonTypeAndEduStatistics`, params, { headers: { noLoading: noLoading } });
@@ -109,11 +94,3 @@ export const getcountDangerEngineerApi = (params: {}, noLoading: boolean) => {
 		headers: { noLoading: noLoading }
 	});
 };
-
-// 查询天气实况
-export const getWeatherLiveData = (params: {}, noLoading: boolean) => {
-	// return http.get(BASEURL + `/xmgl/xzFlow/getStatBySpecial`, params, { headers: { noLoading: noLoading } });
-	return http.post(BASEURL + `/xmgl/airQualityAnalysis/getWeatherLiveData`, params, {
-		headers: { noLoading: noLoading }
-	});
-};

src/api/modules/cathangCrane.ts

@@ -1,65 +0,0 @@
-import http from "@/api";
-const BASEURL = import.meta.env.VITE_API_URL;
-
-// 汽车吊
-
-// 列表查询
-export const gettrucklist = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/truckCrane/list`, params);
-};
-
-// 列表查询单条
-export const gettruckqueryById = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/truckCrane/queryById`, params);
-};
-
-// 查询最新状态
-export const gettruckdata = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/truckCraneCurrentData/getNewData`, params);
-};
-
-// 设备情况汇总
-export const gettruckstat = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/truckCrane/onlineStat`, params);
-};
-
-// 设备报警分析
-export const gettruckAlam = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/truckCraneAlarm/alarmStat`, params);
-};
-
-// 图表分析
-export const gettruckend = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/truckCraneCurrentData/windSpeedTrend`, params);
-};
-
-// 履带吊
-// 列表查询
-export const getcrawlist = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/crawlerCrane/list`, params);
-};
-
-// 列表查询单条
-export const getcrawqueryById = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/crawlerCrane/queryById`, params);
-};
-
-// 查询最新状态
-export const getcrawdata = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/crawlerCraneCurrentData/getNewData`, params);
-};
-
-// 设备情况汇总
-export const getcrawstat = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/crawlerCrane/onlineStat`, params);
-};
-
-// 设备报警分析
-export const getcrawAlam = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/crawlerCraneAlarm/alarmStat`, params);
-};
-
-// 图表分析
-export const getcrawend = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/crawlerCraneCurrentData/windSpeedTrend`, params);
-};

src/api/modules/elevator.ts

@@ -25,9 +25,7 @@ export const getAlarmTypeApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/lifterAlarm/queryAlarmsDistinguishedNumberByAlarmType`, params);
 };
 
-export const getSelectLifterBySnApi = (params: {}) => {
-	return http.post(BASEURL + `xmgl/lifter/selectLifterBySn`, params);
-};
+
 
 // 右中下数据
 export const getNewestLifterApi = (params: {}) => {

src/api/modules/login.ts

@@ -50,15 +50,3 @@ export const logoutApi = () => {
 export const jumpLargeUserInfoApi = (params?: any) => {
 	return http.post(BASEURL + `/xmgl/base/getLoginInfoByToken`, params, { headers: { "Content-Type": "application/json" } });
 };
-// * 免登录用户信息
-export const jumpLargeByUserIdApi = (params?: any) => {
-	return http.post(BASEURL + `/xmgl/base/userId/login`, params, { headers: { "Content-Type": "application/json" } });
-};
-
-export const getAllModule = (params?: any) => {
-	return http.post(BASEURL + `/xmgl/baseModule/getModuleAndMenuList`, params);
-};
-
-export const getScreenAuthModuleAndMenuApi = (params?: any) => {
-	return http.get(BASEURL + "/xmgl/screenAuth/getModuleAndMenu", params);
-};

src/api/modules/newSecurityManagement.ts

@@ -1,32 +0,0 @@
-// 质量管理 接口API
-import http from "@/api";
-const BASEURL = import.meta.env.VITE_API_URL;
-
-// 责任单位分析（统计分包单位）
-export const getDutyUnitAnalysis = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/countQualityInspectionRecordEnterprise`, params, {
-		headers: { noLoading: true }
-	});
-};
-// 质量检查统计
-export const getQualityStatistics = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/selectQualityStatistics`, params, {
-		headers: { noLoading: true }
-	});
-};
-// 质量管理记录
-export const getQualityManageList = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/list`, params, { headers: { noLoading: true } });
-};
-// 质量 隐患等级分析
-export const getQualityInspectionGrade = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/countQualityInspectionRecordUrgentLevel`, params, {
-		headers: { noLoading: true }
-	});
-};
-// 质量 责任区域分析
-export const getCountHiddenDangerInspectRegion = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/xzSecurityQualityInspectionRecord/countQualityInspectionRecordRegion`, params, {
-		headers: { noLoading: true }
-	});
-};

src/api/modules/projectshow.ts

@@ -1,57 +0,0 @@
-// 项目展示
-import http from "@/api";
-const BASEURL = import.meta.env.VITE_API_URL;
-
-// 区域管理-树形结构
-export const arealistmap = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/qualityRegion/list`, params, { headers: { noLoading: true } });
-};
-
-// 工作票
-export const workpage = (params: {}) => {
-    return http.get(BASEURL + `/xmgl/mlHoist/page`, params, { headers: { noLoading: true } });
-};
-
-// 工作票-新增
-export const workpageadd = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/mlHoist/add`, params, { headers: { noLoading: true } });
-};
-
-
-// 人员信息-劳务管理
-export const selectWorkerpeop = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/workerInfo/selectWorkerInfoList`, params, { headers: { noLoading: true } });
-};
-
-// 安全隐患-质量管理-全部整改记录
-export const InspectRecord = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/qualityInspectionRecord/list?lang=zh_CN`, params, { headers: { noLoading: true } });
-};
-
-// 所有摄像头
-export const selectEnableVideoItemList = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/videoItem/selectEnableVideoItemList?lang=zh_CN`, params, { headers: { noLoading: true } });
-};
-
-// 人员信息-查询企业
-export const companylist = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/enterpriseInfo/list`, params, { headers: { noLoading: true } });
-};
-
-
-// 人员信息-查询部门
-export const TeamInfoList = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/teamInfo/getTeamInfoList`, params, { headers: { noLoading: true } });
-};
-
-// 弹窗查询-区域人数
-export const areasafetyHatFence = (params: {}) => {
-    return http.get(BASEURL + `/xmgl/safetyHatFence/list`, params, { headers: { noLoading: true } });
-};
-
-
-export const areasaWorker = (params: {}) => {
-    return http.post(BASEURL + `/xmgl/qualityRegion/queryRegionWorker`, params, { headers: { noLoading: true } });
-};
-
-

src/api/modules/safeEdgeProtection.ts

@@ -1,27 +0,0 @@
-import http from "@/api";
-const BASEURL = import.meta.env.VITE_API_URL;
-
-// 培训概况
-export const safecationOverview = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/workerSafeEducationWorker/selectWorkerEducationOverview`, params);
-};
-
-// 班前教育人数统计（近七日）
-export const safecationByWeek = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/workerSafeEducationWorker/selectWorkerEducationByWeek`, params);
-};
-
-// 教育类型分析
-export const safecationByType = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/workerSafeEducationWorker/selectWorkerEducationByType`, params);
-};
-
-// 近七日人员培训记录
-export const safeWorkerPage = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/workerSafeEducationWorker/selectSafeEducationWorkerPage`, params);
-};
-
-// 培训统计（近一个月内） 培训人员班组统计（近一个月内）
-export const safecationByMonth = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/workerSafeEducationWorker/selectWorkerEducationByMonth`, params);
-};

src/api/modules/smartSafeHat.ts

@@ -51,10 +51,6 @@ export const getVehiclePositionDayRecord = (params: {}) => {
 export const getHatDevOptionApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/safetyHatDev/list`, params);
 };
-// 智能安全帽--分类查询设备树
-export const getEnterpriseTreeApi = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/safetyHatDev/enterprise/tree/list`, params);
-};
 // 智能安全帽--查询设备状态总数
 export const getSafeHatTypeTotalApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/safetyHatDev/countSafetyHatDev`, params);
@@ -71,11 +67,6 @@ export const getSuroundInfoApi = (params: {}) => {
 export const getAlarmRecordInfoApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/safetyHatAlarm/list`, params);
 };
-// 智能安全帽--查询报警信息-分页
-export const getAlarmRecordInfoApiPage = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/safetyHatAlarm/page`, params);
-};
-
 // 智能安全帽--查询实时数据信息
 export const getRealtimeDataApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/safetyHatData/list`, params);
@@ -84,10 +75,6 @@ export const getRealtimeDataApi = (params: {}) => {
 export const getSafeHatDayRecordApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/safetyHatData/list`, params);
 };
-// 获取每个设备最新一条实时数据信息
-export const getSafetyHatNewestApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/safetyHatData/getNewestList`, params);
-};
 // 智能安全帽--删除围栏
 export const deleteSafehatFence = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/safetyHatFence/deleteBatch`, params);
@@ -95,4 +82,4 @@ export const deleteSafehatFence = (params: {}) => {
 // 智能安全帽--添加围栏
 export const addSafeHatPositionFence = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/safetyHatFence/add`, params);
-};
+};

src/api/modules/tower.ts

@@ -30,9 +30,6 @@ export const getRelatedInfoApi = (params: {}) => {
 	return http.get(BASEURL + `/xmgl/tower/getRelatedInfo`, params);
 };
 
-export const getSelectTowerBySnApi = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/tower/selectTowerBySn`, params);
-};
 
 // 右下-实时数据
 export const getNewestDataApi = (params: {}) => {

src/api/modules/vehicle.ts

@@ -17,35 +17,3 @@ export const getEntryAndExitCountApi = (params: {}) => {
 export const getEntryAndExitListApi = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/carPassRecord/page`, params, { headers: { noLoading: true } });
 };
-
-// 测速-历史记录
-export const carMeasureSpeedData = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/carMeasureSpeedData/page`, params, { headers: { noLoading: true } });
-};
-
-// 测速-摄像头数据
-export const carMeasureItemList = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/carMeasureSpeedBigScreen/selectEnableVideoItemList`, params, { headers: { noLoading: true } });
-};
-
-// 测速
-export const statSpeedBigScreen = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/carMeasureSpeedBigScreen/countDev`, params, { headers: { noLoading: true } });
-};
-
-// 测速-设备
-export const statBigScreeneq = (params: {}) => {
-	return http.get(BASEURL + `/xmgl/carMeasureSpeedDev/page`, params, { headers: { noLoading: true } });
-};
-
-//测速度- 每日车辆数
-export const getCarDaily = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/carMeasureSpeedBigScreen/getCarDaily`, params, { headers: { noLoading: true } });
-};
-
-
-// 测速-一周趋势
-export const getExceedSpeedTrend = (params: {}) => {
-	return http.post(BASEURL + `/xmgl/carMeasureSpeedBigScreen/getExceedSpeedTrend`, params, { headers: { noLoading: true } });
-};
-

src/components/setBarrageDialog.vue

@@ -1,400 +0,0 @@
-<!-- eslint-disable vue/v-on-event-hyphenation -->
-<template>
-	<div class="setvideodialog" v-if="dialogInfo.showDialog">
-		<div class="listdetail">
-			<div class="dialog-content-more">
-				<div class="dialog-title">
-					<img src="@/assets/images/titleIcon.png" alt="" />
-					<div class="title-text">
-						<i>{{ dialogInfo.postData?.title }}</i>
-					</div>
-					<div class="close-icon" @click="closeDialog">
-						<el-icon>
-							<Close />
-						</el-icon>
-					</div>
-				</div>
-				<div class="contont-video" style="color: #fff; font-size: 24px">
-					<div style="border: 1px solid #ccc; width: 95%">
-						<Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig" :mode="mode" />
-						<Editor class="editor" v-model="valueHtml" :defaultConfig="editorConfig" :mode="mode" @onCreated="handleCreated" />
-					</div>
-					<div class="footer-btn">
-						<el-button color="#0a2249" :icon="CircleCloseFilled" @click="closeDialog">取消</el-button>
-						<el-button color="#0a2249" :icon="CircleCheckFilled" @click="saveBtn">保存</el-button>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script lang="ts" setup>
-import "@wangeditor/editor/dist/css/style.css"; // 引入 css
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
-import { onMounted, reactive, ref, onBeforeUnmount, shallowRef, watch } from "vue";
-import { CircleCloseFilled, CircleCheckFilled } from "@element-plus/icons-vue";
-import { ElMessage } from "element-plus";
-//引入现场大屏API
-import { getLiveScreenDanmuSaveObj } from "@/api/modules/agjtLiveApi";
-import { GlobalStore } from "@/stores";
-// import moment from "moment";
-// import { COMPANY } from "@/config/config";
-const store = GlobalStore();
-// const BASEURL = import.meta.env.VITE_API_URL;
-const props = defineProps(["valueHtml"]);
-const emits = defineEmits(["updateConfig"]);
-const mode = ref("default"); // 或 'simple'
-// 编辑器实例，必须用 shallowRef
-const editorRef = shallowRef();
-
-// 内容 HTML
-const valueHtml = ref("");
-
-// 模拟 ajax 异步获取内容
-onMounted(() => {
-	// setTimeout(() => {
-	// 	valueHtml.value = "<p>模拟 Ajax 异步设置内容</p>";
-	// }, 1500);
-});
-
-watch(
-	() => props.valueHtml,
-	() => {
-		console.log("我是弹幕配置", props.valueHtml);
-		valueHtml.value = props.valueHtml;
-	}
-);
-
-const toolbarConfig = {
-	toolbarKeys: ["undo", "redo", "fontFamily", "bold", "italic", "underline", "color"]
-};
-const editorConfig = {
-	placeholder: "请输入文字...",
-	hoverbarKeys: {
-		text: {
-			menuKeys: [
-				"bold", // 加粗
-				"italic", // 斜体
-				"underline", // 下划线
-				"color", // 颜色
-				"clearStyle" // 清除格式
-			]
-		}
-	}
-};
-
-const saveBtn = async () => {
-	console.log(valueHtml.value);
-	const requestData = {
-		projectSn: store.sn,
-		userId: store.userId,
-		content: valueHtml.value
-	};
-	const res: any = await getLiveScreenDanmuSaveObj(requestData, true);
-	if (res.success) {
-		console.log("修改成功", res);
-		ElMessage({
-			showClose: true,
-			message: "保存成功",
-			type: "success"
-		});
-		dialogInfo.showDialog = false;
-		// configWeekVideoListFn(true);
-		emits("updateConfig");
-	}
-};
-
-// 组件销毁时，也及时销毁编辑器
-onBeforeUnmount(() => {
-	const editor = editorRef.value;
-	if (editor == null) return;
-	editor.destroy();
-});
-
-const handleCreated = (editor: any) => {
-	editorRef.value = editor; // 记录 editor 实例，重要！
-};
-
-const dialogInfo = reactive({
-	showDialog: false,
-	postData: {} as any,
-	videoUploadList: [
-		{
-			id: 1,
-			title: "周一"
-		},
-		{
-			id: 2,
-			title: "周二"
-		},
-		{
-			id: 3,
-			title: "周三"
-		},
-		{
-			id: 4,
-			title: "周四"
-		},
-		{
-			id: 5,
-			title: "周五"
-		},
-		{
-			id: 6,
-			title: "周六"
-		},
-		{
-			id: 7,
-			title: "周日"
-		}
-	]
-});
-
-const closeDialog = () => {
-	dialogInfo.showDialog = false;
-	dialogInfo.postData = {};
-};
-function openDialog(obj: any) {
-	dialogInfo.postData = obj;
-	dialogInfo.showDialog = true;
-}
-
-// 暴露给父组件的参数和方法(外部需要什么，都可以从这里暴露出去)
-defineExpose({
-	openDialog
-});
-onMounted(async () => {});
-</script>
-
-<style lang="scss" scoped>
-.setvideodialog {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	right: 0%;
-	top: 0%;
-	background: rgba(7, 28, 49, 0.5);
-	z-index: 100;
-
-	.dialog-content {
-		position: absolute;
-		box-sizing: border-box;
-		padding: 1%;
-		left: 15%;
-		top: 21%;
-		width: 70%;
-		height: 60%;
-		background: url("@/assets/images/commandScreen/dialog-bg.png") no-repeat;
-		background-size: 100% 100%;
-		z-index: 21;
-	}
-
-	.dialog-content-show {
-		position: absolute;
-		box-sizing: border-box;
-		padding: 1%;
-		left: 15%;
-		top: 1%;
-		width: 70%;
-		height: 98%;
-		background: url("@/assets/images/commandScreen/dialog-bg.png") no-repeat;
-		background-size: 100% 100%;
-		z-index: 21;
-	}
-
-	.listdetail {
-		position: absolute;
-		// box-sizing: border-box;
-		// padding: 1%;
-		// right: 3%;
-		// top: 5%;
-		width: 70%;
-		// height: 50%;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		background: rgba(8, 31, 63, 0.7);
-		z-index: 21;
-
-		.dialog-content-more {
-			// position: absolute;
-			// box-sizing: border-box;
-			// padding: 1%;
-			// left: 15%;
-			// top: 21%;
-			width: 100%;
-			height: 100%;
-			background: url("@/assets/images/overviewScreen/card-content.png") no-repeat;
-			background-size: 100% 100%;
-			z-index: 21;
-		}
-
-		.contont-video {
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			// flex-wrap: wrap;
-			margin-top: 10px;
-			.footer-btn {
-				padding: 20px;
-				> button:first-child {
-					margin-right: 40px;
-				}
-				> button {
-					border: 1px solid #ccc;
-				}
-			}
-			:deep(.w-e-bar) {
-				color: #ffecec !important;
-				background-color: transparent !important;
-				svg {
-					fill: #ffecec !important;
-				}
-				.w-e-bar-item .disabled,
-				.w-e-bar-item button {
-					color: #ffecec !important;
-					background-color: transparent;
-				}
-				.w-e-bar-item .disabled:hover,
-				.w-e-bar-item button:hover {
-					background-color: transparent;
-				}
-				.w-e-bar-divider {
-					display: none;
-				}
-				.w-e-select-list {
-					background-color: #112748 !important;
-				}
-
-				.w-e-select-list ul .selected,
-				.w-e-select-list ul li:hover {
-					background-color: white !important;
-					color: black !important;
-				}
-			}
-			.editor {
-				height: 380px !important;
-				:deep(.w-e-text-container) {
-					color: #ffecec !important;
-					background-color: transparent !important;
-					font-size: 16px !important;
-				}
-				:deep() {
-					.w-e-hover-bar {
-						background-color: #0a2249 !important;
-					}
-				}
-			}
-			// .video-list {
-			// 	width: 33%;
-			// 	display: flex;
-			// 	align-items: center;
-			// 	justify-content: center;
-			// 	font-size: 15px;
-			// 	margin-top: 30px;
-			// 	font-weight: bold;
-			// 	.no-inherit {
-			// 		margin-left: 8px;
-			// 	}
-			// 	.upload-demo {
-			// 		width: 45%;
-			// 	}
-			// 	:deep(.el-upload-list),
-			// 	:deep(.el-upload-list__item) {
-			// 		margin: 0;
-			// 	}
-			// 	:deep(.el-upload-list__item-info) {
-			// 		width: 100%;
-			// 	}
-			// 	:deep(.el-button.el-button--primary.el-button--default) {
-			// 		padding: 10px 15px;
-			// 		height: 40px;
-			// 	}
-
-			// 	:deep(.videoupload) {
-			// 		font-size: 20px;
-			// 	}
-			// }
-		}
-	}
-
-	.dialog-content,
-	.dialog-content-show,
-	.dialog-content-more {
-		position: relative;
-
-		.political-outlook {
-			height: 100%;
-		}
-
-		.dialog-article {
-			height: 95%;
-		}
-
-		.close-icon {
-			// position: absolute;
-			// right: 3%;
-			// top: 3%;
-			cursor: pointer;
-			color: #ffffff;
-			font-size: 18px;
-		}
-
-		.dialog-title {
-			color: #ffffff;
-			font-weight: bold;
-			font-size: 18px;
-			font-family: "OPPOSans-Bold";
-			display: flex;
-			align-items: center;
-			margin: 0 20px;
-			padding-top: 10px;
-
-			.title-time {
-				font-size: 30px;
-				color: #f34234;
-				position: absolute;
-				top: 3%;
-				left: 50%;
-				transform: translateX(-50%);
-			}
-
-			.title-img {
-				width: 3%;
-				height: 3%;
-
-				img {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.title-text {
-				margin-left: 1%;
-				margin-right: auto;
-			}
-		}
-	}
-}
-
-.notoDta {
-	top: 73%;
-	width: 12%;
-	left: 44%;
-	position: absolute;
-
-	img {
-		width: 40%;
-		margin: 5% 30%;
-	}
-
-	p {
-		color: #fff;
-		font-size: 14px;
-		margin: -6% 37%;
-	}
-}
-</style>

src/config/config.ts

@@ -28,17 +28,11 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 // export const COMPANY: string = "zsbf"; //中水北方
 // export const COMPANY: string = "as"; //鞍山项目
 // export const COMPANY: string = "agjt"; //鞍钢集团
-// export const COMPANY: string = "tj"; // 同济项目
-// export const COMPANY: string = "scwc"; // 四川网诚项目
-// export const COMPANY: string = "zmml"; // 中煤木垒项目
-// export const COMPANY: string = "dljb"; // 大连金笔项目
-// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
-// export const COMPANY: string = "bthg"; //包头化工
+export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
-// export const COMPANY: string = "agjtLocationLive"; //鞍钢集团人员定位大屏
-export const COMPANY: string = "zkjc"; //中科佳成项目
+// export const COMPANY: string = "zkjc"; //中科佳成项目
 // export const COMPANY: string = "cqna"; //重庆南岸项目
 // export const COMPANY: string = "slx"; //苏立信项目
 // export const COMPANY: string = "hfqc"; //合肥启程(乌丹)项目
@@ -51,10 +45,3 @@ export const COMPANY: string = "zkjc"; //中科佳成项目
 // export const COMPANY: string = "ahsa"; // 安徽水安项目
 // export const COMPANY: string = "zkax"; // 中科安信项目
 // export const COMPANY: string = "jzjt"; //九柱集团
-// export const COMPANY: string = "whzt"; //武汉中铁
-// export const COMPANY: string = "ztsyj"; // 中铁十一局
-// export const COMPANY: string = "xnyzhjj"; // 新能源智慧基建管理平台|中新建
-// export const COMPANY: string = "gwkj"; // 国维科技
-// export const COMPANY: string = "allxm"; // 安立路项目
-// export const COMPANY: string = "hbla"; // 湖北龙澳
-// export const COMPANY: string = "qyg"; // 清远港

src/routers/index.ts

@@ -38,14 +38,10 @@ router.beforeEach(async (to, from, next) => {
 	const globalStore = GlobalStore();
 	// 解决首次跳转失败
 	let freeToken = window.location.href.indexOf("token") != -1;
-	let freeUserId = window.location.href.indexOf("userId") != -1;
 	let freeSn = window.location.href.indexOf("sn") != -1;
 	if (freeToken) {
 		globalStore.token = window.location.href.split("token=")[1].split("&")[0];
 	}
-	if (freeUserId) {
-		globalStore.setUserId(window.location.href.split("userId=")[1].split("&")[0]);
-	}
 	if (freeSn) {
 		globalStore.setSN(window.location.href.split("sn=")[1]);
 	}
@@ -73,7 +69,7 @@ router.beforeEach(async (to, from, next) => {
 	// 3.判断是访问登陆页，有 Token 就在当前页面，没有 Token 重置路由并放行到登陆页
 	if (to.path === LOGIN_URL) {
 		console.log("判断是访问登陆页，有:", from.fullPath);
-		console.log("要去的页面，有:", to);
+		console.log("要去的页面，有:", to.fullPath);
 		console.log("判断是访问登陆页，globalStore.token有:", globalStore.token);
 
 		if (globalStore.token && from.fullPath !='/') return next(from.fullPath);
@@ -85,12 +81,7 @@ router.beforeEach(async (to, from, next) => {
 	if (ROUTER_WHITE_LIST.includes(to.path)) return next();
 
 	// 5.判断是否有 Token，没有重定向到 login
-	if (!globalStore.token) {
-		if (globalStore.userId) {
-			return next();
-		}
-		return next({ path: LOGIN_URL, replace: true });
-	}
+	if (!globalStore.token) return next({ path: LOGIN_URL, replace: true });
 	// if (to.path === "/") return next({ path: LOGIN_URL, replace: true });
 
 	// 6.如果没有菜单列表，就重新请求菜单列表并添加动态路由