Compare commits
No commits in common. "ed6844931d2f84359ed3758fe3731dc55d6603cc" and "46787bcf0ccb2462a122adb4d0d5839b833c81c6" have entirely different histories.
ed6844931d
...
46787bcf0c
|
|
@ -5,8 +5,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
//import datav from './components/baozuo-demo/index.vue'
|
||||
import datav from './components/datav/index.vue'
|
||||
import datav from './components/baozuo-demo/index.vue'
|
||||
|
||||
export default {
|
||||
name: 'app',
|
||||
|
|
|
|||
10
src/api.js
10
src/api.js
|
|
@ -3,10 +3,16 @@ 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',
|
||||
baseURL22: 'http://123.207.37.67:9001',
|
||||
|
||||
baseURL: '',
|
||||
|
||||
get (url) {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
|
@ -44,7 +50,7 @@ const api = {
|
|||
return new Promise((resolve, reject) => {
|
||||
axios({
|
||||
method: 'post',
|
||||
url: this.baseURL + url,
|
||||
url: this.baseURL2 + url,
|
||||
data: data,
|
||||
headers: headers
|
||||
})
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ export default {
|
|||
notices: [],
|
||||
showNotices:false,
|
||||
showData: {
|
||||
name: '',
|
||||
name: '永盛陶瓷智能数据看榜',
|
||||
times: [],
|
||||
leftData: [],
|
||||
reportedList: [],
|
||||
|
|
@ -316,7 +316,6 @@ 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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue