Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/views/h5editor/overview.vue

@@ -265,11 +265,7 @@ export default {
       this.isShowQuestion = false;
     },
     setEditingPage(page, index) {
-      if (
-        index == 0 ||
-        (this.pages.length - this.resultPageCount == index &&
-          this.resultPageCount > 0)
-      ) {
+      if (index == 0 || this.isShowResult(index)) {
         this.isShowQuestion = false;
       } else {
         this.isShowQuestion = true;

src/views/myHistoryTest/myHistoryTest.html

@@ -38,10 +38,10 @@
         </div>
       </el-image>
       <div class="tools">
-        <img v-if="item.canDelete" class="item-img delete" src="" alt="" @click="deleteTest(item)">
-        <img class="item-img copy" src="" alt="" @click="copyTest(item)">
-        <img class="item-img share" src="" alt="" @click="shareTest(item)">
-        <img class="item-img edit" src="" alt="" @click="editTest(item)" style="float:right;margin-right:10px;">
+        <div v-if="item.canDelete" class="item-img delete" src="" alt="" @click="deleteTest(item,index)"></div>
+        <div class="item-img copy" src="" alt="" @click="copyTest(item)"></div>
+        <div class="item-img share" src="" alt="" @click="shareTest(item)"></div>
+        <div class="item-img edit" @click="editTest(item)" style="float:right;margin-right:10px;"></div>
       </div>
       <div class="title">{{item.title}}</div>
       <div class="desc">{{item.ownHouseName}}</div>

src/views/myHistoryTest/myHistoryTest.js

@@ -112,7 +112,7 @@ export default {
     createTest() {
       this.$router.push({ path: '/cncTestLists' });
     },
-    deleteTest(item) {
+    deleteTest(item, index) {
       const h = this.$createElement;
       this.$msgbox({
         title: '删除',
@@ -126,11 +126,16 @@ export default {
             instance.confirmButtonText = '执行中...';
             let data = {
               "id": item._id,
+              "operator": "admin"
             }
             api.deleteTest(data).then((res) => {
               if (res.success) {
                 instance.confirmButtonLoading = false;
+                this.$message.success("删除成功");
+                this.pageModel.resultSet.splice(index, 1);
+                done();
               } else {
+                this.$message.error("删除失败,请重试");
                 done();
               }
             })
@@ -139,17 +144,12 @@ export default {
           }
         }
       }).then(() => {
-        this.pageModel.resultSet.splice(index, 1);
-        this.$message({
-          type: 'success',
-          message: '删除成功'
-        });
       }).catch(() => { });
     },
     copyTest(item) {
       let data = {
         "id": item._id,
-        "operator": "测试"
+        "operator": "admin"
       }
       api.copyTest(data).then((res) => {
         if (res.success) {