From 9ab353d083dd22a90a8a0f09b9b7b756d58cc1bd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 15:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard.vue | 2
src/components/view/standard-table/target.vue | 603 +--------------------------------------------
src/App.vue | 10
src/components/view/standard-table/technology.vue | 25 +
src/components/view/standard-table/material.vue | 30 +
src/components/view/standard-table/product.vue | 57 ++--
6 files changed, 100 insertions(+), 627 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 9459930..a1fadbe 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -118,7 +118,15 @@
font-size: 18px;
font-weight: bold;
position: absolute;
- right: -230px;
+ right: -225px;
+ top: 16px;
+ z-index: 999;
+ }
+ .el-table [class*="el-table__row--level-3"] .el-table__expand-icon {
+ font-size: 18px;
+ font-weight: bold;
+ position: absolute;
+ right: -425px;
top: 16px;
z-index: 999;
}
diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue
index b317e40..2f53cc6 100644
--- a/src/components/view/standard-table/material.vue
+++ b/src/components/view/standard-table/material.vue
@@ -9,26 +9,25 @@
</el-table-column>
<el-table-column type="index" width="60" label="搴忓彿">
</el-table-column>
- <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+ <el-table-column prop="father" label="宸ュ簭" :resizable="false">
<template slot-scope="scope">
- <el-tag v-if="scope.row.father != null" type="primary">01</el-tag>
+ <el-tag class="tag" v-if="scope.row.father != null" type="primary">01</el-tag>
<span style="color: #000000">
{{ scope.row.father }}
</span>
</template>
</el-table-column>
- <el-table-column prop="tname" sortable label="宸ヨ壓鍚嶇О">
+ <el-table-column prop="tname" sortable label="宸ヨ壓鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.tname != null"
- style="margin-left:20px;">02</el-tag>
+ <el-tag type="success" v-if="scope.row.tname != null" class="tag">02</el-tag>
<span style="color: #000000">
{{ scope.row.tname }}
</span>
</template>
</el-table-column>
- <el-table-column prop="mname" label="鏉愭枡鍚嶇О">
+ <el-table-column prop="mname" label="鏉愭枡鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="info" color="#faf2ff" v-if="scope.row.mname != null">
+ <el-tag type="info" class="tag" color="#faf2ff" v-if="scope.row.mname != null">
<span style="color: #e1affb">03</span>
</el-tag>
<span>
@@ -36,11 +35,11 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="specifications" label="瑙勬牸">
+ <el-table-column prop="specifications" label="瑙勬牸" :resizable="false">
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅">
+ <el-table-column prop="unit" label="鍗曚綅" :resizable="false">
</el-table-column>
- <el-table-column prop="num" label="鏁伴噺">
+ <el-table-column prop="num" label="鏁伴噺" :resizable="false">
<template slot-scope="scope">
<el-input v-model="scope.row.num"
v-if="scope.row.mname != null" size="small"
@@ -149,6 +148,17 @@
width: 100%;
height: 100%;
}
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
+ }
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
</style>
<style>
.standard * {
diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue
index c3c13d2..6460137 100644
--- a/src/components/view/standard-table/product.vue
+++ b/src/components/view/standard-table/product.vue
@@ -1,12 +1,14 @@
<style scoped>
- .standard {
- width: 100%;
- height: 100%;
- }
.standard * {
font-size: 14px;
}
-
+
+ .standard {
+ width: 100%;
+ height: 100%;
+ overflow: auto;
+ }
+
.standard .has-gutter .el-table__cell {
background-color: #F0F1F5 !important;
color: #333;
@@ -22,22 +24,17 @@
padding-left: 17px !important;
}
- .standard {
- width: 100%;
- height: 100%;
- overflow: auto;
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
}
-
- /* .standard .el-table__body-wrapper {
- height: 100%;
- } */
-
- /* .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;
- } */
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
</style>
<template>
<div class="standard">
@@ -47,34 +44,34 @@
: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="宸ュ簭">
+ <el-table-column prop="father" label="宸ュ簭" :resizable="false">
<template slot-scope="scope">
- <el-tag type="primary" v-if="scope.row.father != null">01</el-tag>
+ <el-tag type="primary" class="tag" v-if="scope.row.father != null">01</el-tag>
<span>{{scope.row.father}}</span>
</template>
</el-table-column>
- <el-table-column prop="name" label="宸ヨ壓鍚嶇О">
+ <el-table-column prop="name" label="宸ヨ壓鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.name != null">02</el-tag>
+ <el-tag type="success" class="tag" v-if="scope.row.name != null">02</el-tag>
<span>{{scope.row.name}}</span>
</template>
</el-table-column>
- <el-table-column prop="device" label="璁惧鍚嶇О">
+ <el-table-column prop="device" label="璁惧鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="info" color="#faf2ff" v-if="scope.row.device != null">
+ <el-tag type="info" class="tag" color="#faf2ff" v-if="scope.row.device != null">
<span style="color: #e1affb">03</span>
</el-tag>
<span>{{scope.row.device}}</span>
</template>
</el-table-column>
- <el-table-column prop="productFather" label="椤圭洰">
+ <el-table-column prop="productFather" label="椤圭洰" :resizable="false">
<template slot-scope="scope">
- <el-tag type="info" v-if="scope.row.productFather != null">04</el-tag>
+ <el-tag type="info" class="tag" v-if="scope.row.productFather != null">04</el-tag>
<span>{{scope.row.productFather}}</span>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅"></el-table-column>
- <el-table-column prop="product" label="鎸囨爣"></el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" :resizable="false"></el-table-column>
+ <el-table-column prop="product" label="鎸囨爣" :resizable="false"></el-table-column>
</el-table>
</div>
</template>
diff --git a/src/components/view/standard-table/target.vue b/src/components/view/standard-table/target.vue
index c4d3139..abd919f 100644
--- a/src/components/view/standard-table/target.vue
+++ b/src/components/view/standard-table/target.vue
@@ -1,47 +1,46 @@
<template>
<div class="standard">
<div>
- <el-table ref="multipleTable" :data="aa" row-key="rowId" border max-height="675"
+ <el-table ref="multipleTable" :data="tableData" row-key="rowId" border max-height="675"
@select-all="selectAll" @select="selectTr"
@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="tfather" label="宸ュ簭">
+ <el-table-column prop="tfather" label="宸ュ簭" :resizable="false">
<template slot-scope="scope">
- <el-tag type="primary" v-if="scope.row.tfather != null">01</el-tag>
+ <el-tag class="tag" type="primary" v-if="scope.row.tfather != null">01</el-tag>
<span>{{scope.row.tfather}}</span>
</template>
</el-table-column>
- <el-table-column prop="tname" label="宸ヨ壓鍚嶇О">
+ <el-table-column prop="tname" label="宸ヨ壓鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="scope.row.tname != null"
- style="line-height:24px;text-align:center;width:36px;height:24px;margin-left:20px;border-radius:12px">02</el-tag>
+ <el-tag type="success" v-if="scope.row.tname != null" class="tag">02</el-tag>
<span>{{scope.row.tname}}</span>
</template>
</el-table-column>
- <el-table-column prop="pfather" label="椤圭洰">
+ <el-table-column prop="pfather" label="椤圭洰" :resizable="false">
<template slot-scope="scope">
- <el-tag type="info" color="#faf2ff" v-if="scope.row.pfather != null">
+ <el-tag type="info" color="#faf2ff" v-if="scope.row.pfather != null" class="tag">
<span style="color: #e1affb">03</span>
</el-tag>
<span>{{scope.row.pfather}}</span>
</template>
</el-table-column>
- <el-table-column prop="pname" label="鎸囨爣鍚嶇О">
+ <el-table-column prop="pname" label="鎸囨爣鍚嶇О" :resizable="false">
<template slot-scope="scope">
<span>{{scope.row.pname}}</span>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅"></el-table-column>
- <el-table-column prop="internal" label="鍐呮帶鍊�">
+ <el-table-column prop="unit" label="鍗曚綅" :resizable="false"></el-table-column>
+ <el-table-column prop="internal" label="鍐呮帶鍊�" :resizable="false">
<template slot-scope="scope">
<el-input v-model="scope.row.internal"
v-if="scope.row.pname != null" size="small"
@blur="updateVal(scope.row)"></el-input>
</template>
</el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�">
+ <el-table-column prop="required" label="鏍囧噯鍊�" :resizable="false">
<template slot-scope="scope">
<el-input v-model="scope.row.required"
v-if="scope.row.pname != null" size="small"
@@ -57,583 +56,20 @@
export default {
data() {
return {
+ tnameWidth:200,
+ pfatherWidth:200,
selects: [],
deleteList:[],
isAllSelect:false,
- aa: [
- {
- "children": [
- {
- "children": [
- {
- "children": [
- {
- "unit": "oo",
- "pname": "闃垮彂",
- "pid": 933,
- "rowId": 0.15062765172836556,
- "indents": 1
- },
- {
- "unit": "km",
- "pname": "鐢�2",
- "pid": 934,
- "rowId": 0.12313308041936621,
- "indents": 1
- },
- {
- "unit": "ll",
- "pname": "鐢�3",
- "pid": 935,
- "rowId": 0.3959020806139848,
- "indents": 1
- },
- {
- "unit": "璁╂垜鍘�",
- "pname": "杩樻槸鐨勪汉浼氬彈鍒�",
- "pid": 941,
- "rowId": 0.4501313017235842,
- "indents": 1
- },
- {
- "unit": "鍙戜簩鎵嬫埧",
- "pname": "绂忓▋",
- "pid": 942,
- "rowId": 0.2570941856592921,
- "indents": 1
- },
- {
- "unit": "闃垮棷鍡�",
- "pname": "1闃�",
- "pid": 943,
- "rowId": 0.3849246876222272,
- "indents": 1
- },
- {
- "unit": "sef",
- "pname": "gsd",
- "pid": 952,
- "rowId": 0.3358017758829086,
- "indents": 1
- }
- ],
- "pfather": "鐢垫皵鎬ц兘",
- "rowId": 0.11597152206451145,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鍚�",
- "pname": "鏈�1",
- "pid": 936,
- "rowId": 0.09276663783212125,
- "indents": 1
- },
- {
- "unit": "澶�",
- "pname": "鏈�2",
- "pid": 937,
- "rowId": 0.30524372216363194,
- "indents": 1
- }
- ],
- "pfather": "鏈烘",
- "rowId": 0.7172228698155356,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "t",
- "pname": "鑰�1",
- "pid": 938,
- "rowId": 0.19975939946800714,
- "indents": 1
- },
- {
- "unit": "ml",
- "pname": "鑰�2",
- "pid": 939,
- "rowId": 0.8998139964427834,
- "indents": 1
- },
- {
- "unit": "鍙�",
- "pname": "鑰�3",
- "pid": 940,
- "rowId": 0.5675579627028025,
- "indents": 1
- }
- ],
- "pfather": "鑰愮數鍘�",
- "rowId": 0.21440785353613157,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鎸変笂娆＄殑闈炲父",
- "pname": "澶ф墜澶ц剼",
- "pid": 944,
- "rowId": 0.7181582304087455,
- "indents": 1
- }
- ],
- "pfather": "浣犲ソ",
- "rowId": 0.7769908541698349,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鐖卞浗VSv",
- "pname": "闃胯惃",
- "pid": 945,
- "rowId": 0.17378991618309336,
- "indents": 1
- }
- ],
- "pfather": "澶у濂�",
- "rowId": 0.8772679053462382,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "ww",
- "pname": "ww",
- "pid": 946,
- "rowId": 0.05009672998084547,
- "indents": 1
- }
- ],
- "pfather": "cao",
- "rowId": 0.9565056824143869,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "杈剧摝",
- "pname": "鎴戠殑",
- "pid": 947,
- "rowId": 0.34581383239188046,
- "indents": 1
- },
- {
- "unit": "鎴戠殑",
- "pname": "闈掕洐澶у叏",
- "pid": 948,
- "rowId": 0.5292322880840665,
- "indents": 1
- },
- {
- "unit": "鎴戠殑閽�",
- "pname": "鍙栧緱瀹屽叏鐨�",
- "pid": 949,
- "rowId": 0.9125913254753026,
- "indents": 1
- },
- {
- "unit": "璇烽棶",
- "pname": "褰撳墠",
- "pid": 950,
- "rowId": 0.7560056072797159,
- "indents": 1
- },
- {
- "unit": "sdv",
- "pname": "澹ぇ澶�",
- "pid": 951,
- "rowId": 0.5833122419533638,
- "indents": 1
- }
- ],
- "pfather": "浣犻敃",
- "rowId": 0.9766279468505832,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "闃胯揪",
- "pname": "鎵撳晩路",
- "pid": 953,
- "rowId": 0.9092338815452841,
- "indents": 1
- }
- ],
- "pfather": "闃胯开鐜�",
- "rowId": 0.8799322497096753,
- "indents": 1
- }
- ],
- "tname": "瑁佺紗",
- "rowId": 0.4071356283291181,
- "indents": 1
- },
- {
- "children": [
- {
- "children": [
- {
- "unit": "kv",
- "pname": "闀�1",
- "pid": 954,
- "rowId": 0.035463253161200026,
- "indents": 1
- },
- {
- "unit": "vv",
- "pname": "闀�2",
- "pid": 955,
- "rowId": 0.23952996321663345,
- "indents": 1
- },
- {
- "unit": "mm",
- "pname": "闀�3",
- "pid": 956,
- "rowId": 0.0009274727073673716,
- "indents": 1
- }
- ],
- "pfather": "闀垮害",
- "rowId": 0.7634749065969555,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鍚�",
- "pname": "闈�",
- "pid": 957,
- "rowId": 0.18887461651501813,
- "indents": 1
- }
- ],
- "pfather": "闈㈢Н",
- "rowId": 0.1800874562308441,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "c",
- "pname": "婀�",
- "pid": 958,
- "rowId": 0.79648815170558,
- "indents": 1
- }
- ],
- "pfather": "婀垮害",
- "rowId": 0.10207617486870801,
- "indents": 1
- }
- ],
- "tname": "鍓ョ紗",
- "rowId": 0.6177353372974288,
- "indents": 1
- },
- {
- "children": [
- {
- "children": [
- {
- "unit": "mm",
- "pname": "鐢�1",
- "pid": 959,
- "rowId": 0.14165010419857826,
- "indents": 1
- },
- {
- "unit": "km",
- "pname": "鐢�2",
- "pid": 960,
- "rowId": 0.5001292363854433,
- "indents": 1
- },
- {
- "unit": "ll",
- "pname": "鐢�3",
- "pid": 961,
- "rowId": 0.8459604367887481,
- "indents": 1
- }
- ],
- "pfather": "鐢垫皵鎬ц兘",
- "rowId": 0.7238366441537252,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鍚�",
- "pname": "鏈�1",
- "pid": 962,
- "rowId": 0.5558158468437493,
- "indents": 1
- },
- {
- "unit": "澶�",
- "pname": "鏈�2",
- "pid": 963,
- "rowId": 0.750487727539507,
- "indents": 1
- }
- ],
- "pfather": "鏈烘",
- "rowId": 0.08099595277723015,
- "indents": 1
- }
- ],
- "tname": "鍓嚎",
- "rowId": 0.6857832066163772,
- "indents": 1
- },
- {
- "children": [
- {
- "children": [
- {
- "unit": "t",
- "pname": "鑰�1",
- "pid": 964,
- "rowId": 0.025681390736394416,
- "indents": 1
- },
- {
- "unit": "ml",
- "pname": "鑰�2",
- "pid": 965,
- "rowId": 0.36284806597904873,
- "indents": 1
- },
- {
- "unit": "鍙�",
- "pname": "鑰�3",
- "pid": 966,
- "rowId": 0.32910729115405535,
- "indents": 1
- }
- ],
- "pfather": "鑰愮數鍘�",
- "rowId": 0.41438839964145635,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "kv",
- "pname": "闀�1",
- "pid": 967,
- "rowId": 0.3918751838800807,
- "indents": 1
- },
- {
- "unit": "mm",
- "pname": "闂棶",
- "pid": 968,
- "rowId": 0.5686737935255044,
- "indents": 1
- }
- ],
- "pfather": "闀垮害",
- "rowId": 0.4897629570966928,
- "indents": 1
- }
- ],
- "tname": "绌跨嚎",
- "rowId": 0.4459890408806282,
- "indents": 1
- }
- ],
- "tfather": "涓嬫枡",
- "rowId": 0.8390882975115925,
- "indents": 1
- },
- {
- "children": [
- {
- "children": [
- {
- "children": [
- {
- "unit": "vv",
- "pname": "闀�2",
- "pid": 969,
- "rowId": 0.16863376578504718,
- "indents": 1
- },
- {
- "unit": "mm",
- "pname": "闀�3",
- "pid": 970,
- "rowId": 0.2900238044012753,
- "indents": 1
- }
- ],
- "pfather": "闀垮害",
- "rowId": 0.37669687690143516,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鍚�",
- "pname": "闈�",
- "pid": 971,
- "rowId": 0.36760765245674576,
- "indents": 1
- }
- ],
- "pfather": "闈㈢Н",
- "rowId": 0.41655397960844853,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "c",
- "pname": "婀�",
- "pid": 972,
- "rowId": 0.8013524859108032,
- "indents": 1
- }
- ],
- "pfather": "婀垮害",
- "rowId": 0.30068963405418225,
- "indents": 1
- }
- ],
- "tname": "鏀拺鍧楃幆姘�",
- "rowId": 0.7725045227516729,
- "indents": 1
- }
- ],
- "tfather": "鏀拺鍧楃幆姘�",
- "rowId": 0.7921741302395957,
- "indents": 1
- },
- {
- "children": [
- {
- "children": [
- {
- "children": [
- {
- "unit": "t",
- "pname": "鑰�1",
- "pid": 978,
- "rowId": 0.7281043795556847,
- "indents": 1
- },
- {
- "unit": "ml",
- "pname": "鑰�2",
- "pid": 979,
- "rowId": 0.015058429562420983,
- "indents": 1
- },
- {
- "unit": "鍙�",
- "pname": "鑰�3",
- "pid": 980,
- "rowId": 0.5169165422760948,
- "indents": 1
- }
- ],
- "pfather": "鑰愮數鍘�",
- "rowId": 0.9785158882428673,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "kv",
- "pname": "闀�1",
- "pid": 981,
- "rowId": 0.9534130099287508,
- "indents": 1
- }
- ],
- "pfather": "闀垮害",
- "rowId": 0.4408411939308432,
- "indents": 1
- }
- ],
- "tname": "澹充綋鍠风爞",
- "rowId": 0.47569680349711807,
- "indents": 1
- }
- ],
- "tfather": "鍠风爞",
- "rowId": 0.7110660336124821,
- "indents": 1
- },
- {
- "children": [
- {
- "children": [
- {
- "children": [
- {
- "unit": "vv",
- "pname": "闀�2",
- "pid": 982,
- "rowId": 0.6503541323269595,
- "indents": 1
- },
- {
- "unit": "mm",
- "pname": "闀�3",
- "pid": 983,
- "rowId": 0.32814600334581456,
- "indents": 1
- }
- ],
- "pfather": "闀垮害",
- "rowId": 0.7584791572708673,
- "indents": 1
- },
- {
- "children": [
- {
- "unit": "鍚�",
- "pname": "闈�",
- "pid": 984,
- "rowId": 0.37940516060114016,
- "indents": 1
- }
- ],
- "pfather": "闈㈢Н",
- "rowId": 0.12296115468577762,
- "indents": 1
- }
- ],
- "tname": "鐢电紗鎵撶（",
- "rowId": 0.5185983654517894,
- "indents": 1
- }
- ],
- "tfather": "鐒婃帴",
- "rowId": 0.08397884001890477,
- "indents": 1
- }
-]
}
},
- // props:['tableData','tableType'],
+ props:['tableData','tableType'],
created() {
},
mounted() {
},
methods: {
- bb(){
- console.log(this.aa);
- },
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
selectAll(val) {
@@ -722,6 +158,17 @@
width: 100%;
height: 100%;
}
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
+ }
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
</style>
<style>
.standard * {
diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue
index f042c3a..166d41a 100644
--- a/src/components/view/standard-table/technology.vue
+++ b/src/components/view/standard-table/technology.vue
@@ -8,23 +8,23 @@
: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 type="index" width="60" label="搴忓彿" :resizable="false">
</el-table-column>
- <el-table-column prop="father" label="宸ュ簭" sortable width="200px">
+ <el-table-column prop="father" label="宸ュ簭" :resizable="false">
<template slot-scope="scope">
- <el-tag v-if="scope.row.children" type="primary">01</el-tag>
+ <el-tag class="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="宸ヨ壓鍚嶇О" width="200px">
+ <el-table-column sortable label="宸ヨ壓鍚嶇О" :resizable="false">
<template slot-scope="scope">
- <el-tag type="success" v-if="!scope.row.children">02</el-tag>
+ <el-tag class="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 prop="dg" label="璁惧缁�" :resizable="false">
<template slot-scope="scope">
<div class="showDiv">
<span>{{scope.row.dg}}</span>
@@ -32,7 +32,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)">
+ <el-table-column prop="pq" label="鐢熶骇瀹氶(涓�/澶�)" :resizable="false">
<template slot-scope="scope">
<el-input v-model="scope.row.pq"
v-if="scope.row.dg != null" size="small"
@@ -155,6 +155,17 @@
width: 100%;
height: 100%;
}
+ .tag{
+ line-height:24px;
+ text-align:center;
+ width:36px;
+ height:24px;
+
+ border-radius:12px;
+ }
+ .tag:nth-child(1){
+ margin-left:20px;
+ }
.standard .showDiv{
cursor: pointer;
}
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 6c12b0b..7984cb2 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -1228,7 +1228,7 @@
padding: 0 12px;
}
-.standard .right .contentTable{
+ .contentTable{
width:98%;
margin-left:1%;
}
--
Gitblit v1.9.3