diff --git a/components/custom-refresher/custom-refresher.vue b/components/custom-refresher/custom-refresher.vue index 29806b0..0575e56 100644 --- a/components/custom-refresher/custom-refresher.vue +++ b/components/custom-refresher/custom-refresher.vue @@ -2,7 +2,7 @@ diff --git a/config.js b/config.js index d141ff0..c5a0c9b 100644 --- a/config.js +++ b/config.js @@ -9,7 +9,7 @@ module.exports = { // 应用版本 version: "1.2.0", // 应用logo - logo: "/static/logo200.png", + logo: "https://img.xiaoces.com/photos/logo200.png", // 官方网站 site_url: "http://ruoyi.vip", // 政策协议 diff --git a/main.js b/main.js index 67fec41..6394e8f 100644 --- a/main.js +++ b/main.js @@ -8,6 +8,8 @@ import { getDicts } from "@/api/system/dict/data" import "./utils/uni.css"; // 引入全局TuniaoUI import TuniaoUI from 'tuniao-ui' +import VueCompositionAPI from '@vue/composition-api' +Vue.use(VueCompositionAPI) // 引入TuniaoUI提供的vuex简写方法 let vuexStore = require('@/store/$tn.mixin.js') Vue.use(plugins) diff --git a/package.json b/package.json index fa46c7e..30b5419 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "dependencies": { "crypto-js": "^4.2.0", + "echarts": "^5.3.0", "mqtt": "^2.18.8" } } diff --git a/pages.json b/pages.json index a24d0f6..b43855d 100644 --- a/pages.json +++ b/pages.json @@ -27,6 +27,12 @@ "navigationBarTitleText": "数据中心" } }, +// { +// "path": "pages/data/indexDemo", +// "style": { +// "navigationBarTitleText": "数据中心11" +// } +// }, { "path": "pages/news/index", "style": { @@ -181,6 +187,12 @@ "selectedIconPath": "static/images/tabbar/data_.png", "text": "历史数据" }, +// { +// "pagePath": "pages/data/indexDemo", +// "iconPath": "static/images/tabbar/data.png", +// "selectedIconPath": "static/images/tabbar/data_.png", +// "text": "历史数据" +// }, { "pagePath": "pages/news/index", "iconPath": "static/images/tabbar/news.png", diff --git a/pages/data/index.vue b/pages/data/index.vue index 064074e..2c24ad1 100644 --- a/pages/data/index.vue +++ b/pages/data/index.vue @@ -8,14 +8,12 @@ - + - - - + diff --git a/pages/news/index.vue b/pages/news/index.vue index ddf0356..6518fba 100644 --- a/pages/news/index.vue +++ b/pages/news/index.vue @@ -62,7 +62,7 @@ export default { { id: 1, sender: '系统通知', - avatar: '/static/news.png', + avatar: 'https://img.xiaoces.com/photos/news.png', preview: '您有一条新的系统通知,请查看', time: '10:30', unread: true, @@ -71,7 +71,7 @@ export default { { id: 2, sender: '告警中心', - avatar: '/static/alarm.png', + avatar: 'https://img.xiaoces.com/photos/alarm.png', preview: '您有一条新告警->', time: '昨天', unread: false, @@ -80,7 +80,7 @@ export default { { id: 3, sender: '客服小美', - avatar: '/static/cs.png', + avatar: 'https://img.xiaoces.com/photos/cs.png', preview: '您好,请问有什么可以帮到您的吗?', time: '昨天', unread: false, diff --git a/static/index.html b/static/index.html index a7af653..6697d5a 100644 --- a/static/index.html +++ b/static/index.html @@ -5,7 +5,7 @@ <%= htmlWebpackPlugin.options.title %> - +