admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-06-13 09:47:00 +08:00
parent c29b47868a
commit 252b07352e
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -3,6 +3,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
VITE_API_URL = 'http://192.168.34.155:6688' VITE_API_URL = 'http://192.168.34.155:6688'
VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://182.90.224.147:6688" # VITE_API_URL = "http://182.90.224.147:6688"
# 上传 # 上传

5
.env.production
View File

@ -3,8 +3,9 @@ NODE_ENV = "production"
# 线上环境接口地址(easymock) # 线上环境接口地址(easymock)
# VITE_API_URL = "http://139.9.66.234:6688" # VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = "http://182.90.224.147:6688" VITE_API_URL = "http://182.90.224.147:6688"
VITE_API_URL = "http://101.43.164.214:6688" VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://101.43.164.214:6688"
# VITE_API_URL = "https://wx.antjg.com:6081/" # VITE_API_URL = "https://wx.antjg.com:6081/"
# 打包 # 打包

2
src/views/goverment/naturalResources/index.vue
View File

@ -12,7 +12,7 @@ import { GlobalStore } from "@/stores";
onBeforeMount(() => { onBeforeMount(() => {
getToken(); getToken();
}); });
const baseUrl = import.meta.env.VITE_API_URL; const baseUrl = import.meta.env.VITE_WPAPI_URL;
const token = ref(""); const token = ref("");
const getToken = () => { const getToken = () => {
const globalstore = GlobalStore(); const globalstore = GlobalStore();

25
src/views/goverment/qualitySupervision/components/orderAdd.vue
View File

@ -337,11 +337,12 @@
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="membertableData" :data="membertableData"
row-key="userId"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 244px" style="width: 244px"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
<el-table-column prop="realName" label="检查人员"></el-table-column> <el-table-column prop="realName" label="检查人员"></el-table-column>
</el-table> </el-table>
</div> </div>
@ -418,6 +419,7 @@ import {
import { GlobalStore } from "@/stores"; import { GlobalStore } from "@/stores";
import { Delete } from "@element-plus/icons-vue"; import { Delete } from "@element-plus/icons-vue";
import { jxj_User } from "@/api/types"; import { jxj_User } from "@/api/types";
const multipleTable = ref(null);
const memberVisible = ref(false); const memberVisible = ref(false);
const store = GlobalStore(); const store = GlobalStore();
const headers = ref({ Authorization: "Bearer " + store.token }); const headers = ref({ Authorization: "Bearer " + store.token });
@ -575,6 +577,15 @@ const selectMember = async () => {
const res = await getgovNamelist({}); const res = await getgovNamelist({});
console.log(res); console.log(res);
membertableData.value = res.result; membertableData.value = res.result;
console.log(membertableData.value);
console.log(selectedMemberList.value);
selectedMemberList.value.forEach(key => {
membertableData.value.forEach(row => {
if (row.userId == key.userId) {
multipleTable.value.toggleRowSelection(row, true);
}
});
});
memberVisible.value = true; memberVisible.value = true;
}; };
// 删除用户信息 // 删除用户信息
@ -596,9 +607,19 @@ const uploadSuccess = (response: any, index: number) => {
} }
}; };
const handleSelectionChange = val => { const handleSelectionChange = val => {
selectedMemberList.value = val;
console.log(val); console.log(val);
let obj = {};
// 当检查人员表格数据行勾选变换时触发
selectedMemberList.value = val.reduce((item, next) => {
obj[next.userId] ? "" : (obj[next.userId] = true && item.push(next));
return item;
}, []);
console.log(selectedMemberList.value);
}; };
// const handleSelectionAllChange = val => {
// selectedMemberList.value = val;
// console.log(val);
// };
const handleSmallSelectionChange = val => { const handleSmallSelectionChange = val => {
selectedSmallList.value = val; selectedSmallList.value = val;
}; };