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-07 19:20:01 +08:00
parent a8cc3cbd23
commit 8ec68e112e
12 changed files with 31 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -3,8 +3,8 @@ NODE_ENV = "production"
# 线上环境接口地址(easymock)
# VITE_API_URL = "http://139.9.66.234:6688"
# VITE_API_URL = "http://182.90.224.147:6688"
VITE_API_URL = "http://101.43.164.214:6688"
VITE_API_URL = "http://182.90.224.147:6688"
# VITE_API_URL = "http://101.43.164.214:6688"
# 打包
VITE_ULD_API_URL = 'http://182.90.224.147:8012/onlinePreview?url='

BIN
src/assets/images/goverHome/工程审批.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 738 B

BIN
src/assets/images/goverHome/系统管理.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/assets/images/goverHome/项目报监.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 738 B

BIN
src/assets/images/goverHome/项目报监2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 780 B

14
src/views/enterprise/qualitySupervision/components/transformInfo.vue
View File

@ -112,10 +112,10 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn">
<div class="operation-btn" v-if="basicData?.state != 4">
<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
<el-button type="primary">整改完成,全部合格</el-button> -->
<el-button type="primary" :disabled="!isFinished" @click="allSubmit">全部整改完成,提交审核</el-button>
<el-button type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">
@ -151,11 +151,7 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框
const recordData = ref([]); // 整改记录表格数据
const recordRowData = ref(); // 整改记录表格行数据
const basicData = ref(); // 基础信息
const isFinished = ref(true); // 是否全部问题整改完成
const dialogStyle = ref({
"min-width": "824px"
});
@ -343,9 +338,6 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
console.log(recordData);
};

14
src/views/enterprise/safetySupervision/components/transformInfo.vue
View File

@ -112,10 +112,10 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn">
<div class="operation-btn" v-if="basicData?.state != 4">
<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
<el-button type="primary">整改完成,全部合格</el-button> -->
<el-button type="primary" :disabled="!isFinished" @click="allSubmit">全部整改完成,提交审核</el-button>
<el-button type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">
@ -151,11 +151,7 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框
const recordData = ref([]); // 整改记录表格数据
const recordRowData = ref(); // 整改记录表格行数据
const basicData = ref(); // 基础信息
const isFinished = ref(true); // 是否全部问题整改完成
const dialogStyle = ref({
"min-width": "824px"
});
@ -344,9 +339,6 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
console.log(recordData);
};

10
src/views/goverment/notice/newNotification/index.vue
View File

@ -188,10 +188,12 @@ const getMsg = val => {
leftForm.value.content = val;
};
const handlechange = e => {
console.log(e);
current.value.files = e.map(item => {
item.label = current.value.dictLabel;
return item;
});
console.log(annexFileList.value);
};
// 通讯录过滤寻找匹配合适项
let nameList = computed(val => {
@ -305,12 +307,14 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
tags.value.forEach(item => {
const curr: acceptNameList = {};
console.log(item);
if (item.sn) {
if (item.userId) {
(curr.accept = item.userId), (curr.acceptType = 2);
} else if (item.enterpriseSn) {
(curr.accept = item.enterpriseSn), (curr.acceptType = 3);
} else {
} else if (item.projectSn) {
(curr.accept = item.projectSn), (curr.acceptType = 4);
} else {
(curr.accept = item.accept), (curr.acceptType = item.acceptType);
}
console.log(curr);
acceptsList.push(curr);
@ -411,7 +415,7 @@ onMounted(async () => {
item.files = files;
// item.fileName = store.Message?.title;
});
console.log(annexFileList.value);
tags.value = store.Message.acceptList;
tags.value.forEach(item => {

10
src/views/goverment/qualitySupervision/components/transformInfo.vue
View File

@ -112,7 +112,7 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn" v-if="basicData?.state != 1 || basicData?.state != 4">
<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
<el-button type="info" style="margin-right: 98px; border: 0; background-color: #e6e6e6; color: #000000" @click="backAll"
>驳回,请尽快整改</el-button
>
@ -406,10 +406,10 @@ onMounted(() => {});
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
}
> span {
font-weight: 400;
color: #008bff;
> span {
font-weight: 400;
color: #008bff;
}
}
}
}

10
src/views/goverment/safetySupervision/components/transformInfo.vue
View File

@ -112,7 +112,7 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn" v-if="basicData?.state != 1 || basicData?.state != 4">
<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
<el-button type="info" style="margin-right: 98px; border: 0; background-color: #e6e6e6; color: #000000" @click="backAll"
>驳回,请尽快整改</el-button
>
@ -407,10 +407,10 @@ onMounted(() => {});
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
font-weight: 500;
color: #333333;
}
> span {
font-weight: 400;
color: #008bff;
> span {
font-weight: 400;
color: #008bff;
}
}
}
}

14
src/views/project/qualitySupervision/components/transformInfo.vue
View File

@ -112,10 +112,10 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn">
<div class="operation-btn" v-if="basicData?.state != 4">
<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
<el-button type="primary">整改完成,全部合格</el-button> -->
<el-button type="primary" :disabled="!isFinished" @click="allSubmit">全部整改完成,提交审核</el-button>
<el-button type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">
@ -151,11 +151,7 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框
const recordData = ref([]); // 整改记录表格数据
const recordRowData = ref(); // 整改记录表格行数据
const basicData = ref(); // 基础信息
const isFinished = ref(true); // 是否全部问题整改完成
const dialogStyle = ref({
"min-width": "824px"
});
@ -344,9 +339,6 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
console.log(recordData);
};

14
src/views/project/safetySupervision/components/transformInfo.vue
View File

@ -112,10 +112,10 @@
</el-table-column>
</el-table>
</div>
<div class="operation-btn">
<div class="operation-btn" v-if="basicData?.state != 4">
<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
<el-button type="primary">整改完成,全部合格</el-button> -->
<el-button type="primary" :disabled="!isFinished" @click="allSubmit">全部整改完成,提交审核</el-button>
<el-button type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">
@ -151,11 +151,7 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button
style="height: 21px"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -265,7 +261,6 @@ const transformDialog = ref(false); // 整改记录对话框
const recordData = ref([]); // 整改记录表格数据
const recordRowData = ref(); // 整改记录表格行数据
const basicData = ref(); // 基础信息
const isFinished = ref(true); // 是否全部问题整改完成
const dialogStyle = ref({
"min-width": "824px"
});
@ -343,9 +338,6 @@ const getInfo = async () => {
recordData.value = res.result.inspectQuestionList;
recordData.value.map(item => {
item.image = eval(item.image);
if (item.state == 1 || item.state == 4) {
isFinished.value = false;
}
});
console.log(recordData);
};