juzi 4 месяцев назад
Родитель
Сommit
ca21a0cbed
6 измененных файлов: 76 добавлений и 29 удалений
  1. +16
    -0
      src/api/produceData/index.js
  2. Двоичные данные
      src/assets/images/login.png
  3. +3
    -3
      src/assets/styles/login.scss
  4. +33
    -22
      src/views/copilot/factoryData/components/Order.vue
  5. +13
    -0
      src/views/copilot/factoryData/index.vue
  6. +11
    -4
      src/views/login.vue

+ 16
- 0
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
})
}

Двоичные данные
src/assets/images/login.png Просмотреть файл

До После
Ширина: 1580  |  Высота: 1178  |  Размер: 530 KiB

+ 3
- 3
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,


+ 33
- 22
src/views/copilot/factoryData/components/Order.vue Просмотреть файл

@@ -17,28 +17,7 @@ export default {
headerBGC: "rgba(0, 106, 205, 0.22)",
oddRowBGC: "rgba(0, 106, 205, 0.22)",
evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
data: [
["1", "行1列1", "行1列2", "行1列3", "50%"],
["2", "行2列1", "行2列2", "行2列3", "50%"],
["3", "行3列1", "行3列2", "行3列3", "50%"],
["4", "行4列1", "行4列2", "行4列3", "50%"],
["5", "行5列1", "行5列2", "行5列3", "50%"],
["6", "行6列1", "行6列2", "行6列3", "50%"],
["7", "行7列1", "行7列2", "行7列3", "50%"],
["8", "行8列1", "行8列2", "行8列3", "50%"],
["9", "行9列1", "行9列2", "行9列3", "50%"],
["10", "行10列1", "行10列2", "行10列3", "50%"],
["11", "行11列1", "行11列2", "行11列3", "50%"],
["12", "行12列1", "行12列2", "行12列3", "50%"],
["13", "行13列1", "行13列2", "行13列3", "50%"],
["14", "行14列1", "行14列2", "行14列3", "50%"],
["15", "行15列1", "行15列2", "行15列3", "50%"],
["16", "行16列1", "行16列2", "行16列3", "50%"],
["17", "行17列1", "行17列2", "行17列3", "50%"],
["18", "行18列1", "行18列2", "行18列3", "50%"],
["19", "行19列1", "行19列2", "行19列3", "50%"],
["20", "行20列1", "行20列2", "行20列3", "50%"],
],
data: [],
rowNum: 12,
waitTime: 3000,
columnWidth: [50],
@@ -48,6 +27,7 @@ export default {
};
},
mounted() {
this.getTableList();
this.tableReset();
window.addEventListener("resize", this.tableReset);
},
@@ -61,6 +41,37 @@ export default {
initTable() {
this.aa = true;
},
getTableList() {
let _this = this;
setTimeout(
(function name() {
_this.config.data = [
["1", "行1列1", "行1列2", "行1列3", "50%"],
["2", "行2列1", "行2列2", "行2列3", "50%"],
["3", "行3列1", "行3列2", "行3列3", "50%"],
["4", "行4列1", "行4列2", "行4列3", "50%"],
["5", "行5列1", "行5列2", "行5列3", "50%"],
["6", "行6列1", "行6列2", "行6列3", "50%"],
["7", "行7列1", "行7列2", "行7列3", "50%"],
["8", "行8列1", "行8列2", "行8列3", "50%"],
["9", "行9列1", "行9列2", "行9列3", "50%"],
["10", "行10列1", "行10列2", "行10列3", "50%"],
["11", "行11列1", "行11列2", "行11列3", "50%"],
["12", "行12列1", "行12列2", "行12列3", "50%"],
["13", "行13列1", "行13列2", "行13列3", "50%"],
["14", "行14列1", "行14列2", "行14列3", "50%"],
["15", "行15列1", "行15列2", "行15列3", "50%"],
["16", "行16列1", "行16列2", "行16列3", "50%"],
["17", "行17列1", "行17列2", "行17列3", "50%"],
["18", "行18列1", "行18列2", "行18列3", "50%"],
["19", "行19列1", "行19列2", "行19列3", "50%"],
["20", "行20列1", "行20列2", "行20列3", "50%"],
];
})(),
2000
);
this.initTable();
},
},
};
</script>

+ 13
- 0
src/views/copilot/factoryData/index.vue Просмотреть файл

@@ -39,6 +39,7 @@ import ProdMonitor from "./components/ProdMonitor.vue";
import Store from "./components/Store.vue";
import Energy from "./components/Energy.vue";
import Order from "./components/Order.vue";
import { cockpitDataMonitor } from "@/api/produceData";
export default {
name: "FactoryData",
components: {
@@ -119,11 +120,23 @@ export default {
// ];
},
},
mounted() {
this.getMes1();
},
methods: {
updateCompany(obj) {
this.companyId = obj.companyId;
this.companyName = obj.companyName;
},
getMes1() {
// cockpitDataMonitor({
// factorys: ["1"],
// date: 4,
// }).then((res) => {
// console.log(res);
// });
cockpitDataMonitor().then((res) => {});
},
},
};
</script>


+ 11
- 4
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 @@
向世界先进水平挑战,为人类社会文明做贡献
</p>
</div>
<img
src="../assets/images/login.png"
style="position: absolute; top: 30%; left: 15%; width: 40vw"
alt=""
/>
</div>
<!-- 表单 -->
<div class="field">
@@ -64,7 +69,7 @@
style=""
class="cnbm_logo"
/>
<h3 class="title" style="margin: 16px 0;">集团工业互联网平台</h3>
<h3 class="title" style="margin: 16px 0">发电玻璃智能管控平台</h3>
</h2>
<h2 class="pc-title" style="">
<img
@@ -75,7 +80,9 @@
style=""
class="cnbm_logo"
/>
<span style="font-weight: bold; letter-spacing: 1px; font-size: 32px;">集团工业互联网平台</span>
<span style="font-weight: bold; letter-spacing: 1px; font-size: 32px"
>发电玻璃智能管控平台</span
>
</h2>

<!-- 表单 -->
@@ -164,7 +171,7 @@
</div>
<!-- footer -->
<div class="footer">
Copyright © 2023 中建材智能自动化研究院有限公司 All Rights Reserved.
版权所有:中建材智能自动化研究院有限公司&nbsp;&nbsp;&nbsp;版本:1.0
</div>
</div>
</div>


Загрузка…
Отмена
Сохранить