flx:冲突
This commit is contained in:
commit
f98e41e2c5
@ -201,13 +201,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
import {
|
||||||
|
getNewUserAllModulePageApi,
|
||||||
|
} from "@/assets/js/api/jxjadmin.js";
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
COMPANY: COMPANY,
|
COMPANY: COMPANY,
|
||||||
projectType: "",
|
projectType: "",
|
||||||
loginData: "",
|
loginData: "",
|
||||||
dataCenter1: "",
|
dataCenter1: 0,
|
||||||
seeEquipment: "",
|
seeEquipment: "",
|
||||||
projectBackground: "项目后台",
|
projectBackground: "项目后台",
|
||||||
enterpriseBackground: "企业后台",
|
enterpriseBackground: "企业后台",
|
||||||
@ -233,6 +236,7 @@ export default {
|
|||||||
this.projectType = PROJECT_TYPE;
|
this.projectType = PROJECT_TYPE;
|
||||||
this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
|
this.loginData = JSON.parse(localStorage.getItem("systemInfo"));
|
||||||
this.seeEquipment = this.$store.state.userInfo.seeEquipment;
|
this.seeEquipment = this.$store.state.userInfo.seeEquipment;
|
||||||
|
// this.getModuleList();
|
||||||
console.log("seeEquipment------", this.seeEquipment);
|
console.log("seeEquipment------", this.seeEquipment);
|
||||||
console.log(" this.loginData===================", this.loginData);
|
console.log(" this.loginData===================", this.loginData);
|
||||||
if (this.loginData.headerConfiguration != "") {
|
if (this.loginData.headerConfiguration != "") {
|
||||||
@ -263,6 +267,16 @@ export default {
|
|||||||
// console.log('企业后台',this.enterpriseBackground)
|
// console.log('企业后台',this.enterpriseBackground)
|
||||||
},
|
},
|
||||||
methods: {
|
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() {
|
updatePw() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
|
|||||||
@ -75,11 +75,11 @@
|
|||||||
:data="tableList"
|
:data="tableList"
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
>
|
>
|
||||||
|
<!-- :reserve-selection="true" -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
:reserve-selection="true"
|
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|||||||
@ -490,10 +490,10 @@
|
|||||||
row-key="id"
|
row-key="id"
|
||||||
:row-class-name="tableRowClassName"
|
:row-class-name="tableRowClassName"
|
||||||
>
|
>
|
||||||
|
<!-- :reserve-selection="true" -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
:reserve-selection="true"
|
|
||||||
:selectable="selectEnable"
|
:selectable="selectEnable"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column prop="workerName">
|
<el-table-column prop="workerName">
|
||||||
|
|||||||
@ -452,10 +452,10 @@
|
|||||||
row-key="id"
|
row-key="id"
|
||||||
:row-class-name="tableRowClassName"
|
:row-class-name="tableRowClassName"
|
||||||
>
|
>
|
||||||
|
<!-- :reserve-selection="true" -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
:reserve-selection="true"
|
|
||||||
:selectable="selectEnable"
|
:selectable="selectEnable"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column prop="workerName">
|
<el-table-column prop="workerName">
|
||||||
|
|||||||
@ -221,11 +221,11 @@
|
|||||||
:row-class-name="tableRowClassName"
|
:row-class-name="tableRowClassName"
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
>
|
>
|
||||||
|
<!-- :reserve-selection="true" -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
:reserve-selection="true"
|
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="attendanceNumber">
|
<el-table-column prop="attendanceNumber">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user