diff --git a/.env.dev b/.env.dev
index a3c6d41..2cd7221 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,8 +12,8 @@ ENV = 'development'
VUE_APP_TITLE = 芋道管理系统
# 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.61:48080'
-# VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
+# VUE_APP_BASE_API = 'http://192.168.1.61:48080'
+VUE_APP_BASE_API = 'http://glass.kszny.picaiba.com'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/package.json b/package.json
index d920609..4809466 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
},
"dependencies": {
"@babel/parser": "7.18.4",
+ "@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "0.4.0",
"axios": "^1.6.8",
"clipboard": "2.0.8",
diff --git a/src/api/produceData/index.js b/src/api/produceData/index.js
index 3df70d9..3f01035 100644
--- a/src/api/produceData/index.js
+++ b/src/api/produceData/index.js
@@ -30,3 +30,19 @@ export function getProduceDataDetail(data){
query: data
})
}
+
+// export function cockpitDataMonitor(data) {
+// return request({
+// url: '/ip/prod-output/cockpitDataMonitor',
+// method: 'post',
+// data: data
+// })
+// }
+
+export function cockpitDataMonitor(query) {
+ return request({
+ url: 'https://restapi.amap.com/v3/weather/weatherInfo?key=95bdbdc1c387a170105f84cd416c4c9f&city=110108',
+ method: 'get',
+ query: query
+ })
+}
diff --git a/src/assets/images/companyData/energy.png b/src/assets/images/companyData/energy.png
new file mode 100644
index 0000000..e89185c
Binary files /dev/null and b/src/assets/images/companyData/energy.png differ
diff --git a/src/assets/images/companyData/order.png b/src/assets/images/companyData/order.png
new file mode 100644
index 0000000..a0429a9
Binary files /dev/null and b/src/assets/images/companyData/order.png differ
diff --git a/src/assets/images/companyData/prod-minor.png b/src/assets/images/companyData/prod-minor.png
new file mode 100644
index 0000000..91220d9
Binary files /dev/null and b/src/assets/images/companyData/prod-minor.png differ
diff --git a/src/assets/images/companyData/store.png b/src/assets/images/companyData/store.png
new file mode 100644
index 0000000..d96dc6d
Binary files /dev/null and b/src/assets/images/companyData/store.png differ
diff --git a/src/assets/images/login.png b/src/assets/images/login.png
new file mode 100644
index 0000000..63818b0
Binary files /dev/null and b/src/assets/images/login.png differ
diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss
index 8326bc7..3c81154 100644
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@@ -133,8 +133,8 @@ $base1px: 0.15vh; // 1px / 1080px;
width: 100%;
clear: both;
position: relative;
- top: calc(56 * #{$base1px});
- height: calc(128 * #{$base1px});
+ top: calc(#{$base1px});
+ height: calc(100 * #{$base1px});
display: flex;
align-items: center;
justify-content: center;
@@ -189,7 +189,7 @@ $base1px: 0.15vh; // 1px / 1080px;
height: calc(16 * 0.12vh);
line-height: calc(16 * 0.12vh);
font-size: calc(12 * 0.12vh);
- color: #8c8c8c;
+ color: #C7C7C7;
a,
a:hover,
diff --git a/src/main.js b/src/main.js
index a3b0f0b..1baa77b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,6 +18,7 @@ import store from "./store";
import router from "./router";
import directive from "./directive"; // directive
import plugins from "./plugins"; // plugins
+import { scrollBoard } from '@jiaminghi/data-view'
import "./assets/icons"; // icon
import "./permission"; // permission control
@@ -69,6 +70,7 @@ Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
Vue.use(CodeBrickZj);
+Vue.use(scrollBoard)
// Form Generator 组件需要使用到 tinymce
import Tinymce from "@/components/tinymce/index.vue";
Vue.component("tinymce", Tinymce);
diff --git a/src/views/copilot/components/FactoryDataHeader.vue b/src/views/copilot/components/FactoryDataHeader.vue
new file mode 100644
index 0000000..cafa9bb
--- /dev/null
+++ b/src/views/copilot/components/FactoryDataHeader.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
diff --git a/src/views/copilot/components/FactorySelect.vue b/src/views/copilot/components/FactorySelect.vue
new file mode 100644
index 0000000..b46fd14
--- /dev/null
+++ b/src/views/copilot/components/FactorySelect.vue
@@ -0,0 +1,137 @@
+
+
+
+ {{ companyName }}
+
+
+
+
+
+
+
diff --git a/src/views/copilot/factoryData/assets/images/bipv.png b/src/views/copilot/factoryData/assets/images/bipv.png
new file mode 100644
index 0000000..42ca506
Binary files /dev/null and b/src/views/copilot/factoryData/assets/images/bipv.png differ
diff --git a/src/views/copilot/factoryData/assets/images/chip.png b/src/views/copilot/factoryData/assets/images/chip.png
new file mode 100644
index 0000000..64ada6f
Binary files /dev/null and b/src/views/copilot/factoryData/assets/images/chip.png differ
diff --git a/src/views/copilot/factoryData/assets/images/fto.png b/src/views/copilot/factoryData/assets/images/fto.png
new file mode 100644
index 0000000..c7e520c
Binary files /dev/null and b/src/views/copilot/factoryData/assets/images/fto.png differ
diff --git a/src/views/copilot/factoryData/assets/images/std.png b/src/views/copilot/factoryData/assets/images/std.png
new file mode 100644
index 0000000..c206420
Binary files /dev/null and b/src/views/copilot/factoryData/assets/images/std.png differ
diff --git a/src/views/copilot/factoryData/components/Container.vue b/src/views/copilot/factoryData/components/Container.vue
new file mode 100644
index 0000000..59349a7
--- /dev/null
+++ b/src/views/copilot/factoryData/components/Container.vue
@@ -0,0 +1,232 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ title }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/copilot/factoryData/components/ContainerIcon.vue b/src/views/copilot/factoryData/components/ContainerIcon.vue
new file mode 100644
index 0000000..6518242
--- /dev/null
+++ b/src/views/copilot/factoryData/components/ContainerIcon.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/copilot/factoryData/components/Energy.vue b/src/views/copilot/factoryData/components/Energy.vue
new file mode 100644
index 0000000..5339644
--- /dev/null
+++ b/src/views/copilot/factoryData/components/Energy.vue
@@ -0,0 +1,371 @@
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
diff --git a/src/views/copilot/factoryData/components/Order.vue b/src/views/copilot/factoryData/components/Order.vue
new file mode 100644
index 0000000..5515fe4
--- /dev/null
+++ b/src/views/copilot/factoryData/components/Order.vue
@@ -0,0 +1,77 @@
+
+
+
+
diff --git a/src/views/copilot/factoryData/components/ProdMonitor.vue b/src/views/copilot/factoryData/components/ProdMonitor.vue
new file mode 100644
index 0000000..432648b
--- /dev/null
+++ b/src/views/copilot/factoryData/components/ProdMonitor.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+ 玻璃类型
+ FTO投入
+
+
+ 投入数量
+ 8391222
+
+
+
+
+
+
+
+
+
+ 玻璃类型
+ 标准组检产量
+
+
+ 良品数量
+ 740
+
+
+
+
+
+
+ 生产数量
+ 783
+
+
+ 良品率
+ 96%
+
+
+
+
+
+
+
+
+
+
+
+ 玻璃类型
+ 芯片产量
+
+
+ 良品数量
+ 740
+
+
+
+
+
+
+ 生产数量
+ 783
+
+
+ 良品率
+ 96%
+
+
+
+
+
+
+
+
+
+
+
+ 玻璃类型
+ BIPV产量
+
+
+ 良品数量
+ 740
+
+
+
+
+
+
+ 生产数量
+ 783
+
+
+ 良品率
+ 96%
+
+
+
+
+
+
+
+
diff --git a/src/views/copilot/factoryData/components/Store.vue b/src/views/copilot/factoryData/components/Store.vue
new file mode 100644
index 0000000..5b169ff
--- /dev/null
+++ b/src/views/copilot/factoryData/components/Store.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
diff --git a/src/views/copilot/factoryData/index.vue b/src/views/copilot/factoryData/index.vue
new file mode 100644
index 0000000..c0c0d1d
--- /dev/null
+++ b/src/views/copilot/factoryData/index.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
diff --git a/src/views/login.vue b/src/views/login.vue
index ac79cf5..d1f5c62 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,7 @@
class="welcome"
style="
position: absolute;
- top: 15%;
+ top: 12%;
left: 20%;
user-select: none;
display: flex;
@@ -51,6 +51,11 @@
向世界先进水平挑战,为人类社会文明做贡献
+
@@ -64,7 +69,7 @@
style=""
class="cnbm_logo"
/>
-
集团工业互联网平台
+
发电玻璃智能管控平台
- 集团工业互联网平台
+ 发电玻璃智能管控平台
@@ -164,7 +171,7 @@
diff --git a/yarn.lock b/yarn.lock
index 7ed8aa8..989aea4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -972,6 +972,13 @@
dependencies:
regenerator-runtime "^0.14.0"
+"@babel/runtime@^7.5.5":
+ version "7.24.5"
+ resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
+ integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
+ dependencies:
+ regenerator-runtime "^0.14.0"
+
"@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.24.0":
version "7.24.0"
resolved "https://registry.npmmirror.com/@babel/template/-/template-7.24.0.tgz"
@@ -1064,6 +1071,51 @@
wrap-ansi "^8.1.0"
wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+"@jiaminghi/bezier-curve@*":
+ version "0.0.9"
+ resolved "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz#5196aca93c8b061a612b4c3eabcedf9490cef6ee"
+ integrity sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+
+"@jiaminghi/c-render@^0.4.3":
+ version "0.4.3"
+ resolved "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz#982ebd8f71b443bb9507834227834973ebd9b6d8"
+ integrity sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ "@jiaminghi/bezier-curve" "*"
+ "@jiaminghi/color" "*"
+ "@jiaminghi/transition" "*"
+
+"@jiaminghi/charts@*":
+ version "0.2.18"
+ resolved "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz#63ded95200789fc1a1fd04b7fd9e56f58d22d90f"
+ integrity sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ "@jiaminghi/c-render" "^0.4.3"
+
+"@jiaminghi/color@*":
+ version "1.1.3"
+ resolved "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz#a2336750d1266155ffe80375c58c26fdec495611"
+ integrity sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==
+
+"@jiaminghi/data-view@^2.10.0":
+ version "2.10.0"
+ resolved "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz#2146d8fc71b9f24be808238ca050ddb7a4c8949f"
+ integrity sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ "@jiaminghi/charts" "*"
+
+"@jiaminghi/transition@*":
+ version "1.1.11"
+ resolved "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz#576d8af092434b34201eba5eaecc79dd33c8ad8c"
+ integrity sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+
"@jridgewell/gen-mapping@^0.3.5":
version "0.3.5"
resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz"