From c06d6952c55a5b34b08527c9f61117afd0b6e97a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 08 九月 2023 17:13:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard-table/technology.vue | 163 ++++++++++++++++++++++-------------------------------
1 files changed, 68 insertions(+), 95 deletions(-)
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index edde54e..835a583 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -1,3 +1,71 @@
+<template>
+ <div class="standard">
+ <div>
+ <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
+ @selection-change="handleSelectionChange" default-expand-all
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column type="index" width="50" label="搴忓彿">
+ </el-table-column>
+ <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+ <template slot-scope="scope">
+ <el-tag v-if="scope.row.children" :type="scope.row.children ? 'primary' : 'success'">
+ <div class="firstDiv" :style="{ color: scope.row.children ? '#16a7ff' : '#58c173' }">
+ 01
+ </div>
+ </el-tag>
+ <span style="color: black">
+ {{ scope.row.father }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" sortable label="宸ヨ壓鍚嶇О">
+ <template slot-scope="scope">
+ <el-tag v-if="!scope.row.children">
+ <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
+ 02
+ </div>
+ </el-tag>
+ <span style="color: black">
+ {{ scope.row.name }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="dg" label="璁惧缁�">
+ </el-table-column>
+ <el-table-column prop="pq" label="鐢熶骇瀹氶">
+ </el-table-column>
+ <el-table-column prop="" label="鎿嶄綔">
+ <el-butten style="color: rgb(137, 137, 229);">缂栬緫</el-butten>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ selects: []
+ }
+ },
+ props:['tableData','tableType'],
+ created() {
+ console.log(this.tableData,this.tableType)
+ },
+ mounted() {
+
+ },
+ methods: {
+ handleSelectionChange(val) {
+ this.selects = val;
+ }
+ }
+ }
+</script>
+
<style scoped>
.standard {
width: 100%;
@@ -41,98 +109,3 @@
padding-left: 23px !important;
}
</style>
-
-<template>
- <div class="standard">
- <!-- <el-table :data="tableData" border style="width: 100%" row-key="id"
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
- <el-table-column type="selection" width="50">
- </el-table-column>
- <template v-if="tableType==1">
- <el-table-column type="index" label="搴忓彿" width="70">
- <template slot-scope="scope">
- {{ scope.row.index }}
- </template>
- </el-table-column>
- <el-table-column prop="name" label="椤圭洰">
- <template slot-scope="scope">
- <el-tag size="mini" :type="scope.row.index? '':'success'" :style="{borderRadius: '40%',marginRight: '12px'}">{{ scope.row.index? '01':'02'}}</el-tag>
- {{scope.row.name}}
- </template>
- </el-table-column>
- <el-table-column prop="unit" label="鍗曚綅">
- </el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�">
- </el-table-column>
- <el-table-column prop="internal" label="鍐呮帶鍊�">
- </el-table-column>
- </template>
- <template v-else>
- <el-table-column prop="name" label="宸ヨ壓鍚嶇О">
- </el-table-column>
- <el-table-column prop="device_group" label="璁惧缁�">
- </el-table-column>
- <el-table-column label="鍖归厤璁惧">
- <template>
- <el-button type="text">閫夋嫨</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="quota" label="宸ユ椂瀹氶">
- </el-table-column>
- </template>
- </el-table> -->
- <div>
- <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
- @selection-change="handleSelectionChange" default-expand-all
- :tree-props="{ children: 'name', hasChildren: 'children' }">
- <el-table-column type="selection" width="55">
- </el-table-column>
- <el-table-column type="index" width="50" label="搴忓彿">
- </el-table-column>
- <el-table-column prop="name" label="宸ュ簭" sortable width="300px">
- <template slot-scope="scope">
- <el-tag>
- <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
- {{ scope.row.children ? "01" : "02" }}
- </div>
- </el-tag>
- <span style="color: black">{{ scope.row.name }}</span>
-
- </template>
- </el-table-column>
- <el-table-column prop="" sortable label="宸ヨ壓鍚嶇О">
- </el-table-column>
- <el-table-column prop="" label="鎸囨爣鍚嶇О">
- </el-table-column>
- <el-table-column prop="" label="鍗曚綅">
- </el-table-column>
- <el-table-column prop="" label="鍐呮帶鍊�">
- </el-table-column>
- <el-table-column prop="unit" label="鏍囧噯鍊�">
- </el-table-column>
- </el-table>
- </div>
- </div>
-</template>
-
-<script>
- export default {
- data() {
- return {
- selects: []
- }
- },
- props:['tableData','tableType'],
- created() {
- console.log(this.tableData,this.tableType)
- },
- mounted() {
-
- },
- methods: {
- handleSelectionChange(val) {
- this.selects = val;
- }
- }
- }
-</script>
--
Gitblit v1.9.3