Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
52aa3b167b
|
|
@ -1533,12 +1533,22 @@ const routes = [
|
|||
name: "yicipao",
|
||||
path: "/wpm_gx/yicipao",
|
||||
meta: {
|
||||
title: "一次抛",
|
||||
title: "外协一次抛",
|
||||
// icon: "el-icon-cellphone",
|
||||
perms: ["wpm_ycp"],
|
||||
},
|
||||
component: "wpm_gx/yicipao",
|
||||
},
|
||||
{
|
||||
name: "yicipao2",
|
||||
path: "/wpm_gx/yicipao2",
|
||||
meta: {
|
||||
title: "磨抛一次抛",
|
||||
// icon: "el-icon-cellphone",
|
||||
perms: ["wpm_ycp"],
|
||||
},
|
||||
component: "wpm_gx/yicipao2",
|
||||
},
|
||||
{
|
||||
name: "saobianb",
|
||||
path: "/wpm_gx/saobianb",
|
||||
|
|
|
|||
|
|
@ -161,9 +161,9 @@
|
|||
</div>
|
||||
<div class="itemBody">
|
||||
<video width="100%" height="100%" autoplay controls loop>
|
||||
<!-- <source :src="videoUrl" type="video/mp4"> -->
|
||||
<source src="img/gx/gx_video.mp4" type="video/mp4">
|
||||
</video>
|
||||
<!-- <img src="img/v_mask.png" style="height: 400px;width:620px;margin-left: 25px;"/> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexItem newsFlexItem">
|
||||
|
|
@ -172,11 +172,12 @@
|
|||
<div>宣传公告</div>
|
||||
</div>
|
||||
<div class="itemBody">
|
||||
<div class="viewsItem">
|
||||
<div class="viewsItem" v-for="articleItem in articleList" :key="articleItem.id">
|
||||
<div class="viewsItem_wrap">
|
||||
<img style="float: left;" class="viewsItem_img" src="img/gz_logo.png">
|
||||
<!-- <img style="float: left;" class="viewsItem_img" src="img/gz_logo.png"> -->
|
||||
<img style="float: left;" class="viewsItem_img" :src="articleItem.poster">
|
||||
<article>
|
||||
紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，筑牢“防护网”，紧绷“安全弦”，筑牢“防护网”，光芯科技开展“五一”节前安全生产大检查，筑牢“防护网”
|
||||
{{ articleItem.content }}
|
||||
</article>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -383,6 +384,7 @@ BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
|
|||
"./draco_decoder_gltf.js";
|
||||
import "babylonjs-loaders";
|
||||
import "animate.css";
|
||||
import baseUrl from "@/config";
|
||||
const configData={
|
||||
header : ['物料批次','未加工','进行中','已完成','合格数'],
|
||||
headerBGC : '#0a3f44',
|
||||
|
|
@ -538,6 +540,7 @@ export default {
|
|||
resizeTimeout: null,
|
||||
loadedPercent: 0,
|
||||
percentage: 25,
|
||||
baseUrl: baseUrl.HOST_URL,
|
||||
updateTime: "2023-08-17 16:00:00",
|
||||
//当前时间
|
||||
currentTime: "",
|
||||
|
|
@ -686,6 +689,8 @@ export default {
|
|||
options13:{},
|
||||
options14:{},
|
||||
options15:{},
|
||||
articleList:[],
|
||||
videoUrl:'',
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -718,10 +723,11 @@ export default {
|
|||
that.addListener();
|
||||
that.setIntervalFun();
|
||||
that.getQulity();
|
||||
that.getArticles();
|
||||
that.myChart = echarts.init(document.getElementById('eqPieChart'));
|
||||
that.myChart.setOption(that.option_eq);
|
||||
let index2 = 0;
|
||||
this.chartInterval2 = setInterval(function () {
|
||||
that.chartInterval2 = setInterval(function () {
|
||||
if (index2 < that.option_eq.series.data.length) {
|
||||
that.myChart.dispatchAction({
|
||||
type: "downplay",
|
||||
|
|
@ -744,6 +750,25 @@ export default {
|
|||
}, 3000);
|
||||
},
|
||||
methods: {
|
||||
//获取公告和视频
|
||||
getArticles(){
|
||||
let that = this;
|
||||
that.$API.cms.article.list.req({page:0}).then((res) => {
|
||||
if(res.length>0){
|
||||
let articleList = [],videoList = [];
|
||||
res.forEach((item)=>{
|
||||
if(item.video == ''){
|
||||
articleList.push(item);
|
||||
}else{
|
||||
videoList.push(item);
|
||||
}
|
||||
})
|
||||
that.articleList = articleList.slice(0,2);
|
||||
that.videoUrl = that.baseUrl+videoList[0].video;
|
||||
}
|
||||
})
|
||||
},
|
||||
//获取质量分析饼状图数据
|
||||
getQulity(){
|
||||
let that = this;
|
||||
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
|
||||
|
|
@ -798,6 +823,7 @@ export default {
|
|||
}
|
||||
});
|
||||
},
|
||||
//底部轮播定时
|
||||
setIntervalFun(){
|
||||
let that = this;
|
||||
that.scrollInterval = setInterval(() => {
|
||||
|
|
@ -811,6 +837,7 @@ export default {
|
|||
document.getElementById("scroll").style.left = lefts +'px';
|
||||
},6000)
|
||||
},
|
||||
//时间
|
||||
showTime() {
|
||||
this.currentTime = this.$TOOL.dateFormat(new Date(), "hh:mm:ss");
|
||||
this.currentWeek = this.$TOOL.dateFormat(new Date(), "week");
|
||||
|
|
@ -819,6 +846,7 @@ export default {
|
|||
"yyyy年MM月dd日"
|
||||
);
|
||||
},
|
||||
//屏幕监听
|
||||
addListener() {
|
||||
let that = this;
|
||||
window.addEventListener("resize", function () {
|
||||
|
|
@ -835,6 +863,7 @@ export default {
|
|||
}, 300); // 延迟 300 毫秒，可以根据需要调整
|
||||
});
|
||||
},
|
||||
//初始化模型容器大小
|
||||
initDomStyle() {
|
||||
let that = this;
|
||||
// 获取窗口的总高度
|
||||
|
|
@ -857,6 +886,7 @@ export default {
|
|||
that.engine.resize();
|
||||
}
|
||||
},
|
||||
//更新图表数据
|
||||
resizeChart(name) {
|
||||
// 根据name resize chart
|
||||
var myChart = echarts.getInstanceByDom(
|
||||
|
|
@ -866,6 +896,7 @@ export default {
|
|||
myChart.resize();
|
||||
}
|
||||
},
|
||||
//获取日任务和日/周/月产量
|
||||
getTaskNumber(){
|
||||
let that = this;
|
||||
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
|
||||
|
|
@ -1061,6 +1092,7 @@ export default {
|
|||
deepCopy(obj) {
|
||||
return JSON.parse(JSON.stringify(obj));
|
||||
},
|
||||
//获取所有工段
|
||||
getMgroup(){
|
||||
let that = this;
|
||||
that.$API.mtm.mgroup.list.req({page:0}).then((res) => {
|
||||
|
|
@ -1072,6 +1104,7 @@ export default {
|
|||
}
|
||||
})
|
||||
},
|
||||
//获取工序批次数据
|
||||
getProcessDatas(name,index){
|
||||
let that = this;
|
||||
let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
|
||||
|
|
@ -1099,6 +1132,7 @@ export default {
|
|||
}
|
||||
});
|
||||
},
|
||||
//获取工序近七天的柱状图数据
|
||||
getProcessCount(name,index){
|
||||
let that = this;
|
||||
let optionKey = 'options'+index;
|
||||
|
|
@ -1430,6 +1464,12 @@ export default {
|
|||
article{
|
||||
margin-top: 5px;
|
||||
text-indent: 2em;
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 5; /* 限制显示 5 行 */
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
}
|
||||
|
||||
/deep/ .header-item{
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
|
||||
@change="handleQuery"></el-option>
|
||||
</el-select> -->
|
||||
<el-select
|
||||
<!-- <el-select
|
||||
v-model="query.is_deleted"
|
||||
placeholder="筛选"
|
||||
@change="handleQuery"
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
>
|
||||
<el-option label="在用" :value="false"></el-option>
|
||||
<el-option label="已删" :value="true"></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<el-input v-model="form.model" placeholder="规格型号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="设备状态">
|
||||
<el-select style="width: 100%" v-model="form.state" placeholder="请选择">
|
||||
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
|
||||
|
|
@ -61,18 +61,18 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24">
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="设备分类">
|
||||
<el-select v-model="form.cate" placeholder="所属大类" clearable style="width: 100%">
|
||||
<el-option v-for="item in cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="8" :sm="24">
|
||||
<!-- <el-col :md="8" :sm="24">
|
||||
<el-form-item label="是否删除">
|
||||
<el-switch v-model="form.is_deleted" style="--el-switch-on-color: #FF0000;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<el-divider v-if="form.type == 50"/>
|
||||
<el-row v-if="form.type == 50">
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
|
||||
@change="handleQuery"></el-option>
|
||||
</el-select> -->
|
||||
<el-select
|
||||
<!-- <el-select
|
||||
v-model="query.is_deleted"
|
||||
placeholder="筛选"
|
||||
@change="handleQuery"
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
>
|
||||
<el-option label="在用" :value="false"></el-option>
|
||||
<el-option label="已删" :value="true"></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
|
||||
@change="handleQuery"></el-option>
|
||||
</el-select> -->
|
||||
<el-select
|
||||
<!-- <el-select
|
||||
v-model="query.is_deleted"
|
||||
placeholder="筛选"
|
||||
@change="handleQuery"
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
>
|
||||
<el-option label="在用" :value="false"></el-option>
|
||||
<el-option label="已删" :value="true"></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'">新增</el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-select
|
||||
<!-- <el-select
|
||||
v-model="query.is_deleted"
|
||||
placeholder="筛选"
|
||||
@change="handleQuery"
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
>
|
||||
<el-option label="在用" :value="false"></el-option>
|
||||
<el-option label="已删" :value="true"></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="margin-right: 5px;"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"
|
||||
@change="handleQuery"></el-option>
|
||||
</el-select> -->
|
||||
<el-select
|
||||
<!-- <el-select
|
||||
v-model="query.is_deleted"
|
||||
placeholder="筛选"
|
||||
@change="handleQuery"
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
>
|
||||
<el-option label="在用" :value="false"></el-option>
|
||||
<el-option label="已删" :value="true"></el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
<el-input v-model="query.search" placeholder="设备名称/编号" clearable style="width:200px"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -59,6 +59,18 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :md="12" :sm="24">
|
||||
<el-form-item label="批次序号" prop="qp_num">
|
||||
<el-input-number
|
||||
v-model="form.qp_num"
|
||||
:min="0"
|
||||
:max="99"
|
||||
placeholder="该设备的第几炉"
|
||||
class="width100"
|
||||
controls-position="right"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
<el-col :md="12" :sm="24">
|
||||
<el-form-item label="开始时间" prop="work_start_time">
|
||||
<el-date-picker
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ export default {
|
|||
tableHieght: 200,
|
||||
options: ["日志", "交接记录", "库存","入库记录"],
|
||||
values: "日志",
|
||||
mgroupName: "一次抛",
|
||||
mgroupName: "外协一次抛",
|
||||
mgroupId: "",
|
||||
};
|
||||
},
|
||||
|
|
|
|||
|
|
@ -0,0 +1,64 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<el-segmented
|
||||
v-model="values"
|
||||
:options="options"
|
||||
size="default"
|
||||
></el-segmented>
|
||||
</el-header>
|
||||
<el-main id="elMain" class="nopadding">
|
||||
<!-- 日志 -->
|
||||
<mlogs
|
||||
v-if="values == '日志'"
|
||||
:mgroupName="mgroupName"
|
||||
style="height: 60%"
|
||||
></mlogs>
|
||||
<mtask
|
||||
v-if="values == '日志'"
|
||||
:mgroupName="mgroupName"
|
||||
style="height: 40%"
|
||||
></mtask>
|
||||
<!-- 交接记录 -->
|
||||
<handover
|
||||
v-else-if="values == '交接记录'"
|
||||
:mgroupName="mgroupName"
|
||||
></handover>
|
||||
<!-- 库存 -->
|
||||
<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
|
||||
<record v-else :mgroupName="mgroupName"></record>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import inm from "./inm.vue";
|
||||
import mlogs from "./mlogs.vue";
|
||||
import mtask from "./mtask.vue";
|
||||
import handover from "./handover.vue";
|
||||
import record from "./inmrecord.vue";
|
||||
export default {
|
||||
components: { inm, mlogs, mtask, handover,record },
|
||||
data() {
|
||||
return {
|
||||
tableHieght: 200,
|
||||
options: ["日志", "交接记录", "库存","入库记录"],
|
||||
values: "日志",
|
||||
mgroupName: "磨抛一次抛",
|
||||
mgroupId: "",
|
||||
};
|
||||
},
|
||||
created() {},
|
||||
mounted() {
|
||||
let that = this;
|
||||
let height = document.getElementById("elMain").clintHeight / 2;
|
||||
that.tableHieght = height;
|
||||
},
|
||||
methods: {
|
||||
handleChange(value) {
|
||||
this.value = value;
|
||||
console.log("Selected value:", value);
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue