Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/views/AuxiliaryIndex/index.vue

@@ -158,7 +158,7 @@
               v-for="(item, i) in roleList"
               :key="item.value"
               :label="item.roleName"
-              :value="item.roleId"
+              :value="item.roleId+''"
             >
             </el-option>
           </el-select>
@@ -398,7 +398,6 @@ export default {
       getNORMROLE(id).then((response) => {
         this.form = response.data;
         this.form.roleName = "张三";
-        console.log(this.form);
         this.open = true;
         this.title = "修改辅助指标采集权限分配";
       });

src/views/RightDistribution/index.vue

@@ -158,7 +158,7 @@
               v-for="item in roleList"
               :key="item.value"
               :label="item.roleName"
-              :value="item.roleId"
+              :value="item.roleId + ''"
             >
             </el-option>
           </el-select>
@@ -240,7 +240,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         id: null,
-        nsType:1,
+        nsType: 1,
         createTime: null,
         createBy: null,
         updateTime: null,
@@ -388,6 +388,7 @@ export default {
       const id = row.id || this.ids;
       getNORMROLE(id).then((response) => {
         this.form = response.data;
+        console.log(typeof this.form.senId);
         this.open = true;
         this.title = "修改指标采集权限配置";
       });