修改大屏报错

yanzhu-bigscreen/src/api/index.js

@@ -7,6 +7,7 @@ import greenCarbon from "./greenCarbon";
 import videoMonitor from "./videoMonitor";
 import safety from "./safety";
 import tower from "./tower";
+import powerIot from "./powerIot";
 export default {
   http: axios,
   downFile: download,
@@ -18,4 +19,5 @@ export default {
   videoMonitor,
   safety,
   tower,
+  powerIot,
 };

yanzhu-bigscreen/src/components/trend-chart-line.vue

@@ -1,36 +1,36 @@
-import Vue from 'vue'
+<template>
-Vue.component("trend-chart-line", {
+    <div :style="{ 'height': height + 'px' }" ref="chart">
-    template: `
-            <div :style="{'height': height+'px'}" ref="chart">
 
-            </div>
+    </div>
-    `,
+</template>
+<script>
+export default {
     props: {
-        data:{
+        data: {
-            type:Object
+            type: [Object, Array]
         },
-        height:{
+        height: {
-            type:Number
+            type: Number
         },
     },
     data() {
         return {
-            classData:[],
+            classData: [],
         }
     },
-    mounted(){
+    mounted() {
         this.init()
     },
     methods: {
-        init(){
+        init() {
             this.getChartData()
         },
-        getChartData(){
+        getChartData() {
             //品类金额占比 饼图
             var chChartPie = echarts.init(this.$refs.chart);
-            this.echartPie(chChartPie,this.data)
+            this.echartPie(chChartPie, this.data)
         },
-        echartPie(chChart,data){
+        echartPie(chChart, data) {
             let newPromise = new Promise((resolve) => {
                 resolve()
             })
@@ -38,7 +38,7 @@ Vue.component("trend-chart-line", {
             //然后异步执行echarts的初始化函数
             newPromise.then(() => {
                 var series = []
-                if(data && data.lineData){
+                if (data && data.lineData) {
                     for (let i = 0; i < data.lineData.length; i++) {
                         series.push({
                             name: data.legend[i],
@@ -64,8 +64,8 @@ Vue.component("trend-chart-line", {
                 }
 
                 var unit = ''
-                if(data.unit){
+                if (data.unit) {
-                    unit = '单位：'+data.unit
+                    unit = '单位：' + data.unit
                 }
 
                 this.option = {
@@ -90,7 +90,7 @@ Vue.component("trend-chart-line", {
                         },
                     },
                     grid: {
-                        top:'15%',
+                        top: '15%',
                         left: "2%",
                         right: "3%",
                         bottom: "2%",
@@ -117,7 +117,7 @@ Vue.component("trend-chart-line", {
                             textStyle: {
                                 color: "#c5d9fc",
                                 margin: 20,
-                                fontSize:14
+                                fontSize: 14
                             },
                         },
                     },
@@ -141,7 +141,7 @@ Vue.component("trend-chart-line", {
                             textStyle: {
                                 color: "#c5d9fc",
                                 margin: 20,
-                                fontSize:14
+                                fontSize: 14
                             },
                         },
                         splitLine: {
@@ -160,10 +160,10 @@ Vue.component("trend-chart-line", {
             })
         },
     },
-    watch:{
+    watch: {
-        data: function (n,o) {
+        data: function (n, o) {
             this.getChartData()
         }
     }
-
+}
-})
+</script>

yanzhu-bigscreen/src/components/trend-line-chart.vue

@@ -1,52 +1,50 @@
-import Vue from 'vue'
+<template>
-Vue.component("trend-line-chart", {
+    <div :style="{ height: height + 'px' }" ref="chart"></div>
-    template: `
+</template>
-            <div :style="{'height': height+'px'}" ref="chart">
+<script>
- 
+export default {
-            </div>
-    `,
     props: {
-        chartdata:{
+        chartdata: {
-            type:Object
+            type: Object,
         },
-        height:{
+        height: {
-            type:Number
+            type: Number,
         },
-        data:{
+        data: {
-            type:Array
+            type: [Array, Object],
+        },
+        fn: {
+            type: Function,
         },
-        fn:{
-            type:Function
-        }
     },
     data() {
         return {
-            option:{}
+            option: {},
-        }
+        };
     },
-    mounted(){
+    mounted() {
-        this.init()
+        this.init();
     },
     methods: {
-        init(){
+        init() {
-            this.getChartData()
+            this.getChartData();
         },
-        getChartData(){
+        getChartData() {
             //品类金额占比 饼图
             var myChart = echarts.init(this.$refs.chart);
-            this.echartPie(myChart,this.chartdata)
+            this.echartPie(myChart, this.chartdata);
         },
-        echartPie(myChart,data){
+        echartPie(myChart, data) {
             let newPromise = new Promise((resolve) => {
-                resolve()
+                resolve();
-            })
+            });
             //然后异步执行echarts的初始化函数
             newPromise.then(() => {
-                var series =[]
+                var series = [];
-                if(data && data.data){
+                if (data && data.data) {
                     for (let i = 0; i < data.data.length; i++) {
                         series.push({
-                            name:data.legend[i],
+                            name: data.legend[i],
                             type: "line",
                             smooth: true,
                             symbol: "circle",
@@ -58,20 +56,17 @@ Vue.component("trend-line-chart", {
                                 },
                             },
                             data: data.data[i],
-                        })
+                        });
                     }
                 }
-                var unit = ''
+                var unit = "";
-                if(data.unit){
+                if (data.unit) {
-                    unit = '单位：'+data.unit
+                    unit = "单位：" + data.unit;
                 }
 
                 this.option = {
-                    color : data.color,
+                    color: data.color,
-                    dataZoom:[
+                    dataZoom: [{ show: true, type: "slider" }, { type: "inside" }],
-                        {show:true,type:'slider'},
-                        {type:'inside'}
-                    ],
                     tooltip: {
                         trigger: "axis",
                         axisPointer: {
@@ -81,7 +76,7 @@ Vue.component("trend-line-chart", {
                         },
                     },
                     grid: {
-                        top:'15%',
+                        top: "15%",
                         left: "1%",
                         right: "3%",
                         bottom: "1%",
@@ -100,7 +95,7 @@ Vue.component("trend-line-chart", {
                             },
                         },
                         axisTick: {
-                            show: false
+                            show: false,
                         },
 
                         axisLabel: {
@@ -108,14 +103,14 @@ Vue.component("trend-line-chart", {
                             textStyle: {
                                 color: "#c5d9fc",
                                 margin: 20,
-                                fontSize:16
+                                fontSize: 16,
                             },
                         },
                     },
                     yAxis: {
-                        name:unit,
+                        name: unit,
                         nameTextStyle: {
-                            color: '#fff',
+                            color: "#fff",
                             fontSize: 14,
                         },
                         type: "value",
@@ -128,7 +123,7 @@ Vue.component("trend-line-chart", {
                             },
                         },
                         axisTick: {
-                            show: false
+                            show: false,
                         },
                         axisLabel: {
                             show: true,
@@ -136,7 +131,7 @@ Vue.component("trend-line-chart", {
                             textStyle: {
                                 color: "#c5d9fc",
                                 margin: 20,
-                                fontSize:16
+                                fontSize: 16,
                             },
                         },
                         splitLine: {
@@ -147,27 +142,26 @@ Vue.component("trend-line-chart", {
                             },
                         },
                     },
-                    series: series
+                    series: series,
                 };
-                if(this.fn){
+                if (this.fn) {
-                    this.option=this.fn(this.option);
+                    this.option = this.fn(this.option);
                 }
-                myChart.setOption(this.option,true);
+                myChart.setOption(this.option, true);
                 window.onresize = myChart.resize;
-            })
+            });
         },
     },
-    watch:{
+    watch: {
         /*chartdata: {
-            deep:true,
+                deep:true,
-            handler: function (val, oldVal){
+                handler: function (val, oldVal){
-                this.init()
+                    this.init()
-            }
+                }
-        },*/
+            },*/
-        data: function (val, oldVal){
+        data: function (val, oldVal) {
-            this.init()
+            this.init();
-        }
+        },
-
+    },
-    }
+};
-
+</script>
-})

yanzhu-bigscreen/src/views/init.js

@@ -14,8 +14,8 @@ import moduleOne22 from "../components/module/module-one-2-2.vue";
 import moduleOne23 from "../components/module/module-one-2-3.vue";
 import moduleOne31 from "../components/module/module-one-3-1.vue";
 import staffSurveyChart from "../components/staffSurveyChart.vue";
-import trendChartLine from "../components/trend-chart-line";
+import trendChartLine from "../components/trend-chart-line.vue";
-import trendLineChart from "../components/trend-line-chart";
+import trendLineChart from "../components/trend-line-chart.vue";
 import peopleNumber from "@/components/people-number.vue";
 import dictTag from "@/components/DictTag/index.vue";
 import MyDialog from "@/components/MyDialog.vue";

yanzhu-ui-vue3/public/gis/config.json

@@ -0,0 +1,99 @@
+{
+  "baseUrl": "http://192.168.1.32:10022",
+  "baseUrl2": "https://localhost:44310",
+  "modelUrl": "http://192.168.1.32:18086",
+  "modelFile": "http://192.168.1.32:18086",
+  "secretKey": "cbe8c300dfb0280d71bf6546087c6d2fa49260085f53fca8c7985b43ea81b20d5fcd62c35914af2bac8bd8d1895623a3273b53c93dd284d6b6bede81d25abc08258c47f45b34485a2edb350010e2f42cd5b388af45c6b0706420a895151316b4f1d0ea78295e5bfc64b0989fd4216a075c239e5bb31f020bd7e9faa8456b4fc687fc591cce145c2e7267a51e8216d933553a7acc3e32f41a74bf476fcb04bd5c8a94867b381ae88ecd6668e8ca6b6d286dce7e5d799b0a175d5afe5554a4332203e774bed8a04535067c9aac0a18108055b1db541f70363b277050951ab91fcbccd8329463d92cd2f81b95abdf8d437c4965454914fcc7b07d28062bc2976948356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f61ebd11fa087d237eef4391edca9cbd9c83ae24d1650ef196ed32b1cdbecb9bf3ae2651ff226b8a2383977aeaabb9225d7a13661921611073d780e543dea7936ec3ae24d1650ef196ed32b1cdbecb9bf3ae2651ff226b8a2383977aeaabb9225d78f5fea478b5873d98955cafd9ad3116a37e40a524d2bbb8599a991777d21e7823e88c9264a91404ad3c355b1486472d2d33d2024825618177d6fdab307e075f86fd6ba535458df7b840efa284b50840eefc6d4ffdc9011ea24d736db704d8954950390941b9aaa80089e41bf1a87879de6cd674b6676107f3d4256820c37cd19030c6924517e4349f71e19f74e660313cf3630a2823a9a2d4ce0dce6f81f87eea1ccfaae84e9dbea030c6924517e4349b5024217bdf743a670fd5d571139e4f0e6cd674b6676107fc8b14b44ceeed441af4b194f05a956195b0d603c259172b75b1923cb186fe0ce5be04514c976edd0c12cc462769b2e685be04514c976edd04ca2ef020dc56bee8321afe91a1dcbb1afafd0506174e8680f18f43fcd13957e37bdb1221aa64295f230f78b7aa0c960753151533a2770446a6cb07b672285d204ba1ecd4a967f5dcb6b0c9432a8108f7d1f9f3c7343796941187054ec673ebdbd57ea3b34f9c6cc37bdb1221aa6429512b695fc8f5b4b6fc12cc462769b2e685be04514c976edd038d27dbe2e47e96b753151533a277044d80e0285b44b743f64d53d967da98ab0555e1e6d7d3c0468c8e6f7bb1e69ec27703c52805d982a9a7b7134e53eaa4f83b046182095e9d992f79b33aea9c3effb017d98bd95ced22c1d7f698eff81232620bc772fa7ae29a7d414a6ec983c937ed81e303cd60ec5e31c5c60194b7c51c25c322c7bf03d5c6a2c014184423e21699fd6d34f2a62e59aa4596f82cf86665b367e01045009c18a50fbde6b13f859564b7c9002a5b14cebb57369802f23c1aa6b290529357b344b4f9e4ca41de8710d292880b4a64a669bc90629a0dde8428ad872c21c536bea8eb3b1a4be90f8463296bdaccd12db79c0591cb6f472757743aba553a1cbe08ecc92770a1215bc3b93066d58d2b870f2232e9fde5f0e7f5669508068b4ae554551950390941b9aaa80b7a14bc8fab29bf7c50b8060c5eea5d5e8e734ad48ffdf709490f088fa367ff294ecc2b6de092f75595e72e69637eba13ff017eb3f9b6d6bb88532618123e53bbe6adbb80d33cea8a4a8ad74c0a1d191af57f50984e5d53e2f83d501af7ed327f69087bf57c16c40ebc424f09f933d0eb1a881ed05ca8d5c665e8d49164a81ede6cd674b6676107f3a6090d0f582280bab0aa79efdb758515e3f8253971ef20b10b7b200fbc7c3d39e62c1f70c675390b7f097dc36860acbc7340ab80e00c255c3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335e8b1d5c423a17172341187054ec673ebd6c69755ac3a39199b4f7334f4c0447de753151533a277044a6403869fa3023ab70e2ffb0f223e4e266188accccc2c901f230f78b7aa0c960753151533a2770446a6cb07b672285d2afafd0506174e86853e3e8a5ebf625bfafafd0506174e868046aea1d307c2532afafd0506174e868af24d88c02bccfae733d4b8fe932b6af1847f5ba627d078cd2dac29d33a580c8e533a3246e10d1f3d4665f4fbc9d021003944a96b7dfe879",
+  "serverIP": "192.168.1.32",
+  "port": "9000",
+  "modelInput": {
+    "ConfigJson": {
+      "style": 1,
+      "zGrid": 1,
+      "viewStyle": 1,
+      "drawing": 0,
+      "accuracy": 3,
+      "parametric": 0,
+      "familyName": "",
+      "writetype": 0,
+      "locationType": 0,
+      "vertexNormal": 1,
+      "isExportLines": 0,
+      "customizedModule": 0,
+      "unitRatio": 0.001,
+      "type": 2,
+      "offsetX": 0,
+      "offsetY": 0,
+      "offsetZ": 0,
+      "isInstance": 1,
+      "maxCountInstance": 100,
+      "isLod": 0,
+      "isCad": 0,
+      "srs": "",
+      "srsOrigin": [],
+      "longitude": 1.9003144895714261,
+      "latitude": 0.5969026041820608,
+      "transHeight": 0,
+      "edgeOn": 0,
+      "level": 1,
+      "xCount": 1,
+      "yCount": 1,
+      "draco": 1,
+      "compressionLevel": 10,
+      "quantizePositionBits": 16,
+      "quantizeNormalBits": 10,
+      "quantizeTexcoordBits": 12,
+      "flipY": 0,
+      "linePercent": 1,
+      "minDistance": 0,
+      "compatible": 0,
+      "faceNumLimit": 300000,
+      "textureLimit": 10240,
+      "textureSizePercent": 50,
+      "textureQuality": 30,
+      "combineTexture": 0,
+      "engineType": 2,
+      "blockRender": 1
+    }
+  },
+  "gisInput": {
+    "Name": "",
+    "LightweightName": "",
+    "InitiatingUser": "",
+    "UniqueCode": "",
+    "Priority": "202",
+    "ModelUploadUrl": "",
+    "OtherInfo": ""
+  },
+  "videoAddress": "http://c.glendale.top/static/video.mp4",
+  "showLogo": true,
+  "pakList": [{
+    "id": "3a0b3b5b-2e87-484b-5e58-af7d18c42c0e",
+    "pakPath": "../../../../GL_UEngine_zz-Windows.pak",
+    "packageName": "GL_UEngine_zz",
+    "mapName": "XiangXueZhan-Build-3_jia_zhuang"
+  }],
+  "specialType": [],
+  "publicProject": "3a0b3b3f-e463-b8f2-2e34-dc5bd493e216",
+  "deploymentMethod": "private",
+  "projectName": "服务器端渲染3D/BIM/GIS轻量化引擎",
+  "defaultUser": {
+    "username": "guest",
+    "password": "123456"
+  },
+  "whetherVerify": false,
+  "UpdateLog":[
+    {
+      "updateTime": "2024-02-22",
+      "remarks":["合模预览场景增加碰撞检测功能","Tif模型加载问题优化","模型上传类型扩展","其余已知问题修复。"]
+    },
+    {
+      "updateTime": "2024-01-31",
+      "remarks":["模型上传配置调整","图纸预览增加","测量模块新增面与面测量","模型操作模块新增净高分析", "漫游模块增加漫游类型选择，可切换第一、三人称漫游及飞行漫游","区域绘制模块新增绘制面","合模接口适配","其余已知问题修复。"]
+    },
+    {
+      "updateTime": "2024-01-17",
+      "remarks":["模型上传格式补充 （3dmax、glb、gltf等）。","测量结果标识更新，距离测量支持连续测量。","视点管理块新增模型视图功能。","效果展示模块新增管道流水、液位、火焰效果功能。","新增展示风格模块，包括科幻流光、模型边界渲染。","其余已知问题修复。"]
+    }
+  ]
+}

yanzhu-ui-vue3/public/gis/js/common.js

@@ -0,0 +1,14 @@
+// //获取
+// function transitionPath(file,FailurePath){
+//     if((file!=null)&&(file!='')){
+//         return process.env.VUE_APP_API_FILE_URL + '/' + file
+//     }
+//     return FailurePath
+// };
+
+// var copySign = '\n----来自' + process.env.VUE_APP_COMPANY_NAME + '----'
+// 将全局公共方法，组合成一个对象，并暴露出去
+// export default {
+  // transitionPath,
+  // copySign,
+// }

yanzhu-ui-vue3/src/views/demo.vue

@@ -0,0 +1,49 @@
+<template>
+    <div>
+        <input type="file" ref="file" @change="fileUpload">
+        <el-button @click="doUpload">上传</el-button>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            headers: {}
+        }
+    },
+    methods: {
+        doUpload() {
+            this.$refs.file.click()
+
+        },
+        fileUpload(e) {
+            e.target.files.forEach(file => {
+                let formData = new FormData()
+                formData.append('file', file)
+                let cfg = {
+                    name: 'aaa',
+                    uniqueCode: '11222',
+                    priority: 1,
+                    isCAD: false
+                };
+                formData.append("input", JSON.stringify(cfg))
+                this.$http({
+                    method: 'post',
+                    url: 'http://192.168.126.20:808/mapmodel/api/app/model/upload-file',
+                    data: formData,
+                    headers: {
+                        'Content-Type': 'application/octet-stream',
+                        'Token': 'cbe8c300dfb0280d71bf6546087c6d2fa49260085f53fca8e5bdce7cde8509800e60acd60891a0dfaedaed48706cede62c884a84004218a7c2eb3de18b4f3783258c47f45b34485a2edb350010e2f42cd5b388af45c6b070850288d284cbbbcda2d085ba47169a7d4fc79609ffbef2dc54455448c112333d4b48d4870843cd1a156822f418515a2ad17683749ba4ff5118ae3f686e966fbfdd71fd75e0bbc3738a94867b381ae88ecd6668e8ca6b6d286dce7e5d799b0a175d5afe5554a4332203e774bed8a04535067c9aac0a18108055b1db541f70363b277050951ab91fcbccd8329463d92cd2f81b95abdf8d437c4965454914fcc7b07d28062bc2976948356e76d9d11fd5b479eb391b46cc93e66da10e0ba1fed735c8b1b1f086973f6152b6a2299e3e22c9cc8c33b16ea71cc03013404ec41c18c9cc748e652ce16fe7061c32d550edfda330c1555e0c08e51f698f96b91615d8220acd9cb22f32e9757681487e0680adfbfacb9b5d2ce5a13b664d8466043270f9f3bde6ac6a05cf25ab0ccc0659a290c9669997be7ccc0086c3d61f7cf5f649cb25f0dbad9f7f66e3165cad25065145affac91bea061f4ff485af667dd7ebaf4baeea64611acbe5c74018be5a8b704fcd4f53d18504940411fac91bea061f4ff49a2f853c245297edc3d61f7cf5f649cb0f9b84173857a7b67c27928b58b4a6a65f517a43f106335e8b1d5c423a171723ffa04d0ac4e5c1a1853fcb2bc95ee8056cd5b4826fa55926733ef859a5f169e6afafd0506174e86864d53d967da98ab0b0e08d14be6d452c6c69755ac3a391993370a029761da893cfbf575da87c6b5ca602467b79c6c9532f438aaafb9ec915692f0287a8db979969e5635404d6fdfb753151533a277044afdd825f7197f2896c69755ac3a391993370a029761da893af24d88c02bccfae6cd5b4826fa55926f7722b78090b30b986f9287101582d8841187054ec673ebd2042f9836ea453c3afafd0506174e86800225b7f4102e3585b1923cb186fe0ceee54c6f17ab8555da26ecd334722494fc515b205e9624a4494c772ef4f023a606882e118fa6321c24ddee4821c840fb56aac929d6d0a052d5ff97d71e43811db939f7340826236af6f10316a04bf618d494a26e0fd06f7daa07177989e1680a4cf14829a5847f70377d6c12f1649400fcab44f4ff52989cf129aa6cca660be152a75b8e35648925dbce381b345d9e137c04a02a4c8252625f5625eed58fd34b7be4266e54212e88b23f012bead9abaef9e18aa308f0ecffaf3dda7d7b4efd2e0c4b8de161864620fc1f2af98bde031b29e0865381c96bbc10921b48a068558915ff023d18526f5d399e0893df43db7122415d52565dc982ea24fbd825734dbaefadc6df0f19d925c7f63d343a622134b1c934d130d662447add19064adbbb2fd24a82c0fbfcbc3175fc32761df099156daf4e86455740207eb4e4a5300d9c1a17ffd43703d476c36ef07df2206bd8d232b844ff3c1d7cf7c47ec502183af4e27b644d89a77efad286dee59796b124081510f8a6ea5c1dff9c3d61f7cf5f649cb25f0dbad9f7f66e3e0e7c3406ae4dd4eebc424f09f933d0eb1a881ed05ca8d5c70958237eb5b91d4e574440ea0c9179a582dc966bcfc1f21cf3630a2823a9a2d22bd09a00b213aae3866768ae2f24dde6784fbf292c2cba136689b286e75a81e016aa63061505f57a8c1113b833628e3a18dff8ae8ac8eaa7a4fba6045bc9b4b'
+                    }
+                }).then(res => {
+                    debugger
+                })
+            })
+        }
+    }
+
+}
+</script>
+
+<style></style>

yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue

@@ -10,8 +10,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="所属单位" prop="deptId">
-                <el-select v-model="queryParams.deptId" clearable :disabled="currentPrjId ? true : false" filterable
+                <el-select v-model="queryParams.deptId" clearable filterable placeholder="请选择所属单位" style="width: 200px">
-                    placeholder="请选择所属单位" style="width: 200px">
                     <el-option v-for="item in subDepts" :key="item.id" :label="item.subDeptName" :value="item.id">
                     </el-option>
                 </el-select>