Skip to content

M
mes-ui
Commit abe3d120 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents e8b9c548 f2068c4b
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 41 deletions
components/page/dataGrid.vue
View file @ abe3d120
......@@ -277,23 +277,19 @@ export default {
} else {
this.easySearch();
}
// console.warn("this.$refs.main.clientX",this.$refs.main.offsetTop,this.$refs.main.offsetHeight)
if (this.height === 0) {
this.$nextTick(() => {
this.tableHeight = this.$refs.main.offsetHeight;
if (this.tableHeight < 300) {
this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-200;
}
// console.warn("this.$refs.main.VVV",this.tableHeight)
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
console.warn(123)
this.tableHeight = this.$refs.main.offsetHeight;
if (this.tableHeight < 300) {
this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-150;
}
console.warn("this.$refs.main.tableHeight",this.tableHeight)
})();
};
});
......@@ -302,7 +298,6 @@ export default {
}
//注册拖拽事件。
this.$dragging.$on("dragend", e => {
// console.log("dragend",e);
this.saveUserconfig();
});
},
......@@ -328,7 +323,6 @@ export default {
if (this.userConfig) {
var curColumns = [];
var config = JSON.parse(this.userConfig.content);
// console.warn("2:列比对",config)
if (config.length == this.columnsCur.length) {
config.map(u => {
var item = this.columnsCur.filter(c => {
......@@ -339,7 +333,6 @@ export default {
curColumns.push(item[0]);
}
});
// console.warn("3:初始化列")
this.columnsCur = curColumns;
}
}
......@@ -369,7 +362,6 @@ export default {
if (r.success) {
if (r.result.length == 1) {
this.userConfig = r.result[0];
// console.warn("1:加载用户配置")
this.columnInit();
}
if (!this.configLoad) {
......
pages/dncmnc/mnc/index.vue
View file @ abe3d120
......@@ -19,28 +19,28 @@
<img src="../image/guan.png" alt="">
<div class="top_text">
<p>关机状态</p>
<p><b>123</b></p>
<p><b>1</b></p>
</div>
</div>
<div class="search_item search_item02" @click="filterData()">
<img src="../image/kong.png" alt="">
<div class="top_text">
<p>空闲状态</p>
<p><b>123</b></p>
<p><b>1</b></p>
</div>
</div>
<div class="search_item search_item03" @click="filterData()">
<img src="../image/guz.png" alt="">
<div class="top_text">
<p>故障状态</p>
<p><b>123</b></p>
<p><b>1</b></p>
</div>
</div>
<div class="search_item search_item04" @click="filterData()">
<img src="../image/stay.png" alt="">
<div class="top_text">
<p>运行状态</p>
<p><b>123</b></p>
<p><b>10</b></p>
</div>
</div>
</div>
......@@ -64,7 +64,7 @@
<Ellipsis :text="row.productName" :lines="1" tooltip transfer />
</Col>
<Col :span="4" class="order-code">
<a>查看详情</a>
<a @click="getImagpage(row)">查看详情</a>
</Col>
<Col :span="4">
<div class="statuBg" :style="tdStyle(row.statu)"></div>
......@@ -123,7 +123,7 @@ export default {
},
comondata:[
{
productName: "德玛吉235550",
productName: "受电弓",
statu: "空闲",
productUrl:"shebei01.png",
MachineType: "V1-256-16331",
......@@ -131,7 +131,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235536",
productName: "列车轮对设备",
statu: "关机",
productUrl:"shebei02.png",
MachineType: "V1-256-16332",
......@@ -139,7 +139,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "走行部",
statu: "故障",
productUrl:"shebei03.png",
MachineType: "V1-256-16333",
......@@ -147,7 +147,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "物流系统",
statu: "运行中",
productUrl:"shebei04.png",
MachineType: "V1-256-16334",
......@@ -155,7 +155,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "安全联锁",
statu: "运行中",
productUrl:"shebei05.png",
MachineType: "V1-256-16334",
......@@ -163,7 +163,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "智能加注设备",
statu: "运行中",
productUrl:"shebei06.png",
MachineType: "V1-256-16334",
......@@ -171,7 +171,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "列车自动清洗机",
statu: "运行中",
productUrl:"shebei07.png",
MachineType: "V1-256-16334",
......@@ -179,7 +179,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "架车机",
statu: "运行中",
productUrl:"shebei08.png",
MachineType: "V1-256-16334",
......@@ -187,7 +187,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "不轮落旋床",
statu: "运行中",
productUrl:"shebei09.png",
MachineType: "V1-256-16334",
......@@ -195,7 +195,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "牵引电机试验台",
statu: "运行中",
productUrl:"shebei10.png",
MachineType: "V1-256-16334",
......@@ -203,7 +203,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "车辆阀类试验台",
statu: "运行中",
productUrl:"shebei11.png",
MachineType: "V1-256-16334",
......@@ -211,7 +211,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "辅助逆变向试验台",
statu: "运行中",
productUrl:"shebei12.png",
MachineType: "V1-256-16334",
......@@ -219,7 +219,7 @@ export default {
MachineIp: "1231-111-26012",
information: "V-5633-12112",
},{
productName: "德玛吉235537",
productName: "空调负载试验台",
statu: "运行中",
productUrl:"shebei13.png",
MachineType: "V1-256-16334",
......@@ -353,7 +353,6 @@ export default {
},
getImagpage(rowDta){
console.log(rowDta)
// this.$router.push("/dncmnc/mnc/monitoring");
this.$router.push({
path: "/dncmnc/mnc/monitoring",
query: { imgData: rowDta }
......
pages/dncmnc/mnc/monitoring.vue
View file @ abe3d120
......@@ -19,11 +19,11 @@
</Col>
<Col span="14">
<div class="set_masage">
<p>设备名称：德玛吉235537</p>
<p>设备类型：V1-256-16334</p>
<p>设备编码：JCBM-06224</p>
<p>设备IP：1231-111-26012</p>
<p>系统信息：V-5633-12112</p>
<p>设备名称：{{formData.productName}}</p>
<p>设备类型：{{formData.MachineType}}</p>
<p>设备编码：{{formData.MachineCode}}</p>
<p>设备IP：{{formData.MachineIp}}</p>
<p>系统信息：{{formData.information}}</p>
</div>
</Col>
</Row>
......@@ -35,7 +35,7 @@
<p class="set_top">当前任务信息</p>
<div class="set_card_body">
<div class="set_masage">
<p>当前程序号：德玛吉235537</p>
<p>当前程序号：德玛吉程序235537</p>
<p>零件号：V1-256-16334</p>
<p>加工工序号：JCBM-06224</p>
<p>当前任务号：RWBH-0617-001</p>
......@@ -76,8 +76,11 @@
<Row>
<Col span="9">
<div class="set_img statu_box">
<img src="../image/guz.png" alt="">
<p>故障</p>
<img v-if="formData.statu=='关机'" src="../image/guan.png" alt="">
<img v-else-if="formData.statu=='空闲'" src="../image/kong.png" alt="">
<img v-else-if="formData.statu=='故障'" src="../image/guz.png" alt="">
<img v-else src="../image/stay.png" alt="">
<p>{{formData.statu}}</p>
</div>
</Col>
<Col span="15">
......@@ -177,7 +180,7 @@ export default {
},
data(){
return{
formData:this.$router.currentRoute.query
formData:this.$router.currentRoute.query.imgData
};
},
methods:{
......@@ -187,7 +190,7 @@ export default {
this.$router.push("/dncmnc/mnc");
},
getUrl() {
let url = this.formData.imgData.productUrl
let url = this.formData.productUrl
let tempUrl = "";
if (url && url.length > 0) {
// tempUrl = this.downUrl + url;
......
pages/materiel/masterData/add.vue
View file @ abe3d120
......@@ -86,7 +86,7 @@ export default {
arr: [],
entity: {
code: 0,
status: 0,
status: this.nodeInfo.status == 1 ? 3 : 0, //status==1的时候，保存物料直接传status=3
version: 0,
codeRuleId: this.nodeInfo.codeRuleId,
categoryId: this.nodeInfo.categoryId, //左侧树点击的id
......
pages/materiel/masterData/api.js
View file @ abe3d120
......@@ -32,4 +32,7 @@ export default {
batchstart(params) {
return Api.post(`${workflowUrl}/instance/batchstart`, params); //送审
},
getbyid(params) {
return Api.get(`${workflowUrl}/schema/getbyid`, params); //流程
},
}
\ No newline at end of file
pages/materiel/masterData/masterData.vue
View file @ abe3d120
......@@ -184,13 +184,17 @@ export default {
attrs: { oprate: "edit" },
on: { click: () => this.send(params.row) }
},
params.row.status == 0 || params.row.status == 1 ? "送审" : ""
(params.row.status == 0 || params.row.status == 1) &&
status == 0
? "送审"
: ""
)
]);
}
}
], //基础咧
cols: [] //
cols: [], //
status: null
};
},
async fetch({ store, params }) {
......@@ -203,6 +207,12 @@ export default {
} else {
this.initCols();
}
Api.getbyid({
id: "b6303ddc-8b5e-40a3-a51b-294657d1d913"
}).then(r => {
this.status = r.result.status; //status为0的话为启用，有送审，为1的话，流程是禁用的，没有送审按钮
this.nodeInfo.status = this.status;
});
},
mounted() {
window.onresize = () => {
......
pages/workflow/process/index.vue
View file @ abe3d120
......@@ -268,7 +268,7 @@ export default {
})
},
remove(id) {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: id}).then((r) => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment