From dd5bef0fd97322b5455401e106dc6382502ec81c Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期一, 13 五月 2024 23:07:33 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/basic-data/working-condition/index.vue | 133 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/src/views/console/basic-data/working-condition/index.vue b/src/views/console/basic-data/working-condition/index.vue
index a78ff33..81a2f25 100644
--- a/src/views/console/basic-data/working-condition/index.vue
+++ b/src/views/console/basic-data/working-condition/index.vue
@@ -1,73 +1,76 @@
<!--
* @Date: 2024-04-01 20:28:18
- * @LastEditors: gaoshp
- * @LastEditTime: 2024-04-01 21:50:06
- * @FilePath: /cps-web/src/views/console/basic-data/working-condition/index.vue
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-13 22:12:39
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/working-condition/index.vue
-->
<template>
- <el-container>
- <el-header style="justify-content:flex-start">
- <el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
- <el-button type="danger" plain icon="el-icon-delete" @click="batchDel"></el-button>
- </el-header>
- <el-main>
- <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :border="true" :stripe="true"
- @selection-change="selectionChange">
- <el-table-column type="selection" />
- <el-table-column prop="dataItem" label="宸ヤ綅鍙橀噺鍚嶇О" />
- <el-table-column prop="dataTypeDesc" label="鏁版嵁鏍囩" />
- <el-table-column prop="usageName" label="璁＄畻鏂规硶" />
- <el-table-column prop="collectSettingItem" label="閲囬泦鍙橀噺鍚嶇О" />
- <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
- <template #default="scope">
- <el-button-group>
- <el-button text type="primary" size="small"
- @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
- <template #reference>
- <el-button text type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-popconfirm>
- </el-button-group>
+ <el-main>
+ <el-card shadow="never">
+ <el-container>
+ <el-header style="justify-content:flex-start">
+ <el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
+ <el-button type="danger" plain icon="el-icon-delete" @click="batchDel"></el-button>
+ </el-header>
+ <el-main>
+ <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :border="true" :stripe="true"
+ @selection-change="selectionChange">
+ <el-table-column type="selection" />
+ <el-table-column prop="dataItem" label="宸ヤ綅鍙橀噺鍚嶇О" />
+ <el-table-column prop="dataTypeDesc" label="鏁版嵁鏍囩" />
+ <el-table-column prop="usageName" label="璁＄畻鏂规硶" />
+ <el-table-column prop="collectSettingItem" label="閲囬泦鍙橀噺鍚嶇О" />
+ <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-main>
+ <el-drawer v-model="drawer" title="鏂板缓" :before-close="handleClose">
+ <el-form :model="form" :rules="rules" :disabled="mode == 'show'" ref="dialogForm"
+ label-width="120px" label-position="center">
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
+ <el-input style="width: 240px" v-model="form.dataItem" placeholder="宸ヤ綅鍙橀噺鍚嶇О"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鏁版嵁鏍囩" prop="usageId">
+ <el-select v-model="form.usageId" clearable placeholder="鏁版嵁鏍囩" style="width: 240px">
+ <el-option v-for="item in workstation_param_type" :key="item.id"
+ :label="item.usageName" :value="item.id" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="閲囬泦鍙橀噺鍚嶇О" prop="collectSettingItem">
+ <el-input style="width: 240px" v-model="form.collectSettingItem"
+ placeholder="閲囬泦鍙橀噺鍚嶇О" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <div style="flex: auto">
+ <el-button @click="cancelClick">cancel</el-button>
+ <el-button type="primary" @click="confirmClick">confirm</el-button>
+ </div>
</template>
- </el-table-column>
- </el-table>
- </el-main>
- <el-drawer v-model="drawer" title="鏂板缓" :before-close="handleClose">
- <el-form :model="form" :rules="rules" :disabled="mode == 'show'" ref="dialogForm" label-width="120px"
- label-position="center">
- <el-row>
- <el-col :span="24">
- <el-form-item label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
- <el-input style="width: 240px" v-model="form.dataItem" placeholder="宸ヤ綅鍙橀噺鍚嶇О"
- clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏁版嵁鏍囩" prop="usageId">
- <el-select v-model="form.usageId" clearable placeholder="鏁版嵁鏍囩" style="width: 240px">
- <el-option v-for="item in workstation_param_type" :key="item.id" :label="item.usageName"
- :value="item.id" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="閲囬泦鍙橀噺鍚嶇О" prop="collectSettingItem">
- <el-input style="width: 240px" v-model="form.collectSettingItem" placeholder="閲囬泦鍙橀噺鍚嶇О"
- clearable></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div style="flex: auto">
- <el-button @click="cancelClick">cancel</el-button>
- <el-button type="primary" @click="confirmClick">confirm</el-button>
- </div>
- </template>
- </el-drawer>
-
- </el-container>
+ </el-drawer>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
--
Gitblit v1.9.3