合并分支 'thy' 到 'master'

src/components/reportAssess/reportAssess.vue

@@ -245,26 +245,53 @@
 
                                         </div>
 
-
+                                         <el-table
+                                       
+                                    :data=" item.technologyContents"
+                                    style="width: 100%"
+                                    
+                                    >
+                                    <el-table-column
+                                    align='center'
+                                    width="200"
+                                        prop="keyWord"
+                                        label="关键字"
+                                    >
+                                    </el-table-column>
+                                        <el-table-column
+                                    align='center'
+                                        prop="file"
+                                        label="所在文件"
+                                    >
+                                    </el-table-column>
+                                        <el-table-column
+                                    align='center'
+                                    width="100"
+                                        prop="position"
+                                        label="位置"
+                                    >
+                                    </el-table-column>
+    
+                                </el-table>
                                         <!--<div v-if="currenIndex == index && isTear">-->
-                                        <table cellspacing="0" cellpadding="0" style="width: 88%;text-align: center;cursor: default; ">
-                                            <tr>
+                                        <!-- <table cellspacing="0" cellpadding="0" style="width: 88%;text-align: center;cursor: default; ">
+                                            <tr> -->
                                                 <!--<th>本地程序开发</th>-->
-                                                <th>关键字</th>
+                                                <!-- <th>关键字</th>
                                                 <th>所在文件</th>
-                                                <th>位置</th>
+                                                <th>位置</th> -->
                                                 <!--<th>替换策略</th>-->
-                                            </tr>
+                                            <!-- </tr>
                                             <tbody>
                                             <tr v-for="(itemson,index) in item.technologyContents">
-                                                <!--<td width="15%">{{item.local}}</td>-->
-                                                <td width="20%">{{itemson.keyWord}}</td>
+                                                <!- -<td width="15%">{{item.local}}</td>-->
+                                                <!-- <td width="20%">{{itemson.keyWord}}</td>
                                                 <td width="20%">{{itemson.file}}</td>
-                                                <td width="20%">{{itemson.position}}</td>
+                                                <td width="20%">{{itemson.position}}</td> --> 
                                                 <!--<td width="20%">{{item.strategy}}</td>-->
-                                            </tr>
+                                            <!-- </tr>
                                             </tbody>
-                                        </table>
+                                        </table> -->
 
                                         <!--</div>-->
 

src/components/roleDispose/addRole.vue

@@ -63,11 +63,13 @@ export default {
         console.log(this.detailData)
         if (this.modalName === '修改规则') {
           let row = JSON.stringify(this.detailData); //克隆影响原数据需要处理一下
-         
+          let obj = JSON.parse(row)
+          obj.suffix =  obj.suffix.split(",")
          this.oldRule = JSON.parse(row);
+         this.oldRule.suffix =  this.oldRule.suffix.split(",")
          this.form = {
             target:this.detailData.target,
-            suffix:this.detailData.suffix,
+            suffix: obj.suffix,
             technologyId:this.detailData.technologyId,
             id:this.detailData.id
          }