diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue
index 00c76398..769a2c34 100644
--- a/src/views/jxjadmin/registerAudit.vue
+++ b/src/views/jxjadmin/registerAudit.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="fullHeight">
     <div class="searchBox whiteBlock">
-      <el-form
-        :inline="true"
-        size="medium"
-        :model="searchForm"
-        ref="searchForm"
-      >
+      <el-form :inline="true" size="medium" :model="searchForm" ref="searchForm">
         <el-form-item label="使用状态" prop="useState">
           <el-select v-model="searchForm.useState" placeholder="请选择">
             <el-option label="全部" value=""></el-option>
@@ -15,105 +10,46 @@
           </el-select>
         </el-form-item>
         <el-form-item label="企业名称" prop="companyName" class="last">
-          <el-input
-            v-model="searchForm.companyName"
-            placeholder="请输入"
-            clearable
-          ></el-input>
+          <el-input v-model="searchForm.companyName" placeholder="请输入" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" plain @click="getListData">查询</el-button>
           <el-button type="warning" plain @click="resetForm">刷新</el-button>
-          <el-button type="primary" size="medium" @click="addReg"
-            >添加企业</el-button
-          >
+          <el-button type="primary" size="medium" @click="addReg">添加企业</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="tableData">
-        <el-table-column
-          type="index"
-          width="50"
-          align="center"
-          label="序号"
-        ></el-table-column>
-        <el-table-column
-          prop="companyName"
-          label="企业名称"
-          align="center"
-          width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="realName"
-          label="企业负责人"
-          align="center"
-          width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="account"
-          label="用户账号"
-          align="center"
-          width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="showPassword"
-          label="用户密码"
-          align="center"
-          width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="注册时间"
-          align="center"
-          width="180"
-        ></el-table-column>
-        <el-table-column
-          prop="companyTel"
-          label="手机号码"
-          align="center"
-          width="180"
-        ></el-table-column>
+        <el-table-column type="index" width="50" align="center" label="序号"></el-table-column>
+        <el-table-column prop="companyName" label="企业名称" align="center" width="180"></el-table-column>
+        <el-table-column prop="realName" label="企业负责人" align="center" width="180"></el-table-column>
+        <el-table-column prop="account" label="用户账号" align="center" width="180"></el-table-column>
+        <el-table-column prop="showPassword" label="用户密码" align="center" width="180"></el-table-column>
+        <el-table-column prop="createTime" label="注册时间" align="center" width="180"></el-table-column>
+        <el-table-column prop="companyTel" label="手机号码" align="center" width="180"></el-table-column>
         <el-table-column prop="isEnable" label="使用状态" align="center">
           <template slot-scope="scope">
             {{ scope.row.isEnable == 0 ? '禁用' : '启用' }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="diffDay"
-          label="剩余天数"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="diffDay" label="剩余天数" align="center"></el-table-column>
         <el-table-column prop="diffDay" label="项目数" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.createProjectNum }}/{{ scope.row.projectNum }}
-          </template>
+          <template slot-scope="scope"> {{ scope.row.createProjectNum }}/{{ scope.row.projectNum }} </template>
         </el-table-column>
         <el-table-column prop="address" label="操作" align="center" width="300">
           <template slot-scope="scope">
             <div class="tableBtns">
               <div @click="configuration(scope.row)" class="operationText">
-                <img
-                  src="@/assets/images/accredit.png"
-                  width="15px"
-                  height="15px"
-                />
+                <img src="@/assets/images/accredit.png" width="15px" height="15px" />
                 <span>授权配置</span>
               </div>
               <div @click="edit(scope.row)" class="operationText">
-                <img
-                  src="@/assets/images/icon-edit.png"
-                  width="15px"
-                  height="15px"
-                />
+                <img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
                 <span>编辑</span>
               </div>
               <div @click="deleteDev(scope.row)" class="operationText">
-                <img
-                  src="@/assets/images/icon-delete.png"
-                  width="15px"
-                  height="15px"
-                />
+                <img src="@/assets/images/icon-delete.png" width="15px" height="15px" />
                 <span>删除</span>
               </div>
             </div>
@@ -132,12 +68,7 @@
         background
       ></el-pagination>
     </div>
-    <el-dialog
-      :modal-append-to-body="false"
-      title="授权配置"
-      :visible.sync="authorizedDialog"
-      width="767px"
-    >
+    <el-dialog :modal-append-to-body="false" title="授权配置" :visible.sync="authorizedDialog" width="767px">
       <div class="dialog_content">
         <el-row :gutter="24">
           <el-col :span="11" style="margin: 7px 0px 0 0">
@@ -149,14 +80,7 @@
           </el-col>
           <el-col :span="13" style="text-align: right">
             <span style="margin-right: 15px">到期日期</span>
-            <el-date-picker
-              v-model="time"
-              type="date"
-              placeholder="选择日期"
-              value-format="yyyy-MM-dd"
-              size="medium"
-            >
-            </el-date-picker>
+            <el-date-picker v-model="time" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" size="medium"> </el-date-picker>
           </el-col>
         </el-row>
         <el-row :gutter="24" style="margin-top: 20px">
@@ -169,12 +93,7 @@
           </el-col>
           <el-col :span="13" style="text-align: right">
             <span style="margin-right: 15px">授权项目数</span>
-            <el-input-number
-              v-model="projectNum"
-              :min="1"
-              size="medium"
-              style="width: 220px"
-            ></el-input-number>
+            <el-input-number v-model="projectNum" :min="1" size="medium" style="width: 220px"></el-input-number>
           </el-col>
         </el-row>
         <el-row :gutter="24" style="margin-top: 20px">
@@ -187,11 +106,7 @@
           </el-col>
           <el-col :span="13" style="text-align: right">
             <span style="margin-right: 15px">是否显示项目看板</span>
-            <el-radio-group
-              v-model="projectKanban"
-              size="medium"
-              style="width: 220px; text-align: left"
-            >
+            <el-radio-group v-model="projectKanban" size="medium" style="width: 220px; text-align: left">
               <el-radio :label="0">是</el-radio>
               <el-radio :label="1">否</el-radio>
             </el-radio-group>
@@ -226,16 +141,13 @@
               <el-radio :label="1">否</el-radio>
             </el-radio-group> -->
             <span class="firstConlumLabel">选择系统版本</span>
-            <el-radio-group
-              v-model="styleType"
-              size="medium"
-              @change="getBaseModuleList"
-            >
-              <el-radio :label="1">标准版</el-radio>
-              <el-radio :label="2">星璇版</el-radio>
+            <div style="margin-top:10px"></div>
+            <el-radio-group v-model="styleType" size="medium" @change="getBaseModuleList">
+              <el-radio v-for="item in styleTypeArr" :label="item.data" :key="item.id">{{ item.name }}</el-radio>
+              <!-- <el-radio :label="2">星璇版</el-radio>
               <el-radio :label="3">衢州版</el-radio>
               <el-radio :label="4">三江版</el-radio>
-              <el-radio :label="5">标准七参数版</el-radio>
+              <el-radio :label="5">标准七参数版</el-radio> -->
             </el-radio-group>
           </el-col>
         </el-row>
@@ -260,11 +172,7 @@
           </el-col>
           <el-col :span="13" style="text-align: right">
             <span style="margin-right: 15px">是否能添加项目</span>
-            <el-radio-group
-              v-model="canAddProject"
-              size="medium"
-              style="width: 220px; text-align: left"
-            >
+            <el-radio-group v-model="canAddProject" size="medium" style="width: 220px; text-align: left">
               <el-radio :label="0">是</el-radio>
               <el-radio :label="1">否</el-radio>
             </el-radio-group>
@@ -273,135 +181,56 @@
         <el-row :gutter="24" style="margin-top: 20px">
           <el-col :span="24">
             <div>请勾选功能权限</div>
-            <el-checkbox
-              :indeterminate="isIndeterminate"
-              v-model="checkAll"
-              @change="handleCheckAllChange"
-              >全选</el-checkbox
-            >
-            <el-checkbox-group
-              class="zdy-checkbox"
-              v-model="moduleInfo.moduleId"
-              @change="handleCheckedCitiesChange"
-            >
+            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+            <el-checkbox-group class="zdy-checkbox" v-model="moduleInfo.moduleId" @change="handleCheckedCitiesChange">
               <div class="CheckboxTitle">企业模块</div>
-              <el-checkbox
-                v-if="i.moduleType === 1"
-                v-for="i in companyArr"
-                :key="i.moduleId"
-                :label="i.moduleId"
-                >{{ i.moduleName }}</el-checkbox
-              >
+              <el-checkbox v-if="i.moduleType === 1" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
+                i.moduleName
+              }}</el-checkbox>
               <div class="CheckboxTitle">企业后台模块</div>
-              <el-checkbox
-                v-if="i.moduleType === 3"
-                v-for="i in companyArr"
-                :key="i.moduleId"
-                :label="i.moduleId"
-                >{{ i.moduleName }}</el-checkbox
-              >
+              <el-checkbox v-if="i.moduleType === 3" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
+                i.moduleName
+              }}</el-checkbox>
               <div class="CheckboxTitle">项目模块</div>
-              <el-checkbox
-                v-if="i.moduleType === 2"
-                v-for="i in companyArr"
-                :key="i.moduleId"
-                :label="i.moduleId"
-                >{{ i.moduleName }}</el-checkbox
-              >
+              <el-checkbox v-if="i.moduleType === 2" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
+                i.moduleName
+              }}</el-checkbox>
               <div class="CheckboxTitle">项目看板模块</div>
-              <el-checkbox
-                v-if="i.moduleType === 4"
-                v-for="i in companyArr"
-                :key="i.moduleId"
-                :label="i.moduleId"
-                >{{ i.moduleName }}</el-checkbox
-              >
+              <el-checkbox v-if="i.moduleType === 4" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
+                i.moduleName
+              }}</el-checkbox>
             </el-checkbox-group>
           </el-col>
         </el-row>
         <div class="dialog-footer">
-          <el-button
-            class="cancleBtn"
-            @click="authorizedDialog = false"
-            icon="el-icon-circle-close"
-            size="medium"
-            >取 消</el-button
-          >
-          <el-button
-            type="primary"
-            icon="el-icon-circle-check"
-            @click="saveFn"
-            size="medium"
-            >确 定</el-button
-          >
+          <el-button class="cancleBtn" @click="authorizedDialog = false" icon="el-icon-circle-close" size="medium">取 消</el-button>
+          <el-button type="primary" icon="el-icon-circle-check" @click="saveFn" size="medium">确 定</el-button>
         </div>
       </div>
     </el-dialog>
     <!-- 新增企业弹框 -->
-    <el-dialog
-      :modal-append-to-body="false"
-      @close="close"
-      :title="titleRes"
-      :visible.sync="diaLogShow"
-      width="667px"
-    >
+    <el-dialog :modal-append-to-body="false" @close="close" :title="titleRes" :visible.sync="diaLogShow" width="667px">
       <div class="dialog_content">
-        <el-form
-          size="medium"
-          ref="addEditForm"
-          :model="addEditForm"
-          :rules="addEditRules"
-          label-width="120px"
-          class="dialogFormBox"
-        >
+        <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
           <el-form-item label="企业名称" prop="companyName">
-            <el-input
-              v-model="addEditForm.companyName"
-              placeholder="请输入"
-            ></el-input>
+            <el-input v-model="addEditForm.companyName" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="企业负责人" prop="companyName">
-            <el-input
-              v-model="addEditForm.realName"
-              placeholder="请输入"
-            ></el-input>
+            <el-input v-model="addEditForm.realName" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="用户账号" prop="account">
-            <el-input
-              v-model="addEditForm.account"
-              placeholder="请输入"
-            ></el-input>
+            <el-input v-model="addEditForm.account" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item style="margin-bottom:30px" label="用户密码" prop="showPassword">
-            <el-input
-              type="password"
-              show-password
-              v-model="addEditForm.showPassword"
-              placeholder="请输入"
-            ></el-input>
+            <el-input type="password" show-password v-model="addEditForm.showPassword" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="手机号码" prop="companyTel">
-            <el-input
-              v-model="addEditForm.companyTel"
-              placeholder="请输入"
-            ></el-input>
+            <el-input v-model="addEditForm.companyTel" placeholder="请输入"></el-input>
           </el-form-item>
 
           <div class="dialog-footer">
-            <el-button
-              class="cancleBtn"
-              @click="diaLogShow = false"
-              icon="el-icon-circle-close"
-              size="medium"
-              >取消
-            </el-button>
-            <el-button
-              type="primary"
-              icon="el-icon-circle-check"
-              @click="submit"
-              size="medium"
-              >确定
-            </el-button>
+            <el-button class="cancleBtn" @click="diaLogShow = false" icon="el-icon-circle-close" size="medium">取消 </el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="submit" size="medium">确定 </el-button>
           </div>
         </el-form>
       </div>
@@ -415,13 +244,12 @@ import {
   baseModuleList,
   getCompanyModuleList,
   baseModuleProjectEdit,
-  addHeadquarterCompanyApi,//新增
+  addHeadquarterCompanyApi, //新增
   editHeadquarterCompanyApi,
   deleteHeadquarterCompanyApi,
+  getStyleTypeArr
 } from '@/assets/js/api/jxjadmin.js'
-import {
-  checkPhone
-} from '@/assets/js/util.js'
+import { checkPhone } from '@/assets/js/util.js'
 export default {
   name: 'registerAudit',
   data() {
@@ -469,7 +297,7 @@ export default {
         realName: '',
         account: '',
         companyTel: '',
-        showPassword: '',
+        showPassword: ''
       },
       addEditRules: {
         companyName: [
@@ -512,7 +340,7 @@ export default {
           {
             required: true,
             message: '必填',
-            trigger: "blur",
+            trigger: 'blur'
           },
           {
             pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+~`\-={}[\]:";'<>?,./])[a-zA-Z\d!@#$%^&*()_+~`\-={}[\]:";'<>?,./]{8,}$/,
@@ -531,41 +359,53 @@ export default {
             message: '必填',
             trigger: 'change'
           }
-        ],
+        ]
       },
       titleRes: '',
+      styleTypeArr: []
     }
   },
   created() {
     this.getListData()
+    this.getStyleTypeArrByCode()
   },
   methods: {
+    getStyleTypeArrByCode() {
+      getStyleTypeArr({ dictionaryEncoding: 'base_module_style_type' }).then(res => {
+        if (res.result.length > 0) {
+          // console.log("获取字典", res);
+          this.styleTypeArr = res.result
+          // this.styleType = Number(res.result[0].data)
+          console.log('获取字典', this.styleTypeArr)
+        }
+      })
+    },
     addReg() {
       this.diaLogShow = true
       this.titleRes = '添加企业'
     },
     edit(obj) {
-      console.log('编辑', obj);
+      console.log('编辑', obj)
       this.diaLogShow = true
       this.addEditForm = JSON.parse(JSON.stringify(obj))
       this.titleRes = '编辑企业'
     },
     //删除数
     deleteDev(obj) {
-      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          deleteHeadquarterCompanyApi({ id: obj.companyId }).then((result) => {
+          deleteHeadquarterCompanyApi({ id: obj.companyId }).then(result => {
             if (result.success) {
               this.$message.success(result.message)
               this.getListData()
             }
           })
         })
-        .catch(() => { })
+        .catch(() => {})
     },
     submit() {
       if (this.addEditForm.companyTel) {
@@ -576,17 +416,17 @@ export default {
       }
       let params = JSON.parse(JSON.stringify(this.addEditForm))
       params.projectSn = this.$store.state.projectSn
-      this.$refs.addEditForm.validate((valid) => {
+      this.$refs.addEditForm.validate(valid => {
         if (valid) {
           if (this.titleRes == '添加企业') {
-            addHeadquarterCompanyApi(params).then((result) => {
+            addHeadquarterCompanyApi(params).then(result => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getListData()
               }
             })
           } else if (this.titleRes == '编辑企业') {
-            editHeadquarterCompanyApi(params).then((result) => {
+            editHeadquarterCompanyApi(params).then(result => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getListData()
@@ -622,17 +462,15 @@ export default {
           enterProjectBackType: this.canGoProjectEnd,
           addProjectType: this.canAddProject
         }
-        editCompanyConfigApi(json).then((res) => {
-          let moduleIdStr = JSON.parse(
-            JSON.stringify(this.moduleInfo)
-          ).moduleId.join(',')
+        editCompanyConfigApi(json).then(res => {
+          let moduleIdStr = JSON.parse(JSON.stringify(this.moduleInfo)).moduleId.join(',')
           console.log('查看form', moduleIdStr, this.moduleInfo)
           baseModuleProjectEdit({
             headquartersSn: this.moduleInfo.headquartersSn,
             moduleIdStr: moduleIdStr,
             sn: this.moduleInfo.companySn,
             type: '1'
-          }).then((res) => {
+          }).then(res => {
             // this.$message.success('配置成功！')
           })
           this.authorizedDialog = false
@@ -647,7 +485,7 @@ export default {
       data.pageNo = this.pageNo
       data.pageSize = this.pageSize
 
-      getRegisterAuditList(data).then((res) => {
+      getRegisterAuditList(data).then(res => {
         console.log(res)
         this.tableData = res.result.records
         this.total = res.result.total
@@ -674,7 +512,7 @@ export default {
       this.companyBigScreen = item.companyBigScreen
       this.mobileAttendance = item.mobileAttendance
       this.inputQrCode = item.inputQrCode
-      this.styleType = item.styleType
+      this.styleType = String(item.styleType)
 
       this.canGoProjectEnd = item.enterProjectBackType
       this.canAddProject = item.addProjectType
@@ -692,33 +530,31 @@ export default {
       this.getListData()
     },
     getBaseModuleList() {
-      baseModuleList({ moduleType: '', styleType: this.styleType }).then(
-        (result) => {
-          if (result.success) {
-            let brHtm = {}
-            this.companyArr = result.result
-            this.companyArr.map((item) => {
-              this.cityOptions.push(item.moduleId)
-            })
-            this.brHtm = brHtm
-            // console.log('查看要换行的位置',brHtm)
-            // console.log('列表查询所有模块信息',this.companyArr)
-          }
+      let styleType = Number(this.styleType)
+      console.log('打印', styleType)
+      baseModuleList({ moduleType: '', styleType: styleType }).then(result => {
+        if (result.success) {
+          let brHtm = {}
+          this.companyArr = result.result
+          this.companyArr.map(item => {
+            this.cityOptions.push(item.moduleId)
+          })
+          this.brHtm = brHtm
+          // console.log('查看要换行的位置',brHtm)
+          // console.log('列表查询所有模块信息',this.companyArr)
         }
-      )
+      })
     },
     getCompanyList(headquartersSn) {
-      getCompanyModuleList({ headquartersSn: headquartersSn }).then(
-        (result) => {
-          if (result.success) {
-            result.result.map((item) => {
-              this.moduleInfo.moduleId.push(item.moduleId)
-            })
-            // console.log('查询总企业默认的模块列表',result.result)
-            this.handleCheckedCitiesChange(this.moduleInfo.moduleId)
-          }
+      getCompanyModuleList({ headquartersSn: headquartersSn }).then(result => {
+        if (result.success) {
+          result.result.map(item => {
+            this.moduleInfo.moduleId.push(item.moduleId)
+          })
+          // console.log('查询总企业默认的模块列表',result.result)
+          this.handleCheckedCitiesChange(this.moduleInfo.moduleId)
         }
-      )
+      })
     },
     handleCheckAllChange(val) {
       this.moduleInfo.moduleId = val ? this.cityOptions : []
@@ -727,15 +563,14 @@ export default {
     handleCheckedCitiesChange(value) {
       let checkedCount = value.length
       this.checkAll = checkedCount === this.cityOptions.length
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.cityOptions.length
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.cityOptions.length
     },
     close() {
       this.addEditForm = {}
       this.$nextTick(() => {
         this.$refs.addEditForm.clearValidate()
       })
-    },
+    }
   }
 }
 </script>
@@ -782,4 +617,4 @@ export default {
   // margin-right: 15px;
   display: inline-block;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/projectFront/smartBeamField/beamManage.vue b/src/views/projectFront/smartBeamField/beamManage.vue
index e521f4f1..e5186626 100644
--- a/src/views/projectFront/smartBeamField/beamManage.vue
+++ b/src/views/projectFront/smartBeamField/beamManage.vue
@@ -289,24 +289,7 @@ export default {
           value: 3
         }
       ],
-      bridgeSectionList: [
-        {
-          name: '桥段1',
-          id: 1
-        },
-        {
-          name: '桥段2',
-          id: 2
-        },
-        {
-          name: '桥段3',
-          id: 3
-        },
-        {
-          name: '桥段4',
-          id: 4
-        }
-      ],
+      bridgeSectionList: [],
       input1: '', // 桥段
       currentBridgeInfo: '', //桥段item
       activeBuildIndex: '', //当前选中桥段
diff --git a/src/views/projectFront/smartBeamField/planManage.vue b/src/views/projectFront/smartBeamField/planManage.vue
index bd89c306..0fad04d1 100644
--- a/src/views/projectFront/smartBeamField/planManage.vue
+++ b/src/views/projectFront/smartBeamField/planManage.vue
@@ -289,24 +289,7 @@ export default {
           value: 3
         }
       ],
-      bridgeSectionList: [
-        {
-          name: '桥段1',
-          id: 1
-        },
-        {
-          name: '桥段2',
-          id: 2
-        },
-        {
-          name: '桥段3',
-          id: 3
-        },
-        {
-          name: '桥段4',
-          id: 4
-        }
-      ],
+      bridgeSectionList: [],
       input1: '', // 桥段
       currentBridgeInfo: '', //桥段item
       activeBuildIndex: '', //当前选中桥段