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-08-09 18:36:33 +08:00
parent 8d6646319f
commit b21869e5ae
10 changed files with 75 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/enterprise/dustSupervision/dustManagement/index.vue
View File

@ -159,7 +159,7 @@ const formConfig = reactive({
name: [ name: [
{ {
required: true, required: true,
message: "请输入视频名称", message: "请输入设备名称",
trigger: "blur" trigger: "blur"
} }
], ],

1
src/views/enterprise/progressManagement/planFinishSituation/index.vue
View File

@ -165,6 +165,7 @@ const handleAddItem = () => {
openVisible.value = true; openVisible.value = true;
}; };
const saveItem = async (form: any) => { const saveItem = async (form: any) => {
form.engineeringSn = searchSn.value;
if (form.id) { if (form.id) {
// console.log(form.dictCode); // console.log(form.dictCode);
const res = await applyTimeAdd(form); const res = await applyTimeAdd(form);

34
src/views/enterprise/progressManagement/subItemManagement/index.vue
View File

@ -51,21 +51,25 @@
<el-table-column align="center" prop="completeRatio" label="完成比率(%)"></el-table-column> <el-table-column align="center" prop="completeRatio" label="完成比率(%)"></el-table-column>
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
<template #default="scope"> <template #default="scope">
<span>{{ <span
scope.row.state == 1 >{{
? "未开始" scope.row.state == 1
: scope.row.state == 2 ? "未开始"
? "进行中" : scope.row.state == 2
: scope.row.state == 3 ? "进行中"
? "已完成" : scope.row.state == 3
: scope.row.state == 4 ? "已完成"
? "逾期未开始" : scope.row.state == 4
: scope.row.state == 5 ? "逾期未开始"
? "逾期进行中" : scope.row.state == 5
: scope.row.state == 6 ? "逾期进行中"
? "逾期已完成" : scope.row.state == 6
: "" ? "逾期已完成"
}}</span> : ""
}}<span style="color: red" v-if="scope.row.slippage"
>(逾期{{ scope.row.slippage ? scope.row.slippage + "天" : "" }})</span
>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="300" label="操作"> <el-table-column align="center" width="300" label="操作">

7
src/views/goverment/approve/company/components/unit-table.vue
View File

@ -102,10 +102,9 @@ const uplUrl = import.meta.env.VITE_ULD_API_URL;
const onPreview = row => { const onPreview = row => {
// console.log(row); // console.log(row);
let arr = row.licenseImageOriginalName.split(".");
const url = Base64.encode( console.log(arr[1]);
baseUrl + "/xmgl/file/preview?fileUrl=" + row.licenseImage + "&fullfilename=" + row.licenseImageOriginalName const url = Base64.encode(baseUrl + "/xmgl/file/preview?fileUrl=" + row.licenseImage + "&fullfilename=123." + arr[1]);
);
// 标记打包 // 标记打包
// const url1 = "http://182.90.224.147:8012/onlinePreview?url="; // const url1 = "http://182.90.224.147:8012/onlinePreview?url=";
// const uplUrl = "http://192.168.34.122:8012/onlinePreview?url="; // const uplUrl = "http://192.168.34.122:8012/onlinePreview?url=";

4
src/views/goverment/approve/company/index.vue
View File

@ -279,7 +279,9 @@ const getTableList = (params: any) => {
}; };
const onPreview = () => { const onPreview = () => {
const url = Base64.encode(baseUrl + "/xmgl/file/preview?fileUrl=" + fileUrl.value + "&fullfilename=" + fileName.value); let arr = fileName.value.split(".");
console.log(arr[1]);
const url = Base64.encode(baseUrl + "/xmgl/file/preview?fileUrl=" + fileUrl.value + "&fullfilename=123." + arr[1]);
// 标记打包 // 标记打包
// const url1 = "http://182.90.224.147:8012/onlinePreview?url="; // const url1 = "http://182.90.224.147:8012/onlinePreview?url=";
// const url1 = "http://192.168.34.155:8012/onlinePreview?url="; // const url1 = "http://192.168.34.155:8012/onlinePreview?url=";

34
src/views/goverment/progressManagement/divisionsAndISubItems/index.vue
View File

@ -66,21 +66,25 @@
<el-table-column align="center" prop="completeRatio" label="完成比率(%)"></el-table-column> <el-table-column align="center" prop="completeRatio" label="完成比率(%)"></el-table-column>
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
<template #default="scope"> <template #default="scope">
<span>{{ <span
scope.row.state == 1 >{{
? "未开始" scope.row.state == 1
: scope.row.state == 2 ? "未开始"
? "进行中" : scope.row.state == 2
: scope.row.state == 3 ? "进行中"
? "已完成" : scope.row.state == 3
: scope.row.state == 4 ? "已完成"
? "逾期未开始" : scope.row.state == 4
: scope.row.state == 5 ? "逾期未开始"
? "逾期进行中" : scope.row.state == 5
: scope.row.state == 6 ? "逾期进行中"
? "逾期已完成" : scope.row.state == 6
: "" ? "逾期已完成"
}}</span> : ""
}}<span style="color: red" v-if="scope.row.slippage"
>(逾期{{ scope.row.slippage ? scope.row.slippage + "天" : "" }})</span
>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="100" label="操作"> <el-table-column align="center" width="100" label="操作">

16
src/views/goverment/progressManagement/panoramicPlan/index.vue
View File

@ -132,8 +132,8 @@ const columns: ColumnProps[] = [
} }
}, },
{ prop: "phaseName", label: "智能条线", width: 150 }, { prop: "phaseName", label: "智能条线", width: 150 },
// { prop: "chargerNumber", label: "节点责任人", width: 150 },
// { prop: "chargerPhone", label: "负责人联系方式", width: 180 }, // { prop: "chargerPhone", label: "负责人联系方式", width: 180 },
{ prop: "chargerNumber", label: "节点责任编号", width: 150 },
{ prop: "chargerName", label: "节点责任人", width: 150 }, { prop: "chargerName", label: "节点责任人", width: 150 },
{ {
prop: "isDeleted", prop: "isDeleted",
@ -247,17 +247,17 @@ const formConfig = {
disabled: true disabled: true
}, },
{ {
label: "节点负责人", label: "节点责任人编号",
prop: "chargerNumber",
type: "input",
disabled: true
},
{
label: "节点责任人",
prop: "chargerName", prop: "chargerName",
type: "input", type: "input",
disabled: true disabled: true
} }
// {
// label: "负责人联系方式",
// prop: "chargerNumber",
// type: "input",
// disabled: true
// }
], ],
rules: { rules: {
nodeNumber: [ nodeNumber: [

2
src/views/project/dustSupervision/dustManagement/index.vue
View File

@ -184,7 +184,7 @@ const formConfig = reactive({
name: [ name: [
{ {
required: true, required: true,
message: "请输入视频名称", message: "请输入设备名称",
trigger: "blur" trigger: "blur"
} }
], ],

1
src/views/project/progressManagement/planFinishSituation/index.vue
View File

@ -158,6 +158,7 @@ const handleAddItem = () => {
openVisible.value = true; openVisible.value = true;
}; };
const saveItem = async (form: any) => { const saveItem = async (form: any) => {
form.engineeringSn = searchSn.value;
if (form.id) { if (form.id) {
// console.log(form.dictCode); // console.log(form.dictCode);
const res = await applyTimeAdd(form); const res = await applyTimeAdd(form);

34
src/views/project/progressManagement/subItemManagement/index.vue
View File

@ -51,21 +51,25 @@
<el-table-column align="center" prop="completeRatio" label="完成比率(%)"></el-table-column> <el-table-column align="center" prop="completeRatio" label="完成比率(%)"></el-table-column>
<el-table-column align="center" label="状态"> <el-table-column align="center" label="状态">
<template #default="scope"> <template #default="scope">
<span>{{ <span
scope.row.state == 1 >{{
? "未开始" scope.row.state == 1
: scope.row.state == 2 ? "未开始"
? "进行中" : scope.row.state == 2
: scope.row.state == 3 ? "进行中"
? "已完成" : scope.row.state == 3
: scope.row.state == 4 ? "已完成"
? "逾期未开始" : scope.row.state == 4
: scope.row.state == 5 ? "逾期未开始"
? "逾期进行中" : scope.row.state == 5
: scope.row.state == 6 ? "逾期进行中"
? "逾期已完成" : scope.row.state == 6
: "" ? "逾期已完成"
}}</span> : ""
}}<span style="color: red" v-if="scope.row.slippage"
>(逾期{{ scope.row.slippage ? scope.row.slippage + "天" : "" }})</span
>
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="300" label="操作"> <el-table-column align="center" width="300" label="操作">