From 4b848e13d7d1cd11a8cc6043baf5f5ffa34afdd5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 01 十月 2024 20:26:49 +0800
Subject: [PATCH] 优化排班和部分功能
---
src/views/mdc/state-feedback.vue | 149 ++++++++++++++++++++++++-------------------------
1 files changed, 72 insertions(+), 77 deletions(-)
diff --git a/src/views/mdc/state-feedback.vue b/src/views/mdc/state-feedback.vue
index 27adbd7..4cd3ad1 100644
--- a/src/views/mdc/state-feedback.vue
+++ b/src/views/mdc/state-feedback.vue
@@ -2,64 +2,74 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-18 17:10:39
+ * @LastEditTime: 2024-06-05 12:03:50
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
- <div class="aposcope-main">
- <div class="aposcope-left">
- <div class="left-title">宸ヤ綅</div>
- <el-tree :data="tableData" node-key="id" default-expand-all :expand-on-click-node="false" :props="defalutProps" @node-click="handleNodeClick" ref="treeRef" highlight-current />
- </div>
- <div class="aposcope-right">
- <div class="right-top">
- <div>
- <el-button type="primary" @click="addData">鍙嶉</el-button>
- <el-button type="danger" plain @click="delData">鎵归噺鍒犻櫎</el-button>
- </div>
- <div>
- <el-select v-model="searchData.feedBackStatus" multiple style="width: 185px;margin-right: 8px;;" @change="feedBackStatusChange">
- <el-option v-for="item in feedBackStatusList" :key="item.code" :label="item.name" :value="item.code"/>
- </el-select>
- <el-date-picker v-model="searchData.date" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" align="right" value-format="YYYY-MM-DD HH:mm:ss" @change="dateChange" style="vertical-align: middle;">
- </el-date-picker>
- </div>
- </div>
- <div class="right-content" v-if="searchDataList.length == 0">
- <img src="./quesheng.bd026700.png" />
- <div>
- <span>鏆傛棤鍙嶉鐘舵�佹暟鎹�</span>
- </div>
- </div>
- <el-table ref="searchDataListRef" v-if="searchDataList.length != 0" :data="searchDataList" border style="width: 100%;margin-top: 20px;" class="multipleTableRef" @selection-change="searchHandleSelectionChange">
- <el-table-column type="selection" width="55" />
- <el-table-column prop="workstationName" label="宸ヤ綅鍚嶇О"></el-table-column>
- <el-table-column prop="wcsDesc" label="鐘舵��"></el-table-column>
- <el-table-column prop="feedbackDesc" label="鎻忚堪"></el-table-column>
- <el-table-column prop="httpMethod" label="鎸佺画鏃堕暱">
- <template #default="scope">
- <span>{{sumTime(scope.row.startTime,scope.row.endTime)}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="scopePath" label="鐘舵�佹椂闂�">
- <template #default="scope">
- <span>{{scope.row.startTime}}~{{ scope.row.endTime }}</span>
- </template>
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔">
- <template #default="scope">
- <el-button text type="primary" size="small" @click="table_del(scope.row, scope.$index)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- </div>
+ <el-main style="height: 100%;">
+ <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 style="flex-direction: column;">
+ <div class="left-title">宸ヤ綅</div>
+ <el-main style="padding: 12px 20px 20px;">
+ <el-tree :data="tableData" node-key="id" default-expand-all :expand-on-click-node="false" :props="defalutProps" @node-click="handleNodeClick" ref="treeRef" highlight-current />
+ </el-main>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <el-main>
+ <div class="right-top">
+ <div>
+ <el-button type="primary" @click="addData">鍙嶉</el-button>
+ <el-button type="danger" plain @click="delData">鎵归噺鍒犻櫎</el-button>
+ </div>
+ <div>
+ <el-select v-model="searchData.feedBackStatus" multiple style="width: 185px;margin-right: 8px;;" @change="feedBackStatusChange">
+ <el-option v-for="item in feedBackStatusList" :key="item.code" :label="item.name" :value="item.code"/>
+ </el-select>
+ <el-date-picker v-model="searchData.date" type="datetimerange" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" align="right" value-format="YYYY-MM-DD HH:mm:ss" @change="dateChange" style="vertical-align: middle;">
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="right-content" v-if="searchDataList.length == 0">
+ <!-- <img src="./quesheng.bd026700.png" /> -->
+ <div style="margin-top: 120px;font-size: 16px;color: #666;">
+ <span>鏆傛棤鍙嶉鐘舵�佹暟鎹�</span>
+ </div>
+ </div>
+ <el-table ref="searchDataListRef" v-if="searchDataList.length != 0" :data="searchDataList" border style="width: 100%;margin-top: 20px;" class="multipleTableRef" @selection-change="searchHandleSelectionChange">
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="workstationName" label="宸ヤ綅鍚嶇О"></el-table-column>
+ <el-table-column prop="wcsDesc" label="鐘舵��"></el-table-column>
+ <el-table-column prop="feedbackDesc" label="鎻忚堪"></el-table-column>
+ <el-table-column prop="httpMethod" label="鎸佺画鏃堕暱">
+ <template #default="scope">
+ <span>{{sumTime(scope.row.startTime,scope.row.endTime)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="scopePath" label="鐘舵�佹椂闂�">
+ <template #default="scope">
+ <span>{{scope.row.startTime}}~{{ scope.row.endTime }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔">
+ <template #default="scope">
+ <el-button text type="primary" size="small" @click="table_del(scope.row, scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-main>
+ </el-container>
+ </el-container>
+ </el-card>
+ </el-main>
<save-dialog v-if="dialog.save" ref="saveDialog" :feedBackStatusList="feedBackStatusList" :workstationId="lastLevelId" @success="addfeedbackSuccess" @closed="dialog.save=false"></save-dialog>
</template>
<script>
import { useTransitionFallthroughEmits } from 'element-plus';
-import saveDialog from './add-feedback'
+ import saveDialog from './add-feedback'
export default {
name: "state-feedback",
data(){
@@ -122,8 +132,11 @@
getfeedBackStatusList() {
this.$HTTP.get("/api/blade-cps/global_wcs/wcs-achievements").then(res=> {
if(res.code == 200) {
- this.feedBackStatusList.push(res.data[0]);
- this.feedBackStatusList.push(res.data[1]);
+ res.data.forEach(item=> {
+ if(item.type == "4") {
+ this.feedBackStatusList.push(item);
+ }
+ })
}
})
},
@@ -244,16 +257,13 @@
}
this.$HTTP.post("/api/blade-cps/group/groupWorkstation/type",obj).then(res=> {
if(res.code == 200) {
- if (res.code == 200) {
- var treeDisabled = this.addTreeDisable(res.data);
- this.tableData = this.buildTree(treeDisabled); //浠庢墎骞冲寲鍙樹负鏍戠姸缁撴瀯
- this.$nextTick(()=> {
- this.lastLevelId = this.getLastLevelIds(this.tableData).lastLevelId;
- this.$refs.treeRef.setCurrentKey(this.lastLevelId); //绗竴涓妭鐐圭殑绗竴涓瓙鑺傜偣鏈�鍚庝竴绾ч粯璁ら�変腑
- this.getlist(); //娓叉煋鍙嶉鍒楄〃
- })
-
- }
+ var treeDisabled = this.addTreeDisable(res.data);
+ this.tableData = this.buildTree(treeDisabled); //浠庢墎骞冲寲鍙樹负鏍戠姸缁撴瀯
+ this.$nextTick(()=> {
+ this.lastLevelId = this.getLastLevelIds(this.tableData).lastLevelId;
+ this.$refs.treeRef.setCurrentKey(this.lastLevelId); //绗竴涓妭鐐圭殑绗竴涓瓙鑺傜偣鏈�鍚庝竴绾ч粯璁ら�変腑
+ this.getlist(); //娓叉煋鍙嶉鍒楄〃
+ })
}
})
},
@@ -273,21 +283,6 @@
this.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/page?current=1&size=15",obj).then(res=> {
if(res.code == 200) {
this.searchDataList = res.data.records;
- }
- })
- },
- loadNode(node, resolve, reject) {
- if(node.data.id) {
- this.parentId = node.data.id;
- }else {
- this.parentId = '0';
- }
- this.$HTTP.get("/api/blade-system/menu/lazy-list",{parentId: this.parentId}).then(res=> {
- if(res.code == 200) {
- res.data.forEach(node => {
- node.hasChildren = !node.hasChildren;
- });
- resolve(res.data);
}
})
},
--
Gitblit v1.9.3