flx:冲突

This commit is contained in:
X_Rian 2024-06-27 14:35:05 +08:00
commit f98e41e2c5
5 changed files with 19 additions and 5 deletions

View File

@ -201,13 +201,16 @@
</div>
</template>
<script>
import {
getNewUserAllModulePageApi,
} from "@/assets/js/api/jxjadmin.js";
export default {
data() {
return {
COMPANY: COMPANY,
projectType: "",
loginData: "",
dataCenter1: "",
dataCenter1: 0,
seeEquipment: "",
projectBackground: "项目后台",
enterpriseBackground: "企业后台",
@ -233,6 +236,7 @@ export default {
this.projectType = PROJECT_TYPE;
this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
this.seeEquipment = this.$store.state.userInfo.seeEquipment;
// this.getModuleList();
console.log("seeEquipment------", this.seeEquipment);
console.log(" this.loginData===================", this.loginData);
if (this.loginData.headerConfiguration != "") {
@ -263,6 +267,16 @@ export default {
// console.log('',this.enterpriseBackground)
},
methods: {
//
getModuleList() {
let allModuleList = this.$store.state.userInfo.menuAuthority.moduleList;
for(let i = 0;i<allModuleList.length;i++){
if(allModuleList[i].modulePath == '/companyAdmin/docManage'){ //
this.dataCenter1 = 0;
break;
}
}
},
//
updatePw() {
this.$router.push({

View File

@ -75,11 +75,11 @@
:data="tableList"
@selection-change="handleSelectionChange"
>
<!-- :reserve-selection="true" -->
<el-table-column
align="center"
type="selection"
width="55"
:reserve-selection="true"
>
</el-table-column>
<el-table-column

View File

@ -490,10 +490,10 @@
row-key="id"
:row-class-name="tableRowClassName"
>
<!-- :reserve-selection="true" -->
<el-table-column
type="selection"
width="55"
:reserve-selection="true"
:selectable="selectEnable"
></el-table-column>
<el-table-column prop="workerName">

View File

@ -452,10 +452,10 @@
row-key="id"
:row-class-name="tableRowClassName"
>
<!-- :reserve-selection="true" -->
<el-table-column
type="selection"
width="55"
:reserve-selection="true"
:selectable="selectEnable"
></el-table-column>
<el-table-column prop="workerName">

View File

@ -221,11 +221,11 @@
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
>
<!-- :reserve-selection="true" -->
<el-table-column
align="center"
type="selection"
width="55"
:reserve-selection="true"
>
</el-table-column>
<el-table-column prop="attendanceNumber">