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

src/views/cnctestlists/cncTestLists.html

@@ -20,13 +20,14 @@
       </el-dropdown>
     </div>
 
-    <div class="content" v-if="cncTestCaseList.length>0">
+    <div class="content">
       <div v-infinite-scroll="getCncTestcaseList"
            infinite-scroll-disabled="disabled">
-        <div class="item-test" v-for="(item, index) in cncTestCaseList" :key="index">
-          <div class="item-left">
-            <img style="width:22px; height:22px;" src="../../assets/images/test-icon@2x.png" alt="">
-            <div style="display: -webkit-box;
+        <div v-if="cncTestCaseList.length>0">
+          <div class="item-test" v-for="(item, index) in cncTestCaseList" :key="index">
+            <div class="item-left">
+              <img style="width:22px; height:22px;" src="../../assets/images/test-icon@2x.png" alt="">
+              <div style="display: -webkit-box;
                 -webkit-box-orient: vertical;
                 -webkit-line-clamp: 2;
                 overflow: hidden;
@@ -37,23 +38,28 @@
                 text-overflow: ellipsis;
                 word-break: break-all;
                 word-wrap: break-word;">{{item.title}}
-            </div>
-          </div>
-          <div class="item-right">
-            <div class="project-name">{{item.houseName}}</div>
-            <div class="qr-num">共{{item.questionCount}}题</div>
-            <div class="watch-test" @click="showQRDialog(item.testcaseId)">
-              <div class="watch-icon">
               </div>
-              <span>查看测试</span>
             </div>
-            <div class="use-test" @click="useCurrentTest(item)">
-              <div class="use-icon">
+            <div class="item-right">
+              <div class="project-name">{{item.houseName}}</div>
+              <div class="qr-num">共{{item.questionCount}}题</div>
+              <div class="watch-test" @click="showQRDialog(item.testcaseId)">
+                <div class="watch-icon">
+                </div>
+                <span>查看测试</span>
+              </div>
+              <div class="use-test" @click="useCurrentTest(item)">
+                <div class="use-icon">
+                </div>
+                <span>使用此测试</span>
               </div>
-              <span>使用此测试</span>
             </div>
           </div>
         </div>
+        <div v-else style="font-size: 18px; width: 100%;height: 100%;
+                font-family: MicrosoftYaHei;text-align: center;
+                color: rgba(53, 62, 96, 1);">测试题目数量为空！
+        </div>
       </div>
       <p class="loading-style" v-if="loadingMore">加载中...</p>
       <p class="loading-style" v-if="noMore&&(pageNo>2)">没有更多了</p>

src/views/cnctestlists/cncTestLists.vue

@@ -150,7 +150,7 @@
             useCurrentTest(item) {
                 let data = {
                     creator: "admin",
-                    ownHouseName: item.houseName,
+                    houseNameList: item.houseNameList,
                     questionCount: item.questionCount,
                     title: item.title,
                     testcaseId: item.testcaseId,