Merge branch 'master' into 'fix_uat_20230719'

Master

See merge request laws-nio/laws-weilai!355

jero-web/src/components/tableCollection/index.vue

@@ -781,7 +781,8 @@
         }
         let paramscm = {
           paramsManifestId: paramsManifestid,
-          moduleFlag:'参数项收集清单'
+          moduleFlag:'参数项收集清单',
+          flag: this.$route.query.it === undefined ? '' : '7'
         }
         var jsonHead = []
         getAction(url, paramscm).then((res) => {

jero-web/src/views/phoneView/problemKnowledgeBase.vue

@@ -24,7 +24,7 @@
       </div>
     </div>
 
-    <div class="content" id="contentId" v-html="queryForm.content">
+    <div class="content" id="contentId" @click="contentIdClick($event)" v-html="queryForm.content">
 
     </div>
 
@@ -172,14 +172,13 @@
           }
         })
       }
-      this.$nextTick(() => {
-        let contentId = document.getElementById('contentId')
-        contentId.onclick = function(e) {
-          if (e.target.localName == 'img') {
-            ImagePreview([e.target.currentSrc])
-          }
-        }
-      })
+      // this.$nextTick(() => {
+      //   let contentId = document.getElementById('contentId')
+      //   console.log(contentId)
+      //   contentId.onclick = function(e) {
+      //     console.log(e)
+      //   }
+      // })
       window.addEventListener('scroll', this.scrolling)
       window.addEventListener('mousedown', this.handleonmousedown)
       this.getQueryBy()
@@ -205,6 +204,11 @@
       // scrolling() {
       //   this.isDisplay = false
       // },
+      contentIdClick(e){
+        if (e.target.localName == 'img') {
+          ImagePreview([e.target.currentSrc])
+        }
+      },
       handleonmousedown(e) {
         if (e.srcElement.type == 'textarea' || e.target.type == 'textarea') {