From 6ad65ff10ec1d2004119b75e1f4c539e2a86659e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 02 二月 2023 11:15:55 +0800
Subject: [PATCH] 1.按钮点击 新增水波纹效果
---
src/views/scgl/zdpc.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index e33375c..244fd21 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -8,10 +8,10 @@
:model="formTop"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="杞﹂棿缂栫爜" style=" display: flex;">
+ <el-form-item label="杞﹂棿缂栫爜" style=" display: flex;">
<el-input v-model="formTop.workshop" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢熶骇宸ュ崟鍙�" style=" display: flex;">
@@ -24,9 +24,9 @@
<el-input v-model="formTop.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
<div
@@ -71,6 +71,7 @@
/>
<el-table-column
prop="AdvaSchePiroQue"
+ show-tooltip-when-overflow
label="浼樺厛绾�"
width="90"
sortable="custom"
@@ -112,6 +113,7 @@
prop="AdvaSchePartSpec"
label="浜у搧瑙勬牸"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -122,6 +124,7 @@
<el-table-column
prop="AdvaScheQty"
label="鏁伴噺"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
@@ -129,11 +132,13 @@
prop="AdvaScheEndDate"
label="瑕佹眰浜や粯鏃堕棿"
sortable="custom"
+ show-tooltip-when-overflow
width="160"
/>
<el-table-column
prop="AdvaScheStus"
label="鎺掔▼鐘舵��"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
>
@@ -145,6 +150,7 @@
<el-table-column
prop="AdvaScheBotProcName"
label="鎺掔▼宸ュ簭"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
@@ -153,6 +159,7 @@
label="璁″垝鎺掔▼鏃堕棿"
width="160"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.AdvaSchePCStartDate">{{ row.AdvaSchePCStartDate }}</div>
@@ -181,10 +188,11 @@
ref="form"
:model="formBottom"
inline
- style="display: flex;justify-content: space-between"
+ label-width="100px"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鎺掔▼鏃ユ湡" style=" display: flex;">
+ <el-form-item label="鎺掔▼鏃ユ湡" style=" display: flex;">
<el-date-picker
v-model="formBottom.scheDate"
type="daterange"
@@ -205,13 +213,13 @@
<el-option value="Y" label="鏃堕棿浼樺厛" />
</el-select>
</el-form-item>
- <el-form-item label="鏃堕棿鍒诲害锛堝垎閽燂級" style=" display: flex;">
+ <el-form-item label="鏃堕棿鍒诲害(鍒嗛挓)" label-width="110" style=" display: flex;">
<el-select v-model.number="formBottom.scale" style="width: 120px;">
<el-option v-for="item in scaleList" :key="item" :value="item" :label="item" />
</el-select>
</el-form-item>
- <el-form-item label="鎹㈠瀷鏃堕棿锛堝垎閽燂級" style=" display: flex;">
+ <el-form-item label="鎹㈠瀷鏃堕棿(鍒嗛挓)" label-width="110" style=" display: flex;">
<el-input
id="scale"
v-model="formBottom.times"
@@ -227,14 +235,16 @@
</span>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button
+ v-waves
type="primary"
icon="el-icon-document-remove"
@click="click_schedule"
>棰勬帓
</el-button>
<el-button
+ v-waves
type="primary"
icon="el-icon-document-checked"
@click="click_yes"
@@ -287,7 +297,7 @@
</div>
<div class="speed">
<!-- <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">-->
- <!-- <el-button type="text" size="mini" @click="look(data)">-->
+ <!-- <el-button v-waves type="text" size="mini" @click="look(data)">-->
<!-- <i class="el-icon-document size i-color" />-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
@@ -314,6 +324,7 @@
import dayjs from 'dayjs'
import { AdvancedSchedulingSearch, OnclickAdvancedSchedulingDevice, SubmitAlreadyScheduling } from '@/api/scgl'
import { handleDatetime } from '@/utils/global'
+import waves from '@/directive/waves'
const scaleList = `30,60,240,360`.split(',').map(n => parseInt(n))
const timeList = `0,30,60,120,240,480`.split(',').map(n => parseInt(n))
@@ -323,6 +334,7 @@
components: {
Pagination, Test
},
+ directives: { waves },
data() {
return {
mouseHoverType: 'mouseout',
@@ -1036,13 +1048,14 @@
// 鏃堕棿/璁惧浼樺厛鎺掔▼
click_schedule() {
const timestamp = new Date().toLocaleDateString()
- if (new Date(this.formBottom.scheDate[0]) < new Date(timestamp)) {
- this.$message.error('鎺掔▼鏃堕棿涓嶅彲浠ュ皬浜庡綋鍓嶆椂闂�!')
+
+ if (new Date(this.formBottom.scheDate[1]) < new Date(timestamp)) {
+ this.$message.error('鎺掔▼鏃ユ湡涓嶅彲浠ュ皬浜庡綋鍓嶆椂闂�!')
return false
}
this.nitialize()// 鎵嬪姩杩囨护鎵�鏈夎澶囧凡鎺掔▼
- console.log(this.facility_data, 67890)
+ // console.log(this.facility_data, 67890)
if (this.bm_data != '' && this.formBottom.types == 'N') { // 璁惧浼樺厛
this.fun_time()
this.change_num(this.bm_data)
--
Gitblit v1.9.3