From cb44cab30ca6b51d4488c66d7db911deecf4dbea Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 09:35:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/standard-table/technology.vue |  130 ++++++++++++++++++++----------------------
 1 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index 53b0f7d..a8f67ba 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -1,3 +1,62 @@
+<template>
+  <div class="standard">
+    <div>
+          <el-table :data="tableData" height="800" row-key="id" border
+          :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
+            @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="60" 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="primary">01</el-tag>
+                    <span style="color: black">
+                      {{ scope.row.father }}
+                    </span>
+            </template>
+            </el-table-column>
+            <el-table-column sortable label="宸ヨ壓鍚嶇О">
+              <template slot-scope="scope">
+                <el-tag type="success" v-if="!scope.row.children">02</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 label="鎿嶄綔">
+              <el-button style="color: rgb(137, 137, 229);">缂栬緫</el-button>
+            </el-table-column>
+          </el-table>
+        </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        selects: []
+      }
+    },
+    props:['tableData','tableType'],
+    created() {
+      console.log(this.tableData)
+    },
+    mounted() {
+      
+    },
+    methods: {
+      handleSelectionChange(val) {
+        this.selects = val;
+      }
+    }
+  }
+</script>
+
 <style scoped>
   .standard {
     width: 100%;
@@ -37,72 +96,7 @@
   .standard .el-table__body {
     height: 100%;
   }
+  .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){
+    padding-left: 23px !important;
+   }
 </style>
-
-<template>
-  <div class="standard">
-    <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" border
-      default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column type="selection" width="50">
-      </el-table-column>
-      <el-table-column type="index" label="搴忓彿" width="70">
-      </el-table-column>
-      <el-table-column prop="date" label="椤圭洰">
-      </el-table-column>
-      <el-table-column prop="name" label="鍗曚綅">
-      </el-table-column>
-      <el-table-column prop="address" label="鏍囧噯鍊�">
-      </el-table-column>
-      <el-table-column prop="address" label="鍐呮帶鍊�">
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        tableData: [{
-          id: 1,
-          date: '2016-05-02',
-          name: '鐜嬪皬铏�',
-          address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
-        }, {
-          id: 2,
-          date: '2016-05-04',
-          name: '鐜嬪皬铏�',
-          address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
-        }, {
-          id: 3,
-          date: '2016-05-01',
-          name: '鐜嬪皬铏�',
-          address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
-          children: [{
-              id: 31,
-              date: '2016-05-01',
-              name: '鐜嬪皬铏�',
-              address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
-            }, {
-              id: 32,
-              date: '2016-05-01',
-              name: '鐜嬪皬铏�',
-              address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
-          }]
-        }, {
-          id: 4,
-          date: '2016-05-03',
-          name: '鐜嬪皬铏�',
-          address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
-        }],
-        selects: []
-      }
-    },
-    mounted() {},
-    methods: {
-      handleSelectionChange(val) {
-        this.selects = val;
-      }
-    }
-  }
-</script>

--
Gitblit v1.9.3