From 4a6d69f3ff895918b1b8f1e8e9b122ed8fcd5afa Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 24 十一月 2022 17:15:47 +0800
Subject: [PATCH] 1.自动排程实现静态部分
---
src/views/scgl/zdpc.vue | 255 ++++++++++++++++++++++++++------------------------
1 files changed, 131 insertions(+), 124 deletions(-)
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index 2520e2c..d2d20a7 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -40,14 +40,15 @@
ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="(tableHeight-300)+'px'"
+ :height="(tableHeight-400)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:(tableHeight-300)+'px',}"
+ :style="{width: 100+'%',height:(tableHeight-400)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeTop"
+ @row-click="rowClick"
>
<el-table-column
width="50"
@@ -56,10 +57,9 @@
<template slot-scope="{row}">
<el-radio
v-model="radioSelectedId"
- :label="row.id"
- style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRowTop(row.id)"
+ :label="row.AdvaScheId"
/>
+ <!-- @change.native="getCurrentRowTop(row.id)"-->
</template>
</el-table-column>
<el-table-column
@@ -69,60 +69,95 @@
label="搴忓彿"
/>
<el-table-column
- prop="org_code"
+ prop="AdvaSchePiroQue"
label="浼樺厛绾�"
+ width="90"
sortable="custom"
/>
<el-table-column
- prop="org_name"
+ prop="AdvaScheWorkShop"
label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="description"
+ prop="AdvaScheWorkCode"
label="宸ュ崟缂栧彿"
+ min-width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="parentorg_name"
+ prop="AdvaSchePartNumber"
label="浜у搧缂栫爜"
+ min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.AdvaSchePartNumber">{{ row.AdvaSchePartNumber }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePartName"
+ min-width="160"
+ show-tooltip-when-overflow
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePartSpec"
label="浜у搧瑙勬牸"
+ width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaSchePartSpec">{{ row.AdvaSchePartSpec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheQty"
label="鏁伴噺"
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheEndDate"
label="瑕佹眰浜や粯鏃堕棿"
sortable="custom"
+ width="160"
/>
<el-table-column
- prop="lm_user"
- label="浜や粯鐘舵��"
+ prop="AdvaScheStus"
+ label="鎺掔▼鐘舵��"
+ width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaScheStus==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.AdvaScheStus==='SCHED'">宸叉帓绋�</div>
+ </template>
+ </el-table-column>
<el-table-column
- prop="lm_user"
+ prop="AdvaScheBotProcName"
label="鎺掔▼宸ュ簭"
+ width="110"
sortable="custom"
/>
<el-table-column
- prop="lm_user"
+ prop="AdvaSchePCStartDate"
label="璁″垝鎺掔▼鏃堕棿"
+ width="160"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.AdvaSchePCStartDate">{{ row.AdvaSchePCStartDate }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
</el-table>
</div>
@@ -273,9 +308,10 @@
<script>
import Pagination from '@/components/Pagination'
-import { OrganizationSearch } from '@/api/jcsz'
import Test from '@/components/Test'
import dayjs from 'dayjs'
+import { AdvancedSchedulingSearch, OnclickAdvancedSchedulingDevice } from '@/api/scgl'
+import { handleDatetime } from '@/utils/global'
const scaleList = `30,60,240,360`.split(',').map(n => parseInt(n))
const timeList = `0,30,60,120,240,480`.split(',').map(n => parseInt(n))
@@ -297,7 +333,7 @@
wocode: '', // 鐢熶骇宸ュ崟鍙�
partcode: '', // 鐗╂枡缂栫爜
partname: '', // 鐗╂枡鍚嶇О
- prop: 'lm_date', // 鎺掑簭瀛楁
+ prop: 'AdvaScheWorkCode', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -347,7 +383,7 @@
radio: '',
formBottom: {
- value1: ['2022-11-05', '2022-11-12'], // 鎺掔▼鏃ユ湡
+ value1: ['2022-11-24', '2022-11-30'], // 鎺掔▼鏃ユ湡
types: 'N', // 鎺掔▼鏂瑰紡
scale: 60, // 鏃堕棿鍒诲害
times: 0, // 鎹㈠瀷鏃堕棿
@@ -438,7 +474,7 @@
},
'rows': [
{
- 'YearDate': '2022-11-03',
+ 'YearDate': '2022-11-24',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -454,7 +490,7 @@
]
},
{
- 'YearDate': '2022-11-04',
+ 'YearDate': '2022-11-25',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -470,7 +506,7 @@
]
},
{
- 'YearDate': '2022-11-05',
+ 'YearDate': '2022-11-26',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -486,7 +522,7 @@
]
},
{
- 'YearDate': '2022-11-06',
+ 'YearDate': '2022-11-27',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -502,7 +538,7 @@
]
},
{
- 'YearDate': '2022-11-07',
+ 'YearDate': '2022-11-28',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -518,7 +554,7 @@
]
},
{
- 'YearDate': '2022-11-08',
+ 'YearDate': '2022-11-29',
'children': [
{
'AdvaDevicNumber': 'LKFDL_SC-PC029',
@@ -550,7 +586,7 @@
created() {
this.getAdvancedSchedulingSearch()
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
// this.AdvancedSchedulingWorkShop()
this.OnclickAdvancedSchedulingDevice()
},
@@ -563,7 +599,7 @@
},
methods: {
async getAdvancedSchedulingSearch() {
- const res = await OrganizationSearch(this.formTop)
+ const res = await AdvancedSchedulingSearch(this.formTop)
this.tableData = res.data
this.totalTop = res.count
},
@@ -607,6 +643,24 @@
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
+ // 琛岀偣鍑讳簨浠�
+ async rowClick(row, event, column) {
+ this.radioSelectedId = row.AdvaScheId
+
+ const data = {
+ wocode: row.AdvaScheWorkCode,
+ wkshpcode: row.AdvaScheWorkShopid,
+ partcode: row.AdvaSchePartNumber,
+ botproccode: row.AdvaScheBotProcid,
+ startdate: handleDatetime(new Date()),
+ enddate: row.AdvaScheEndDate
+ }
+
+ const res = await OnclickAdvancedSchedulingDevice(data)
+ console.log(res)
+ this.testValue = res
+ },
+
/*
鎺掔▼閮ㄥ垎鐨勬柟娉�
*/
@@ -619,7 +673,7 @@
this.form.page = 1
this.show = false
this.radio = ''
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
resetFormcx() {
this.$nextTick(() => {
@@ -635,11 +689,11 @@
this.radio = '';
(this.form.prop = column.prop), (this.form.order = column.order)
this.show = false
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
SeachKey() {
this.form.page = 1
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
this.show = false
this.radio = ''
},
@@ -740,17 +794,17 @@
this.form.rows = val
this.show = false
this.radio = ''
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
pageChange(val) {
this.form.page = val
this.show = false
this.radio = ''
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
},
// 鏌ヨ
- AdvancedSchedulingSearch() {
- // automaticScheduling.AdvancedSchedulingSearch(this.form).then(res => {
+ getAdvancedSchedulingSearch2() {
+ // automaticScheduling.AdvancedSchedulingSearch2(this.form).then(res => {
// this.mn_data = res.rows
// this.total = res.total
// this.oneClick()
@@ -1156,7 +1210,7 @@
this.formBottom.meter = 0
this.formBottom.real_num = 0
this.OnclickAdvancedSchedulingDevice()
- this.AdvancedSchedulingSearch()
+ this.getAdvancedSchedulingSearch2()
})
}
},
@@ -1874,7 +1928,7 @@
/*background-color: #f8f8fa;*/
background-color: #fff;
margin-top: 20px;
- /*height: 390px;*/
+ height: 490px;
}
label {
@@ -1891,31 +1945,10 @@
width: 100px;
}
-.top-bar {
- /* height: 30px; */
- margin-bottom: 20px;
-}
-
.container {
display: flex;
flex-direction: column;
flex: 1;
-}
-
-.main-footer {
- /* height: 30px; */
-}
-
-.ib {
- display: inline-block;
-}
-
-.w250 {
- width: 250px;
-}
-
-.el-slider {
- width: 100px;
}
.tc {
@@ -1933,11 +1966,6 @@
align-items: center;
}
-.colorBar {
- width: 10px;
- height: 100%;
-}
-
.carId {
flex: 1;
}
@@ -1945,63 +1973,6 @@
.tc {
color: #909399;
font-size: 14px;
-}
-
-.type {
- padding: 0 5px 0 0;
- font-size: 1.2rem;
-}
-
-.t_size {
- font-size: 14px;
-}
-
-.icon_true {
- height: 8px;
- display: inline-block;
- width: 8px;
- background: #00a79d;
- margin-right: 7px;
- border-radius: 15px;
-}
-
-.icon_ty {
- height: 8px;
- display: inline-block;
- width: 8px;
- background: red;
- margin-right: 7px;
- border-radius: 15px;
-}
-
-.icon_gz {
- height: 8px;
- display: inline-block;
- width: 8px;
- background: yellow;
- margin-right: 7px;
- border-radius: 15px;
-}
-
-/* .el-col-offset-1 {
- margin-left: 0.5% !important;
-} */
-.marginLeft {
- margin-left: 15px;
-}
-
-.button_style {
- background: #00a79d;
- color: #ffff;
- border-color: #00a79d;
-}
-
-.rg {
- float: right;
-}
-
-.color {
- color: #909399;
}
</style>
@@ -2138,3 +2109,39 @@
}
</style>
+
+<!--<style>-->
+<!--input[type=range]:focus {-->
+<!-- display: none;-->
+<!--}-->
+
+<!--input[type=range] {-->
+<!-- -webkit-appearance: none;-->
+<!-- width: 500px;-->
+<!-- border-radius: 10px;-->
+<!-- /*杩欎釜灞炴�ц缃娇濉厖杩涘害鏉℃椂鐨勫浘褰负鍦嗚*/-->
+<!--}-->
+
+<!--input[type=range]::-webkit-slider-runnable-track {-->
+<!-- height: 20px;-->
+<!-- border-radius: 10px;-->
+<!-- /*灏嗚建閬撹涓哄渾瑙掔殑*/-->
+<!-- /* box-shadow: 0 1px 1px #def3f8, inset 0 .125em .125em #0d1112; */-->
+<!-- border: solid 1px red;-->
+<!--}-->
+
+<!--input[type=range]::-webkit-slider-thumb {-->
+<!-- -webkit-appearance: none;-->
+<!-- height: 30px;-->
+<!-- width: 120px;-->
+<!-- margin-top: -5px;-->
+<!-- /*浣挎粦鍧楄秴鍑鸿建閬撻儴鍒嗙殑鍋忕Щ閲忕浉绛�*/-->
+<!-- background: #ffffff;-->
+<!-- /* border-radius: 50%; */-->
+<!-- /*澶栬璁剧疆涓哄渾褰�*/-->
+<!-- border: solid 0.125em rgba(205, 224, 230, 0.5);-->
+<!-- /*璁剧疆杈规*/-->
+<!-- /* box-shadow: 0 .125em .125em #3b4547; */-->
+<!-- /*娣诲姞搴曢儴闃村奖*/-->
+<!--}-->
+<!--</style>-->
--
Gitblit v1.9.3