diff --git a/src/App.vue b/src/App.vue
index 4988d33..d19fd5f 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@
<el-header style="height: 62px;" v-if="showHeader">
<Header></Header>
<video class="top_viedo" width="100%" src="./assets/headerBg1.mp4" autoplay loop muted
- poster="review.jpg"></video>
+ ></video>
<div class="bg"></div>
</el-header>
<el-container :class="(showHeader ? 'short-container' : '')">
diff --git a/src/views/elementGroups.vue b/src/views/elementGroups.vue
index 79f34c0..e14d435 100644
--- a/src/views/elementGroups.vue
+++ b/src/views/elementGroups.vue
@@ -18,24 +18,6 @@
<GuipButton type="primary" @click="toggleAllSelection">全选按钮</GuipButton>
<el-form>
- <!-- <el-table :data="tableData">
- <template>
-
- <el-table-column prop="type" width="190">
- <template slot="header">
- <GuipSelect class="custom-select" v-model="chktype" :options="type2filterOptions"
- defaultValue="全部检测类型" @change="changeSelectType" />
- </template>
-
-<template slot-scope="scope">
- {{ type2name[scope.row.type] }}
- </template>
-</el-table-column>
-</template>
-
-</el-table> -->
-
- <!-- style="width:100%; height:500px" -->
<GuipTable :tableData="tableData" ref="multipleTable" @selectChange="handleSelectionChange"
:multiple="true" autoColumn="true" :loading="tableLoading">
<!-- <template slot="header"> -->
@@ -55,7 +37,7 @@
</template>
</el-table-column> -->
- <el-table-column prop="created_at" label="时间" width="150">
+ <el-table-column prop="created_at" label="时间" width="200">
<template slot-scope="scope">
<div class="flex cell_render">
<GuipToolTip content="点击编辑">
@@ -71,15 +53,6 @@
</el-table-column>
<el-table-column prop="unit_num" label="数量" width="150"></el-table-column>
<el-table-column prop="name2" label="姓名" width="150"></el-table-column>
- <!-- <el-table-column prop="name3" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name4" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name5" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name6" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name7" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name8" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name9" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name11" label="姓名" width="150"></el-table-column>
- <el-table-column prop="name12" label="姓名" width="150"></el-table-column> -->
<el-table-column prop="price" label="价格" width="150">
<!-- <template slot-scope="scope">
<span @click="handlePriceClick(scope.row)">{{ scope.row.price }}</span>
@@ -103,7 +76,7 @@
prop="card" :options="options" defaultValue="选项1" />
</template>
</el-table-column>
- <el-table-column label="操作" width="100">
+ <el-table-column label="操作" width="100" fixed>
<template slot-scope="scope">
<div class="flex">
<el-button @click="handleClick(scope.row)" type="text">查看</el-button>
@@ -239,7 +212,7 @@
<label for="">独特按钮单独写样式：</label>
<div class="btn1">创建首个网站</div>
</div>
-
+ <!-- 暂时废弃 -->
<!-- <div class="ele-item">
<label for="">常规按钮：</label>
<GuipButton>默认按钮</GuipButton>
@@ -304,9 +277,6 @@
<el-date-picker v-model="date1" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
- <!-- <GuipButton type="primary" @click="showModal">弹框</GuipButton>
- <GuipButton type="primary" @click="showMessage">轻提示</GuipButton>
- <GuipButton type="primary" @click="getFormdata">提交</GuipButton> -->
</div>
<div ref="ScaleBox" class="ScaleBox">
@@ -338,7 +308,6 @@
<GuipToolTip placement="bottom" effect="light">
<GuipButton type="primary" size="page">自定义提示内容</GuipButton>
-
<template #content>
<div style="max-width: 200px">
<h4>自定义标题</h4>
@@ -347,6 +316,10 @@
</div>
</template>
</GuipToolTip>
+ <GuipToolTip placement="bottom" effect="light" content="点击进入编辑">
+ <svg-icon :path="require('@/assets/register/tableEdit.svg')" :color="'#8A9099'"
+ :hoverColor="'#006AFF'" />
+ </GuipToolTip>
</div>
<GuipDialog :dialogVisible="dialogVisible" title="自定义标题" :show-close-button="false"
@@ -557,6 +530,7 @@ export default {
label: "广州",
}
],
+ tableData:[],
input: 'hahhahah',
defaultValue: 'asdasda',
radio: 3,
@@ -642,10 +616,15 @@ export default {
type: 0,
cur_page: 1,
page_size: 5,
+ },{
+ headers:{
+ 'AUTH': '3c901fa4a19a7ad9d01238890863d499'
+ }
}).then(response => {
this.tableLoading = false
this.$nextTick(() => {
that.tableData = response.data.list
+ console.log(that.tableData,'---that.tableData');
// that.type2name = response.data.type2name
that.total = response.data.total
})
@@ -849,6 +828,7 @@ export default {
.btn1 {
cursor: pointer;
+ font-weight: bold;
width: 114px;
height: 40px;
/* 自动布局 */