projects/mescc/zjl #14

Merged
juzi merged 5 commits from projects/mescc/zjl into projects/mescc/develop 2024-05-11 11:16:38 +08:00
6 changed files with 76 additions and 29 deletions
Showing only changes of commit ca21a0cbed - Show all commits

View File

@ -30,3 +30,19 @@ export function getProduceDataDetail(data){
query: 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
})
}

BIN
src/assets/images/login.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 KiB

View File

@ -133,8 +133,8 @@ $base1px: 0.15vh; // 1px / 1080px;
width: 100%; width: 100%;
clear: both; clear: both;
position: relative; position: relative;
top: calc(56 * #{$base1px}); top: calc(#{$base1px});
height: calc(128 * #{$base1px}); height: calc(100 * #{$base1px});
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -189,7 +189,7 @@ $base1px: 0.15vh; // 1px / 1080px;
height: calc(16 * 0.12vh); height: calc(16 * 0.12vh);
line-height: calc(16 * 0.12vh); line-height: calc(16 * 0.12vh);
font-size: calc(12 * 0.12vh); font-size: calc(12 * 0.12vh);
color: #8c8c8c; color: #C7C7C7;
a, a,
a:hover, a:hover,

View File

@ -17,7 +17,35 @@ export default {
headerBGC: "rgba(0, 106, 205, 0.22)", headerBGC: "rgba(0, 106, 205, 0.22)",
oddRowBGC: "rgba(0, 106, 205, 0.22)", oddRowBGC: "rgba(0, 106, 205, 0.22)",
evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)", evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
data: [ data: [],
rowNum: 12,
waitTime: 3000,
columnWidth: [50],
align: ["center"],
carousel: "page",
},
};
},
mounted() {
this.getTableList();
this.tableReset();
window.addEventListener("resize", this.tableReset);
},
methods: {
tableReset() {
this.aa = false;
debounce(() => {
this.initTable();
}, 500)();
},
initTable() {
this.aa = true;
},
getTableList() {
let _this = this;
setTimeout(
(function name() {
_this.config.data = [
["1", "行1列1", "行1列2", "行1列3", "50%"], ["1", "行1列1", "行1列2", "行1列3", "50%"],
["2", "行2列1", "行2列2", "行2列3", "50%"], ["2", "行2列1", "行2列2", "行2列3", "50%"],
["3", "行3列1", "行3列2", "行3列3", "50%"], ["3", "行3列1", "行3列2", "行3列3", "50%"],
@ -38,28 +66,11 @@ export default {
["18", "行18列1", "行18列2", "行18列3", "50%"], ["18", "行18列1", "行18列2", "行18列3", "50%"],
["19", "行19列1", "行19列2", "行19列3", "50%"], ["19", "行19列1", "行19列2", "行19列3", "50%"],
["20", "行20列1", "行20列2", "行20列3", "50%"], ["20", "行20列1", "行20列2", "行20列3", "50%"],
], ];
rowNum: 12, })(),
waitTime: 3000, 2000
columnWidth: [50], );
align: ["center"],
carousel: "page",
},
};
},
mounted() {
this.tableReset();
window.addEventListener("resize", this.tableReset);
},
methods: {
tableReset() {
this.aa = false;
debounce(() => {
this.initTable(); this.initTable();
}, 500)();
},
initTable() {
this.aa = true;
}, },
}, },
}; };

View File

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

View File

@ -9,7 +9,7 @@
class="welcome" class="welcome"
style=" style="
position: absolute; position: absolute;
top: 15%; top: 12%;
left: 20%; left: 20%;
user-select: none; user-select: none;
display: flex; display: flex;
@ -51,6 +51,11 @@
向世界先进水平挑战为人类社会文明做贡献 向世界先进水平挑战为人类社会文明做贡献
</p> </p>
</div> </div>
<img
src="../assets/images/login.png"
style="position: absolute; top: 30%; left: 15%; width: 40vw"
alt=""
/>
</div> </div>
<!-- 表单 --> <!-- 表单 -->
<div class="field"> <div class="field">
@ -64,7 +69,7 @@
style="" style=""
class="cnbm_logo" class="cnbm_logo"
/> />
<h3 class="title" style="margin: 16px 0;">集团工业互联网平台</h3> <h3 class="title" style="margin: 16px 0">发电玻璃智能管控平台</h3>
</h2> </h2>
<h2 class="pc-title" style=""> <h2 class="pc-title" style="">
<img <img
@ -75,7 +80,9 @@
style="" style=""
class="cnbm_logo" 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> </h2>
<!-- 表单 --> <!-- 表单 -->
@ -164,7 +171,7 @@
</div> </div>
<!-- footer --> <!-- footer -->
<div class="footer"> <div class="footer">
Copyright © 2023 中建材智能自动化研究院有限公司 All Rights Reserved. 版权所有中建材智能自动化研究院有限公司&nbsp;&nbsp;&nbsp;版本1.0
</div> </div>
</div> </div>
</div> </div>