查重暂存

src/Form/projectChange/add.vue

@@ -456,9 +456,11 @@
                 : "--"
             }}</span>
           </div>
-<!--          <div v-else-if="scope.column.columnname == 'projectname'">-->
-<!--            <span>{{getFontHighlight(scope.column.data.projectname,scope.column.data.chars[0].projectname)}}</span>-->
-<!--          </div>-->
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
             <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
@@ -962,7 +964,7 @@ export default {
           this.repeats = res.data;
           this.total = res.total;
           this.$refs.form.validateField("projectname");
-          // this.getFontHighlight(res.data)
+          this.getFontHighlight(res.data)
           if (this.repeats.length > 0) {
             this.siteid == "HY"
                 ? (this.dialogTableVisible = true)
@@ -992,35 +994,24 @@ export default {
       this.projectLead = res2.data;
     },
     getFontHighlight(data){
-      data.map(item =>{
-        console.log(item.chars[0].projectname,'item3333')
-        let newName = item.projectname.split('').map(newText => {
-          console.log(text,'text2222')
-          let projectnamenew = item.chars[0].projectname.join("") || ''
-          return projectnamenew.includes(newText) ? {
+      data.map(item => {
+        item.chars = item.chars.reduce((acc,ite) => ({
+          ...acc,
+          ...ite
+        }),{})
+
+        item.projectname = item.projectname.split('').map(text => {
+          let projectname = item.chars.projectname.join("") || ''
+          return projectname.includes(text) ? {
             text,
-            color: "red"
-          }:{
+            color: 'red'
+          } : {
             text,
-            color:'#666'
+            color: '#666'
           }
         })
-        console.log(newName,'newName')
-        return newName
+        return item
       })
-      console.log(data,'重组数组')
-      return data
-      // let newName = data[0].charts.projectname.split('').map(text => {
-      //   let projectname = set.join("") || ''
-      //   return projectname.includes(text) ? {
-      //     text,
-      //     color: "red"
-      //   }:{
-      //     text,
-      //     color:'#666'
-      //   }
-      // })
-      // return newName
     }
   },
   mounted() {},

src/components/duplicatesCheck/projectCheck.vue

@@ -39,8 +39,13 @@
           <div v-else-if="scope.column.columnname === 'leader'">
             <span>{{scope.column.data.leader?scope.column.data.leader.length !== 0 ? scope.column.data.leader[0].name:'--':'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <span v-for="item in scope.column.data.projectname" :key="item.index">
+              <span :style="{color:item.color}">{{item.text}}</span>
+            </span>
+          </div>
           <div v-else-if="scope.column.columnname == 'address'">
-            <span>{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
+            <span :style="{color:scope.column.data.address.includes(scope.column.data.chars.address)?'red':'#666'}">{{scope.column.data.address || scope.column.data.province?scope.column.data.province+scope.column.data.city+scope.column.data.county+scope.column.data.address:'--'}}</span>
           </div>
           <p
             v-else
@@ -119,6 +124,7 @@ export default {
       } else {
         if (res.total > 0) {
           this.list = res.data;
+          this.getFontHighlight(res.data)
           this.total = res.total;
           this.currentPage = res.pageNumber;
           if (this.siteid == "HY") {
@@ -304,6 +310,28 @@ export default {
         this.listData();
       }
     },
+    getFontHighlight(data){
+      data.map(item => {
+        item.chars = item.chars.reduce((acc,ite) => ({
+          ...acc,
+          ...ite
+        }),{})
+
+        item.projectname = item.projectname.split('').map(text => {
+          let projectname = item.chars.projectname.join("") || ''
+          return projectname.includes(text) ? {
+            text,
+            color: 'red'
+          } : {
+            text,
+            color: '#666'
+          }
+        })
+        console.log(data,'1111')
+        console.log(item,'item333333')
+        return item
+      })
+    }
   },
   created() {
     this.tablecols = this.tool.tabelCol(