diff --git a/.env.development b/.env.development index 7c1bec0..48fe786 100644 --- a/.env.development +++ b/.env.development @@ -2,6 +2,7 @@ ENV = development # 本地环境接口地址 -# VITE_API_URL = http://localhost:5005 -VITE_API_URL = http://192.168.88.206:5005 -# VITE_API_URL = http://192.168.88.76:5005 \ No newline at end of file +VITE_API_URL = http://localhost:5005 +# VITE_API_URL = http://192.168.88.206:5005 +# VITE_API_URL = http://192.168.88.76:5005 +# VITE_API_URL = http://cloud.bodk.com.cn \ No newline at end of file diff --git a/package.json b/package.json index 24c7339..0ec66b5 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,11 @@ "echarts-gl": "^2.0.9", "echarts-wordcloud": "^2.1.0", "element-plus": "^2.6.1", + "ezuikit-js": "^8.0.6-beta.2", "js-cookie": "^3.0.5", "js-table2excel": "^1.1.2", "jsplumb": "^2.15.6", + "konva": "^9.2.0", "lodash-es": "^4.17.21", "mitt": "^3.0.1", "monaco-editor": "^0.47.0", @@ -44,7 +46,6 @@ "vcrontab-3": "^3.3.22", "vform3-builds": "^3.0.10", "vue": "^3.4.21", - "konva": "^9.2.0", "vue-clipboard3": "^2.0.0", "vue-demi": "^0.14.7", "vue-grid-layout": "3.0.0-beta1", diff --git a/public/config.js b/public/config.js index 8282369..ad12edb 100644 --- a/public/config.js +++ b/public/config.js @@ -3,5 +3,5 @@ window.__env__ = { "VITE_OPEN": "false", "VITE_OPEN_CDN": "false", "VITE_PUBLIC_PATH": "", - "VITE_API_URL": "http://192.168.88.206:5005" + "VITE_API_URL": "http://localhost:5005" } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 3cfb1a4..914168c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -22,6 +22,10 @@ import mittBus from '/@/utils/mitt'; import setIntroduction from '/@/utils/setIconfont'; // import checkUpdate from '/@/utils/auto-update'; import { SysOrgApi } from '/@/api-services/api'; +// 获取布局配置信息 +const getThemeConfig = computed(() => { + return themeConfig.value; +}); // 引入组件 const LockScreen = defineAsyncComponent(() => import('/@/layout/lockScreen/index.vue')); @@ -107,6 +111,22 @@ watch( () => route.path, () => { other.useTitle(); + let routeList = ['HealthLayout', 'home', 'health', 'monitor']; + let i = routeList.indexOf(route.name.toString()); + const body = document.documentElement as HTMLElement; + if (getThemeConfig.value.isIsDark) { + if (i < 0){ + body.setAttribute('data-theme', ''); + themeConfig.value.isIsDark = false; + } + } + else { + if (i > -1){ + body.setAttribute('data-theme', 'dark'); + themeConfig.value.isIsDark = true; + } + } + console.log(8888, route.name ) }, { deep: true, diff --git a/src/api/api.ts b/src/api/api.ts new file mode 100644 index 0000000..f32c2f9 --- /dev/null +++ b/src/api/api.ts @@ -0,0 +1,29 @@ +import request from '/@/utils/request'; + +export function getList(api, data) { + return request({ + url: `/api/${api}/getList`, + method: 'post', + data, + }); +} +export function add(api, data) { + return request({ + url: `/api/${api}/add`, + method: 'post', + data, + }); +} +export function update(api, data) { + return request({ + url: `/api/${api}/update`, + method: 'post', + data, + }); +} +export function del(api, id) { + return request({ + url: `/api/${api}/delete/${id}`, + method: 'post', + }); +} diff --git a/src/api/other.ts b/src/api/other.ts new file mode 100644 index 0000000..717c584 --- /dev/null +++ b/src/api/other.ts @@ -0,0 +1,28 @@ +import request from '/@/utils/request'; +// import type { ResultData } from './common'; +export function getDeviceInfo() { + return request({ + baseURL: 'http://39.108.191.53:8089', + url: '/api/v1/device?page=1&limit=20', + method: 'get', + }); +} +export function getEZUIKitToken(data) { + return request({ + baseURL: 'https://open.ys7.com', + url: '/api/lapp/token/get', + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + }, + method: 'post', + data, + }); +} +// export function list(params: any) { +// return request({ +// eslint-disable-next-line no-irregular-whitespace +//       url: "/list", +// method: "get", +// params, +// }); +// } diff --git a/src/api/user.ts b/src/api/user.ts index f1cf6cf..d8c0542 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -7,13 +7,6 @@ export function getAddInfo() { method: 'get', }); } -export function getDeviceInfo() { - return request({ - baseURL: 'http://39.108.191.53:8089', - url: '/api/v1/device?page=1&limit=20', - method: 'get', - }); -} // export function list(params: any) { // return request({ // eslint-disable-next-line no-irregular-whitespace diff --git a/src/assets/M9.png b/src/assets/M9.png index 86e7c3b..cc2ae28 100644 Binary files a/src/assets/M9.png and b/src/assets/M9.png differ diff --git a/src/assets/M9_01.png b/src/assets/M9_01.png new file mode 100644 index 0000000..dfba8b0 Binary files /dev/null and b/src/assets/M9_01.png differ diff --git a/src/assets/M9_02.png b/src/assets/M9_02.png new file mode 100644 index 0000000..a5007be Binary files /dev/null and b/src/assets/M9_02.png differ diff --git a/src/assets/customer/bg.png b/src/assets/customer/bg.png new file mode 100644 index 0000000..bfd0ab7 Binary files /dev/null and b/src/assets/customer/bg.png differ diff --git a/src/assets/customer/welcome.png b/src/assets/customer/welcome.png new file mode 100644 index 0000000..ab20da1 Binary files /dev/null and b/src/assets/customer/welcome.png differ diff --git a/src/assets/customer/xiaozheng.png b/src/assets/customer/xiaozheng.png new file mode 100644 index 0000000..f69e5c6 Binary files /dev/null and b/src/assets/customer/xiaozheng.png differ diff --git a/src/assets/font/DIGITAL.TXT b/src/assets/font/DIGITAL.TXT new file mode 100644 index 0000000..484dd47 --- /dev/null +++ b/src/assets/font/DIGITAL.TXT @@ -0,0 +1,40 @@ +DS-Font's TrueType Fonts +Font name: DS-Digital (Normal, Bold, Italic, Bold Italic), Version 1.0 +Author: Dusit Supasawat +Web Site: http://ds-font.hypermart.net +Contact me: Dusit Supasawat, 325/38 Suksawat32 Ratburana Bangkok Thailand 10140 +Email address: dusit@mailcity.com + +Thanks for trying! We hope you really enjoy this my typeface. This font is +distributed as shareware. You can use this font for a long time as you want. +After all, when you think this font can be usefulness for you. You can send +me some money, that would be way cool. + +I'm only asking $20 US shareware fee per this typeface for personal use. +And $45 US is the usual amount per this typeface for commercial use. + +Distribution: You are free to distribute this archive so long as this text +file is distributed with the archive, the font file have not been modified, +and it is understood that the font's copyright remains with the original +author (Dusit Supasawat). + +To register send your payment to: + +Dusit Supasawat +325/38 Suksawat32 Ratburana +Bangkok Thailand 10140 + +And fill out something as this order form, and send it in with your payment. + +Font name:_________________________________________ +Your information +Name:______________________________________________ +Address:___________________________________________ +City, State : _____________________________________ +Zip Code:__________________________________________ +Country:___________________________________________ +E-MAIL address:____________________________________ + + +You will receive fonts which you order by Email after registration. These fonts +will be generated for you by specify your name in font information. \ No newline at end of file diff --git a/src/assets/font/DS-DIGI.TTF b/src/assets/font/DS-DIGI.TTF new file mode 100644 index 0000000..0925877 Binary files /dev/null and b/src/assets/font/DS-DIGI.TTF differ diff --git a/src/assets/font/DS-DIGIB.TTF b/src/assets/font/DS-DIGIB.TTF new file mode 100644 index 0000000..064ad47 Binary files /dev/null and b/src/assets/font/DS-DIGIB.TTF differ diff --git a/src/assets/font/DS-DIGII.TTF b/src/assets/font/DS-DIGII.TTF new file mode 100644 index 0000000..2aae3d8 Binary files /dev/null and b/src/assets/font/DS-DIGII.TTF differ diff --git a/src/assets/font/DS-DIGIT.TTF b/src/assets/font/DS-DIGIT.TTF new file mode 100644 index 0000000..65642f9 Binary files /dev/null and b/src/assets/font/DS-DIGIT.TTF differ diff --git a/src/assets/home/bg.jpg b/src/assets/home/bg.jpg index cbb3d67..692679d 100644 Binary files a/src/assets/home/bg.jpg and b/src/assets/home/bg.jpg differ diff --git a/src/assets/home/bg01bigindex.png b/src/assets/home/bg01bigindex.png new file mode 100644 index 0000000..ca7ed9e Binary files /dev/null and b/src/assets/home/bg01bigindex.png differ diff --git a/src/assets/home/bg01rightarea.png b/src/assets/home/bg01rightarea.png new file mode 100644 index 0000000..e5472f5 Binary files /dev/null and b/src/assets/home/bg01rightarea.png differ diff --git a/src/assets/home/bg02bigindex.png b/src/assets/home/bg02bigindex.png new file mode 100644 index 0000000..579047b Binary files /dev/null and b/src/assets/home/bg02bigindex.png differ diff --git a/src/assets/home/bg05rightarea.png b/src/assets/home/bg05rightarea.png new file mode 100644 index 0000000..eb6bae6 Binary files /dev/null and b/src/assets/home/bg05rightarea.png differ diff --git a/src/assets/home/eath.png b/src/assets/home/eath.png new file mode 100644 index 0000000..e73f5ce Binary files /dev/null and b/src/assets/home/eath.png differ diff --git a/src/assets/home/lines1.png b/src/assets/home/lines1.png index ca62b3a..95a7301 100644 Binary files a/src/assets/home/lines1.png and b/src/assets/home/lines1.png differ diff --git a/src/assets/pdf/ten.pdf b/src/assets/pdf/ten.pdf new file mode 100644 index 0000000..12ef8c5 Binary files /dev/null and b/src/assets/pdf/ten.pdf differ diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts index 07e7dd7..023799e 100644 --- a/src/stores/themeConfig.ts +++ b/src/stores/themeConfig.ts @@ -20,7 +20,7 @@ export const useThemeConfig = defineStore('themeConfig', { // 默认 primary 主题颜色 primary: '#11559C', //红色:#DE2910 //蓝色:#11559C //绿色:#057748 // 是否开启深色模式 - isIsDark: false, + isIsDark: true, /** * 顶栏设置 @@ -30,7 +30,7 @@ export const useThemeConfig = defineStore('themeConfig', { // 默认顶栏导航字体颜色 topBarColor: '#000000', // 是否开启顶栏背景颜色渐变 - isTopBarColorGradual: false, + isTopBarColorGradual: true, /** * 菜单设置 @@ -42,7 +42,7 @@ export const useThemeConfig = defineStore('themeConfig', { // 默认菜单高亮背景色 menuBarActiveColor: 'var(--el-color-primary-light-7)', // 是否开启菜单背景颜色渐变 - isMenuBarColorGradual: false, + isMenuBarColorGradual: true, /** * 分栏设置 @@ -125,7 +125,7 @@ export const useThemeConfig = defineStore('themeConfig', { * 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法 */ // 布局切换：可选值""，默认 defaults - layout: 'classic', + layout: 'transverse', /** * 后端控制路由 diff --git a/src/theme/app.scss b/src/theme/app.scss index 27246f9..57d15ad 100644 --- a/src/theme/app.scss +++ b/src/theme/app.scss @@ -336,3 +336,23 @@ body, padding-left: #{$i}px !important; } } +.avatar-uploader .el-upload { + border: 1px dashed var(--el-border-color); + border-radius: 6px; + cursor: pointer; + position: relative; + overflow: hidden; + transition: var(--el-transition-duration-fast); +} + +.avatar-uploader .el-upload:hover { + border-color: var(--el-color-primary); +} + +.el-icon.avatar-uploader-icon { + font-size: 28px; + color: #8c939d; + width: 178px; + height: 178px; + text-align: center; +} \ No newline at end of file diff --git a/src/theme/dark.scss b/src/theme/dark.scss index c6014cb..f378e87 100644 --- a/src/theme/dark.scss +++ b/src/theme/dark.scss @@ -71,6 +71,9 @@ border-color: var(--next-border-color) !important; } } + .el-tag.el-tag--primary { + --el-tag-text-color: var(--next-color-white) !important; + } .el-button--primary, .el-button--info, .el-button--danger, diff --git a/src/utils/request.ts b/src/utils/request.ts index 1f02f14..d0cb49d 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -119,7 +119,7 @@ service.interceptors.response.use( clearAccessTokens(); } else if (serve.code === undefined) { return Promise.resolve(res); - } else if (serve.code !== 200) { + } else if (serve.code != 200) { var message; // 判断 serve.message 是否为对象 if (serve.message && typeof serve.message == 'object') { diff --git a/src/views/HealthLayout/area.vue b/src/views/HealthLayout/area.vue index 6f665e6..6a24cd3 100644 --- a/src/views/HealthLayout/area.vue +++ b/src/views/HealthLayout/area.vue @@ -30,85 +30,10 @@ \ No newline at end of file diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue new file mode 100644 index 0000000..9dcad21 --- /dev/null +++ b/src/views/customer/index.vue @@ -0,0 +1,216 @@ + + + + \ No newline at end of file diff --git a/src/views/customer/info.vue b/src/views/customer/info.vue new file mode 100644 index 0000000..bc73b8b --- /dev/null +++ b/src/views/customer/info.vue @@ -0,0 +1,427 @@ + + + + \ No newline at end of file diff --git a/src/views/health.vue b/src/views/health.vue index 9495fe7..5a4e79f 100644 --- a/src/views/health.vue +++ b/src/views/health.vue @@ -1,14 +1,396 @@ + + \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 181ad60..aa44553 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -65,7 +65,7 @@ :src="item.idView" fit="fit">
- 密封腔湿度{{ item.shi }} + 密封腔湿度{{ m9Msg.humidity }}
@@ -78,15 +78,15 @@
- {{item.top}} + {{m9Msg.top}}
- {{item.center}} + {{m9Msg.center}}
- {{item.bottom}} + {{m9Msg.bottom}}
液氮高度：{{ item.height }} mm @@ -135,7 +135,7 @@
-
系统告警
+
设备状态监控
--> - - - - + + +