From 41afb20b6b3776f1242ce2aba29d8e51fa8110d6 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 17 五月 2025 09:45:52 +0800
Subject: [PATCH] -
---
billion-ui/src/views/main/da/tightenCollection/index.vue | 310 +++++++++++++++++++++++++++------------------------
1 files changed, 164 insertions(+), 146 deletions(-)
diff --git a/billion-ui/src/views/main/da/tightenCollection/index.vue b/billion-ui/src/views/main/da/tightenCollection/index.vue
index e48efb2..09a9399 100644
--- a/billion-ui/src/views/main/da/tightenCollection/index.vue
+++ b/billion-ui/src/views/main/da/tightenCollection/index.vue
@@ -1,43 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label-width="120" label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
- <el-input
- v-model="queryParams.sfcCode"
- placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label-width="120" label="閲囬泦鏃堕棿" prop="timeQuery">
- <el-date-picker
- v-model="queryParams.timeQuery"
- type="datetimerange"
- range-separator="鑷�"
- value-format="yyyy-MM-dd HH:mm:ss"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item style="float: right">
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- <el-button icon="el-icon-setting" size="mini" @click="toggleAdvancedSearch">楂樼骇鏌ヨ</el-button>
- </el-form-item>
- <transition name="fade">
- <div v-if="advancedSearchVisible" class="advanced-search">
- <el-form-item label-width="100" label="鍙傛暟闆嗙紪鐮�" prop="paramSetCode">
+ <el-card class="box-card">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
<el-input
- v-model="queryParams.paramSetCode"
- placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label-width="100" label="鍙傛暟闆嗗悕绉�" prop="paramSetName">
- <el-input
- v-model="queryParams.paramSetName"
- placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О"
+ v-model="queryParams.sfcCode"
+ placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -50,75 +18,137 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-row>
- <el-col :span="24" style="text-align: right;">
- <el-button type="primary" icon="el-icon-close" size="mini" @click="toggleAdvancedSearch">鍏抽棴</el-button>
- </el-col>
- </el-row>
- </div>
- </transition>
- </el-form>
+ <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="paramSetCode">
+ <el-input
+ v-model="queryParams.paramSetCode"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傛暟闆嗗悕绉�" prop="paramSetName">
+ <el-input
+ v-model="queryParams.paramSetName"
+ placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+<!-- <el-form-item label="鎵煩鐘舵��" prop="torqueStatus">-->
+<!-- <el-select v-model="queryParams.torqueStatus" placeholder="璇烽�夋嫨鎵煩鐘舵��" clearable>-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瑙掑害鐘舵��" prop="angleStatus">-->
+<!-- <el-select v-model="queryParams.angleStatus" placeholder="璇烽�夋嫨瑙掑害鐘舵��" clearable>-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
- <el-row :gutter="10" class="mb8">
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus"-->
-<!-- size="mini"-->
-<!-- @click="handleAdd"-->
-<!-- v-hasPermi="['da:tightenCollection:add']"-->
-<!-- >鏂板</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- plain-->
-<!-- icon="el-icon-edit"-->
-<!-- size="mini"-->
-<!-- :disabled="single"-->
-<!-- @click="handleUpdate"-->
-<!-- v-hasPermi="['da:tightenCollection:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="danger"-->
-<!-- plain-->
-<!-- icon="el-icon-delete"-->
-<!-- size="mini"-->
-<!-- :disabled="multiple"-->
-<!-- @click="handleDelete"-->
-<!-- v-hasPermi="['da:tightenCollection:remove']"-->
-<!-- >鍒犻櫎</el-button>-->
-<!-- </el-col>-->
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['da:tightenCollection:export']"
- >瀵煎嚭</el-button>
- </el-col>
-<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
- </el-row>
+ <el-card style="margin-top: 10px" class="box-card">
+ <el-row :gutter="10" class="mb8">
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- icon="el-icon-plus"-->
+<!-- size="mini"-->
+<!-- @click="handleAdd"-->
+<!-- v-hasPermi="['da:tightenCollection:add']"-->
+<!-- >鏂板</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="success"-->
+<!-- plain-->
+<!-- icon="el-icon-edit"-->
+<!-- size="mini"-->
+<!-- :disabled="single"-->
+<!-- @click="handleUpdate"-->
+<!-- v-hasPermi="['da:tightenCollection:edit']"-->
+<!-- >淇敼</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- icon="el-icon-delete"-->
+<!-- size="mini"-->
+<!-- :disabled="multiple"-->
+<!-- @click="handleDelete"-->
+<!-- v-hasPermi="['da:tightenCollection:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
+<!-- </el-col>-->
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['da:tightenCollection:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ </el-row>
- <el-table border v-loading="loading" :data="tightenCollectionList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
-<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode" />
- <el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode" />
- <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" prop="paramSetCode" />
- <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" prop="paramSetName" />
- <el-table-column label="鎵煩鍊�" align="center" prop="torque" />
- <el-table-column label="鎵煩鐘舵��" align="center" prop="torqueStatus" />
- <el-table-column label="瑙掑害鍊�" align="center" prop="angle" />
- <el-table-column label="瑙掑害鐘舵��" align="center" prop="angleStatus" />
- <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectTime" width="180">
- </el-table-column>
- </el-table>
+ <el-table border v-loading="loading" :data="tightenCollectionList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="涓婚敭id" align="center" prop="id" />
+ <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode">
+ </el-table-column>
+ <el-table-column label="宸ヤ綅缂栫爜" align="center" prop="locationCode">
+ </el-table-column>
+ <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" prop="paramSetName">
+ </el-table-column>
+ <el-table-column label="鎵煩鍊�" align="center" prop="torque">
+ </el-table-column>
+ <el-table-column label="瑙掑害鍊�" align="center" prop="angle">
+ </el-table-column>
+ <el-table-column label="瑙掑害鐘舵��" align="center" prop="angleStatus">
+ </el-table-column>
+ <el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectTime">
+ </el-table-column>
+<!-- <el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="success"-->
+<!-- plain-->
+<!-- style="width: 72px"-->
+<!-- icon="el-icon-edit"-->
+<!-- @click="handleUpdate(scope.row)"-->
+<!-- v-hasPermi="['da:tightenCollection:edit']"-->
+<!-- >淇敼</el-button>-->
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- style="width: 72px"-->
+<!-- icon="el-icon-delete"-->
+<!-- @click="handleDelete(scope.row)"-->
+<!-- v-hasPermi="['da:tightenCollection:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ </el-table>
+ </el-card>
<pagination
v-show="total>0"
@@ -129,8 +159,12 @@
/>
<!-- 娣诲姞鎴栦慨鏀规嫥绱ч噰闆嗗璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
+ <span slot="title">
+ <i class="el-icon-s-order"></i>
+ {{titleName}}
+ </span>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鎬绘垚搴忓垪鍙�" prop="sfcCode">
<el-input v-model="form.sfcCode" placeholder="璇疯緭鍏ユ�绘垚搴忓垪鍙�" />
</el-form-item>
@@ -146,9 +180,27 @@
<el-form-item label="鎵煩鍊�" prop="torque">
<el-input v-model="form.torque" placeholder="璇疯緭鍏ユ壄鐭╁��" />
</el-form-item>
+<!-- <el-form-item label="鎵煩鐘舵��" prop="torqueStatus">-->
+<!-- <el-radio-group v-model="form.torqueStatus">-->
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="瑙掑害鍊�" prop="angle">
<el-input v-model="form.angle" placeholder="璇疯緭鍏ヨ搴﹀��" />
</el-form-item>
+<!-- <el-form-item label="瑙掑害鐘舵��" prop="angleStatus">-->
+<!-- <el-radio-group v-model="form.angleStatus">-->
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -165,9 +217,9 @@
name: "TightenCollection",
data() {
return {
- advancedSearchVisible: false,
// 閬僵灞�
loading: true,
+ titleName: "",
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -194,13 +246,14 @@
paramSetName: null,
torqueStatus: null,
angleStatus: null,
- collectTime: null,
- timeQuery: []
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ id: [
+ { required: true, message: "涓婚敭id涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
@@ -208,9 +261,6 @@
this.getList();
},
methods: {
- toggleAdvancedSearch() {
- this.advancedSearchVisible = !this.advancedSearchVisible;
- },
/** 鏌ヨ鎷х揣閲囬泦鍒楄〃 */
getList() {
this.loading = true;
@@ -245,11 +295,9 @@
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
- this.advancedSearchVisible = false
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.clearQueryParams()
this.resetForm("queryForm");
this.handleQuery();
},
@@ -259,16 +307,11 @@
this.single = selection.length!==1
this.multiple = !selection.length
},
- clearQueryParams(){
- this.queryParams.paramSetName = null
- this.queryParams.paramSetName = null
- this.queryParams.locationCode = null
- },
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
this.open = true;
- this.title = "娣诲姞鎷х揣閲囬泦";
+ this.titleName = "娣诲姞鎷х揣閲囬泦";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -277,7 +320,7 @@
getTightenCollection(id).then(response => {
this.form = response.data;
this.open = true;
- this.title = "淇敼鎷х揣閲囬泦";
+ this.titleName = "淇敼鎷х揣閲囬泦";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -319,28 +362,3 @@
}
};
</script>
-<style scoped>.fade-enter-active, .fade-leave-active {
- transition: opacity 0.3s;
-}
-.fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
- opacity: 0;
-}
-
-.advanced-search {
- position: absolute;
- background: #FFFFFF; /* 璁剧疆涓轰笌椤甸潰鑳屾櫙鑹茬浉鍚屾垨鐩歌繎鐨勯鑹� */
- border-left: 1px solid #dcdfe6;
- border-right: 1px solid #dcdfe6;
- border-bottom: 1px solid #dcdfe6;
- /*border: none;*/
- box-shadow: none; /* 绉婚櫎闃村奖 */
- padding: 10px;
- z-index: 1000; /* 纭繚娴姩鍦ㄥ叾浠栧厓绱犱箣涓� */
- top: 70px; /* 璋冩暣椤堕儴浣嶇疆锛屼娇鍏朵笌椤甸潰鍏朵粬鍏冪礌鏇村崗璋� */
- left: 20px; /* 璋冩暣宸︿晶浣嶇疆 */
- width: 97%; /* 璋冩暣瀹藉害 */
- /*max-width: 1296px; !* 鏈�澶у搴� *!*/
- /*max-width: 1296px; !* 鏈�澶у搴� *!*/
- margin: 0 auto; /* 灞呬腑瀵归綈 */
-}
-</style>
--
Gitblit v1.9.3