admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 资料中心添加权限功能以及修改劳务管理模块中的表格多选功能

Browse Source
This commit is contained in:
kun 2024-06-26 15:46:23 +08:00
parent 1a8d01b208
commit 61c01a9476
7 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@ -185,7 +185,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
// axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
// axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址

16
src/components/account.vue
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: 1,
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({

16
src/store/index.js
View File

@ -52,19 +52,19 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
// UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
// FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
BASEURL: baseUrl ?
baseUrl :
window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// BASEURL: baseUrl ?
// baseUrl :
// window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址

2
src/views/projectFront/laborManage/dataValidation.vue
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

2
src/views/projectFront/laborManage/personModule/administration.vue
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">

2
src/views/projectFront/laborManage/personModule/laborComponent.vue
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">

2
src/views/projectFront/laborManage/rosterNew.vue
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">