From 3f9b4ff6d6a9db7e0577cf55701d73d9eb33aaa4 Mon Sep 17 00:00:00 2001
From: yanzili <978387851@qq.com>
Date: Wed, 30 Jun 2021 11:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/bigscreen/designer/index.vue | 31 +++++++-------
 .../src/views/report/datasource/index.vue     | 37 +++++++++++++----
 .../src/views/report/resultset/index.vue      | 40 ++++++++++++++-----
 3 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue
index b733157d..8c3df0d6 100644
--- a/report-ui/src/views/report/bigscreen/designer/index.vue
+++ b/report-ui/src/views/report/bigscreen/designer/index.vue
@@ -59,21 +59,15 @@
                 <li>
                   <div><i class="el-icon-full-screen mr10"></i>边框 <i class="el-icon-arrow-right ml20"></i></div>
                   <ul class="three-level">
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
+                    <li><a href="#">122222222</a></li>
+                    <li><a href="#">222222222222312</a></li>
+                    <li><a href="#">3ewwwwwrwerwer</a></li>
                   </ul>
                 </li>
                 <li>
                   <div><i class="el-icon-magic-stick mr10"></i>装饰<i class="el-icon-arrow-right ml20"></i></div>
                   <ul class="three-level">
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
-                    <li><a href="#">三级菜单项</a></li>
+                    <!-- <li><a href="#">4</a></li> -->
                   </ul>
                 </li>
               </ul>
@@ -866,7 +860,7 @@ li {
 }
 
 .nav ul {
-  display: none;
+  // display: none;
   background: #00113a;
   position: absolute;
   z-index: 10000;
@@ -881,14 +875,21 @@ li {
   display: block;
 }
 .nav > li > .three-level > li > a {
-  width: 10em;
+  width: 100%;
   padding-left: 1em;
   padding-right: 1em;
   background-color: #0f2030;
 }
-// .nav li .three-level li {
-//   display: none;
-// }
+.nav li .three-level {
+  padding: 10px 20px;
+}
+.nav li .three-level li {
+  width: 33.333%;
+  height: 80px;
+  float: left;
+  height: 80px;
+  display: inline-block;
+}
 .nav > li > ul > li:hover > a {
   display: block;
   background-color: #182e42;
diff --git a/report-ui/src/views/report/datasource/index.vue b/report-ui/src/views/report/datasource/index.vue
index 7ccfd658..e23bfbf7 100644
--- a/report-ui/src/views/report/datasource/index.vue
+++ b/report-ui/src/views/report/datasource/index.vue
@@ -106,11 +106,12 @@
         <template slot-scope="scope">
           <el-button type="text"
                      @click="showAddLogModel(scope.row)">编辑</el-button>
-          <el-popconfirm :title="'确定删除' + scope.row.sourceNameCode + '吗？'"
-                         @onConfirm="delData(scope.row)">
-            <el-button slot="reference"
-                       type="text">删除</el-button>
-          </el-popconfirm>
+          <!-- <el-popconfirm :title="'确定删除' + scope.row.sourceNameCode + '吗？'"
+                         @onConfirm="delData(scope.row)"> -->
+          <el-button slot="reference"
+                     @click="delData(scope.row)"
+                     type="text">删除</el-button>
+          <!-- </el-popconfirm> -->
         </template>
       </el-table-column>
     </el-table>
@@ -376,9 +377,29 @@ export default {
       })
     },
     async delData (val) {
-      const { code } = await deleteDataSource(val)
-      if (code != '200') return
-      this.queryByPage()
+      this.$confirm('确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          this.$emit('deletelayer')
+          this.visible = false
+          const { code, data } = await deleteDataSource(val)
+          if (code != '200') return
+          this.queryByPage()
+          this.$message({
+            type: 'success',
+            message: '删除成功!',
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          })
+        })
+
     },
     // 提交
     async UserConfirm (formName) {
diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue
index 70b823e4..d581a6f6 100644
--- a/report-ui/src/views/report/resultset/index.vue
+++ b/report-ui/src/views/report/resultset/index.vue
@@ -97,11 +97,12 @@
           <el-button size="mini"
                      type="text"
                      @click="addOrEditDataSet(scope.row)">编辑</el-button>
-          <el-popconfirm :title="'确定删除' + scope.row.setName + '吗？'"
-                         @onConfirm="delect(scope.row)">
-            <el-button slot="reference"
-                       type="text">删除</el-button>
-          </el-popconfirm>
+          <!-- <el-popconfirm :title="'确定删除' + scope.row.setName + '吗？'"
+                         @onConfirm="delect(scope.row)"> -->
+          <el-button slot="reference"
+                     type="text"
+                     @click="delect(scope.row)">删除</el-button>
+          <!-- </el-popconfirm> -->
         </template>
       </el-table-column>
     </el-table>
@@ -614,10 +615,29 @@ export default {
       this.caseResultTitle = item.setName
       this.caseResultContent = JSON.parse(item.caseResult)
     },
-    async delect (row) {
-      this.visible = false
-      const { code, data } = await deleteDataSet(row)
-      if (code != '200') return
+    delect (row) {
+      this.$confirm('确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          this.$emit('deletelayer')
+          this.visible = false
+          const { code, data } = await deleteDataSet(row)
+          if (code != '200') return
+          this.queryByPage()
+          this.$message({
+            type: 'success',
+            message: '删除成功!',
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除',
+          })
+        })
     },
     // 编辑数据集,获取单条数据详情
     addOrEditDataSet (row) {
@@ -901,9 +921,11 @@ export default {
             if (this.dialogFormVisibleTitle === '新增数据集') {
               const { code } = await addDataSet(this.formData)
               if (code != '200') return
+              this.queryByPage()
             } else {
               const { code } = await editDataSet(this.formData)
               if (code != '200') return
+              this.queryByPage()
             }
             this.dialogFormVisible = false
           } else {