From f378a7f428d26f6a3f38e47c1857d11a0686497a Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 24 十一月 2024 23:28:12 +0800
Subject: [PATCH] 1
---
vue.config.js | 22 ++--
src/views/mdc/first-workpiece.vue | 177 +++++++++++++++++++++++++++++++------------
2 files changed, 138 insertions(+), 61 deletions(-)
diff --git a/src/views/mdc/first-workpiece.vue b/src/views/mdc/first-workpiece.vue
index dacfc3d..47776a2 100644
--- a/src/views/mdc/first-workpiece.vue
+++ b/src/views/mdc/first-workpiece.vue
@@ -10,44 +10,23 @@
<el-main style="height: 100%;" class="timeAnalysis">
<el-card shadow="never" style="height: 100%;" body-style="height: 100%;padding: 0;">
<el-container style="height: 100%;">
- <!-- <el-aside width="300px" style="height: 100%;">
- <el-container>
- <el-main style="padding: 20px;">
- <el-row>
- <el-col style="margin-bottom: 12px;">鏃ユ湡</el-col>
- </el-row>
- <el-row style="margin-top: 14px;">
- <MYTree getAll v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
- </el-row>
- </el-main>
- <el-footer>
- <el-button @click="query" type="primary">鏌ヨ</el-button>
- <exportDialog @export="exportExcel"></exportDialog>
- </el-footer>
- </el-container>
- </el-aside>
- <el-container>
- <el-main style="position: relative;">
-
- </el-main>
- </el-container> -->
<el-aside width="300px" style="height: 100%;">
<el-main style="border-bottom: 1px solid #ccc;">
<el-form ref="form" :model="searchInfo" label-width="80px">
<el-form-item label="闆朵欢鍙�">
- <el-input v-model="searchInfo.test"></el-input>
+ <el-input v-model="searchInfo.partNo"></el-input>
</el-form-item>
- <el-form-item label="鏈哄簭鍙�">
- <el-input v-model="searchInfo.test"></el-input>
+ <el-form-item label="宸ヤ綅缂栧彿">
+ <el-input v-model="searchInfo.workstationName"></el-input>
</el-form-item>
<el-form-item label="寮�濮嬫椂闂�">
- <el-date-picker v-model="searchInfo.time" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
+ <el-date-picker v-model="searchInfo.startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" @change="changeStartDate" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
</el-form-item>
<el-form-item label="缁撴潫鏃堕棿">
- <el-date-picker v-model="searchInfo.time" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
+ <el-date-picker v-model="searchInfo.endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="閫夋嫨鏃ユ湡"></el-date-picker>
</el-form-item>
</el-form>
- <div style="text-align: center;"><el-button type="primary">鏌ヨ</el-button></div>
+ <div style="text-align: center;"><el-button type="primary" @click="searchBtn">鏌ヨ</el-button></div>
</el-main>
<el-main>
<el-radio-group v-model="tabPosition" style="margin-bottom: 12px;">
@@ -61,23 +40,59 @@
<el-main>
<el-table :data="tableData" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="test" label="搴忓彿" width="60"></el-table-column>
- <el-table-column prop="test" label="闆朵欢鍙�" width="80"></el-table-column>
- <el-table-column prop="test" label="宸ュ簭鍙�" width="80"></el-table-column>
- <el-table-column prop="test" label="鐗堟" width="60"></el-table-column>
- <el-table-column prop="test" label="鏈哄簥" width="60"></el-table-column>
- <el-table-column prop="test" label="寮�鏈烘椂闂�" width="80"></el-table-column>
- <el-table-column prop="test" label="缁撴潫鏃堕棿" width="80"></el-table-column>
- <el-table-column prop="test" label="鍗犳満鏃堕棿" width="100"></el-table-column>
- <el-table-column prop="test" label="瑁呭す璋冭瘯鏃堕棿" width="100"></el-table-column>
- <el-table-column prop="test" label="棣栦欢鍒囧墛鏃堕棿" width="100"></el-table-column>
- <el-table-column prop="test" label="棣栦欢鍒囧墛鏃堕棿" width="100"></el-table-column>
- <el-table-column prop="test" label="鏈欢鎷嗗嵏鏃堕棿" width="100"></el-table-column>
- <el-table-column prop="test" label="棣栦欢璁￠噺鏃堕棿" width="100"></el-table-column>
- <el-table-column prop="test" label="鍔犲伐鏃堕棿" width="80"></el-table-column>
- <el-table-column prop="test" label="鍑嗗鏃堕棿" width="80"></el-table-column>
- <el-table-column prop="test" label="鍗曚欢宸ユ椂" width="80"></el-table-column>
- <el-table-column prop="test" label="鏁伴噺" width="60"></el-table-column>
+ <el-table-column prop="index" label="搴忓彿" width="60"></el-table-column>
+ <el-table-column prop="partNo" label="闆朵欢鍙�" width="80"></el-table-column>
+ <el-table-column prop="processNo" label="宸ュ簭鍙�" width="80"></el-table-column>
+ <el-table-column prop="version" label="鐗堟" width="60"></el-table-column>
+ <el-table-column prop="workstationName" label="鏈哄簥" width="100"></el-table-column>
+ <el-table-column prop="startTime" label="寮�鏈烘椂闂�" width="145"></el-table-column>
+ <el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="145"></el-table-column>
+ <el-table-column prop="occupancySecs" label="鍗犳満鏃堕棿" width="100">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.occupancySecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="clampingSecs" label="瑁呭す璋冭瘯鏃堕棿" width="100">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.clampingSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="firstWorkingSecs" label="棣栦欢鍒囧墛鏃堕棿" width="100">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.firstWorkingSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="firstWorkingSecs" label="棣栦欢鍒囧墛鏃堕棿" width="100">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.firstWorkingSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="lastRemoveSecs" label="鏈欢鎷嗗嵏鏃堕棿" width="100">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.lastRemoveSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="firstMeasureSecs" label="棣栦欢璁￠噺鏃堕棿" width="100">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.firstMeasureSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="processingSecs" label="鍔犲伐鏃堕棿" width="80">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.processingSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="prepareSecs" label="鍑嗗鏃堕棿" width="80">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.prepareSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="singleProcessSecs" label="鍗曚欢宸ユ椂" width="80">
+ <template #default="scope">
+ {{ convertSeconds(scope.row.singleProcessSecs || 0) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="amount" label="鏁伴噺" width="60"></el-table-column>
</el-table>
</el-main>
<el-footer>
@@ -105,8 +120,10 @@
data() {
return {
searchInfo: {
- test: "",
- time: ""
+ "endDate": "",
+ "partNo": "",
+ "startDate": "",
+ "workstationName": ""
},
tabPosition: "璁惧缁撴瀯鏍�",
tableData: [],
@@ -114,14 +131,74 @@
}
},
created() {
- var obj = {test:1}
- for(var i=0;i<10;i++) {
- this.tableData.push(obj);
- }
+ // var obj = {test:1}
+ // for(var i=0;i<10;i++) {
+ // this.tableData.push(obj);
+ // }
},
mounted() {
+ //this.getTableData();
},
methods: {
+ convertSeconds(seconds) { //杞崲鏃堕棿
+ // 瀹氫箟鏃堕棿鍗曚綅杞崲鍏崇郴
+ const daysInSeconds = 24 * 60 * 60;
+ const hoursInSeconds = 60 * 60;
+ const minutesInSeconds = 60;
+
+ // 璁＄畻澶╂暟
+ let days = Math.floor(seconds / daysInSeconds);
+ seconds %= daysInSeconds;
+
+ // 璁＄畻灏忔椂鏁�
+ let hours = Math.floor(seconds / hoursInSeconds);
+ seconds %= hoursInSeconds;
+
+ // 璁＄畻鍒嗛挓鏁�
+ let minutes = Math.floor(seconds / minutesInSeconds);
+ seconds %= minutesInSeconds;
+
+ // 鍑嗗缁撴灉鏁扮粍
+ let result = [];
+
+ // 鏍规嵁闇�瑕佹坊鍔犲ぉ鏁板埌缁撴灉鏁扮粍
+ if (days > 0) {
+ result.push(`${days}澶ー);
+ }
+
+ // 鏍规嵁闇�瑕佹坊鍔犲皬鏃舵暟鍒扮粨鏋滄暟缁�
+ if (hours > 0) {
+ result.push(`${hours}灏忔椂`);
+ }
+
+ // 鏍规嵁闇�瑕佹坊鍔犲垎閽熸暟鍒扮粨鏋滄暟缁�
+ if (minutes > 0) {
+ result.push(`${minutes}鍒嗛挓`);
+ }
+
+ // 濮嬬粓娣诲姞绉掓暟鍒扮粨鏋滄暟缁勶紙鍥犱负绉掓暟鎬绘槸鏈夋剰涔夌殑锛�
+ result.push(`${seconds}绉抈);
+
+ // 杩斿洖鏍煎紡鍖栧悗鐨勫瓧绗︿覆
+ return result.join(' ');
+ },
+ changeStartDate(val) {
+ console.log(val,111)
+ },
+ searchBtn() {
+ this.getTableData();
+ },
+ getTableData() {
+ console.log(this.searchInfo,111)
+ this.$HTTP.post('/workinghour/page?current=1&size=20', this.searchInfo).then(res => {
+ if (res.code === 200) {
+ res.data.records.forEach((item,index)=> {
+ item.index = index + 1;
+ })
+ this.tableData = res.data.records;
+ }
+ })
+ },
goFirstWorkDetail() {
this.$router.push({path: `/mdc/first-workpiece-detail`,query: {id:1}})
},
diff --git a/vue.config.js b/vue.config.js
index 1386376..32d65ec 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,23 +23,23 @@
port: process.env.VUE_APP_PORT, //鎸傝浇绔彛
proxy: {
'/api/smart-collect': {
- target: 'http://120.46.212.231:4102',
+ target: 'http://120.46.212.231:5102',
// ws: true,
changeOrigin: true,
pathRewrite: {
'^/api': '/'
}
},
- // '/api/smis/workstation/listDatapointsByWorkstationId': {
- // target: 'http://120.46.212.231:4102',
- // // ws: true,
- // changeOrigin: true,
- // pathRewrite: {
- // '^/api': '/'
- // }
- // },
+ 'workinghour': {
+ target: 'http://120.46.212.231:5102',
+ // ws: true,
+ changeOrigin: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ },
'/api/smis/workstation/saveDatapoints': {
- target: 'http://120.46.212.231:4102',
+ target: 'http://120.46.212.231:5102',
// ws: true,
changeOrigin: true,
pathRewrite: {
@@ -47,7 +47,7 @@
}
},
'/api/smis/workstation/export-dp': {
- target: 'http://120.46.212.231:4102',
+ target: 'http://120.46.212.231:5102',
// ws: true,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3