Merge branch 'master' of http://152.136.206.27:3000/dongjh/guan_client

src/components/page/GlobalFooter.vue

@@ -1,17 +1,19 @@
 <template>
   <div class="footer">
-    <div class="links">
+    <!-- <div class="links">
       <a href="http://www.jeecg.com" target="_blank">JEECG 首页</a>
       <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">
         <a-icon type="github"/>
       </a>
       <a href="https://ant.design/">Ant Design</a>
       <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
-    </div>
+    </div> -->
     <div class="copyright">
-      Copyright
+      <!-- 修改框架 -->
+      Copyright &copy; 2023 山东研讯智能科技有限公司 出品
+      <!-- Copyright
       <a-icon type="copyright"/>
-      2019 <span>JEECG开源社区 出品</span>
+      2019 <span>JEECG开源社区 出品</span> -->
     </div>
   </div>
 </template>

src/views/dashboard/Analysis copy.vue

@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <index-chart v-if="indexStyle==1"></index-chart>
+    <index-bdc v-if="indexStyle==2"></index-bdc>
+    <index-task v-if="indexStyle==3"></index-task>
+    <div style="width: 100%;text-align: right;margin-top: 20px">
+      请选择首页样式：
+      <a-radio-group v-model="indexStyle">
+        <a-radio :value="1">统计图表</a-radio>
+        <a-radio :value="2">统计图表2</a-radio>
+        <a-radio :value="3">任务表格</a-radio>
+      </a-radio-group>
+    </div>
+  </div>
+</template>
+
+<script>
+  import IndexChart from './IndexChart'
+  import IndexTask from "./IndexTask"
+  import IndexBdc from './IndexBdc'
+
+  export default {
+    name: "Analysis",
+    components: {
+      IndexChart,
+      IndexTask,
+      IndexBdc
+    },
+    data() {
+      return {
+        indexStyle:1
+      }
+    },
+    created() {
+
+    },
+    methods: {
+
+    }
+  }
+</script>

src/views/dashboard/Analysis.vue

@@ -1,41 +1,24 @@
 <template>
   <div>
-    <index-chart v-if="indexStyle==1"></index-chart>
-    <index-bdc v-if="indexStyle==2"></index-bdc>
-    <index-task v-if="indexStyle==3"></index-task>
-    <div style="width: 100%;text-align: right;margin-top: 20px">
-      请选择首页样式：
-      <a-radio-group v-model="indexStyle">
-        <a-radio :value="1">统计图表</a-radio>
-        <a-radio :value="2">统计图表2</a-radio>
-        <a-radio :value="3">任务表格</a-radio>
-      </a-radio-group>
-    </div>
+    
   </div>
 </template>
 
 <script>
-  import IndexChart from './IndexChart'
-  import IndexTask from "./IndexTask"
-  import IndexBdc from './IndexBdc'
-
-  export default {
-    name: "Analysis",
-    components: {
-      IndexChart,
-      IndexTask,
-      IndexBdc
-    },
-    data() {
-      return {
-        indexStyle:1
-      }
-    },
-    created() {
-
-    },
-    methods: {
-
+export default {
+  name: '',
+  data () {
+    return {
     }
+  },
+  created () {
+  },
+  mounted () {
+  },
+  methods: {
   }
-</script>
+}
+</script>
+
+<style lang="less" scoped>
+</style>

src/views/modules_guAn/visualization/modules/YuzhiCurve.vue

@@ -86,15 +86,15 @@ export default {
       // immediate: true,
       deep: true
     },
-    marks: {
-      handler(newValue, oldValue){
-        console.log('预制曲线线段', newValue, oldValue)
-        // this.refreshData(newValue)
-        this.markData = newValue
-      },
-      // immediate: true,
-      deep: true
-    },
+    // marks: {
+    //   handler(newValue, oldValue){
+    //     console.log('预制曲线线段', newValue, oldValue)
+    //     // this.refreshData(newValue)
+    //     this.markData = newValue
+    //   },
+    //   // immediate: true,
+    //   deep: true
+    // },
     'chooseXunhuan.circname': {
       handler(newValue, oldValue){
         if(newValue){
@@ -109,17 +109,17 @@ export default {
     // this.changeData(moniData)
   },
   mounted () {
+    // console.log('mark', this.data, this.marks, this.markData)
     this.$nextTick(() => {
       this.initYuzhiCurve()
       this.refreshData(this.data)
-      // this.setMarkLine()
     })
   },
   methods: {
     setMarkLine(data, color){
       console.log(data, color)
       var markLines = []
-      this.markData.forEach((item, index) => {
+      this.marks.forEach((item, index) => {
         var y = (data[index] + data[index + 1]) / 2
         markLines.push([
           {

src/views/modules_guAn/visualization/modules/info3D.vue

@@ -2,14 +2,14 @@
   <div class="info-3D-module">
     <!-- 顶部信息 -->
     <div class="u-flex-jaa info-content">
-      <div v-for="(item, index) in raelDate" :key="index" class="item-info">
+      <div v-for="(item, index) in realDate" :key="index" class="item-info">
         {{ item.name }}：{{ item.value }}
       </div>
     </div>
     <!-- 3D区域 -->
     <div class="area-3D">
       <!-- <div class="img-3D"></div> -->
-      <iframe src="https://192.168.2.246:4000/scene.html?tag=scenes/YTRL/20240126V1.json&org_id=4&allCache=true&fullscreen=101" scrolling="no" frameborder="0" width="100%" height="100%" />
+      <iframe :src="iframeUrl" scrolling="no" frameborder="0" width="100%" height="100%" />
       <!-- <iframe src="https://192.168.2.246:4000/display.html?tag=displays/YT%208%202.json&org_id=4&fullscreen=101" scrolling="no" frameborder="0" width="100%" height="100%" /> -->
     </div>
 
@@ -17,6 +17,7 @@
 </template>
 
 <script>
+import {getAction} from '@/api/manage'
 import commonTitle from '../components/commonTitle.vue'
 
 var eqStatus = [
@@ -47,7 +48,8 @@ export default {
         { name: '预计结束时间', webName: '预计结束时间-试验信息', value: '' },
         { name: '试验运行时间', webName: '试验运行时间', value: '' },
       ],
-      raelDate: []
+      realDate: [],
+      iframeUrl: ''
     }
   },
   watch: {
@@ -61,10 +63,19 @@ export default {
     }
   },
   created () {
+    this.getUrl()
   },
   mounted () {
   },
   methods: {
+    // 获取iframe地址
+    getUrl(){
+      getAction('/datacoll/webaccess/getFlowUrl').then(res=>{
+        if(res.success){
+          this.iframeUrl = res.result
+        }
+      })
+    },
     // 获取并处理改变数据
     changeData(newValue){
       var newArr = this.staticData.map(item=>{
@@ -101,9 +112,9 @@ export default {
           value: value
         }
       })
-      this.raelDate = newArr
-      // this.raelDate = this.staticData
-      // console.log(this.raelDate)
+      this.realDate = newArr
+      // this.realDate = this.staticData
+      // console.log(this.realDate)
     },
   }
 }