Merge branch 'main' of https://git.positivepole.cn/dev/GScreenWEB_TPMes

src/App.vue

@@ -5,7 +5,8 @@
 </template>
 
 <script>
-import datav from './components/baozuo-demo/index.vue' 
+//import datav from './components/baozuo-demo/index.vue' 
+import datav from './components/datav/index.vue' 
 
 export default {
   name: 'app',

src/api.js

@@ -3,16 +3,10 @@ import axios from 'axios'
 const api = {
  
   
-  // 定义API接口地址
-  // baseURL: process.env.NODE_ENV === 'production' ? '/api/' : 'http://localhost:3000/',
-  // GET请求示例
-  baseURL: 'http://39.101.165.228:9001',
-  baseURL2: 'http://39.101.165.228:9001',
-
   //永盛
-  baseURL2: 'http://123.207.37.67:9001',
+  baseURL2: 'http://123.207.37.67:9001', 
-  baseURL22: 'http://123.207.37.67:9001',
 
+  baseURL: '', 
 
   get (url) {
     return new Promise((resolve, reject) => {
@@ -50,7 +44,7 @@ const api = {
     return new Promise((resolve, reject) => {
       axios({
         method: 'post',
-        url: this.baseURL2 + url,
+        url: this.baseURL + url,
         data: data,
         headers: headers
       })

src/components/datav/index.vue

@@ -219,7 +219,7 @@ export default {
       notices: [],
       showNotices:false,
       showData: {
-        name: '永盛陶瓷智能数据看榜',
+        name: '',
         times: [],
         leftData: [],
         reportedList: [],
@@ -316,6 +316,7 @@ export default {
       this.$api.post2('/api/web/GetScreenReport?category='+Aid).then(res => {
         if (res.code === '200') {
           let data = res.data;
+          this.showData.name = res.data.title || '智能数据看板';
           this.reportSettings = data.reportSettings;
           this.notices = data.notices;
           // console.log(data.notices.length>0 , data.notices[0].starttime , data.notices[0].Endtime)