jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

dev_xd
姜玉琦 2025-02-19 22:22:55 +08:00
parent b44bfe838c 815e830e30
commit 94a0c70313
4 changed files with 316 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
yanzhu-ui-vue3/src/components/ImageUpload/index.vue
View File

@ -22,8 +22,8 @@
<el-dialog v-model="dialogVisible" title="预览" width="800px" append-to-body modal-class="img-preview-dlg">
<template v-if="previewAll">
<el-button type="primary" class="btn-remove" @click="doDelete" size="large">
删除
<el-button type="primary" class="btn-remove" @click="doDelete" size="large">
删除
</el-button>
<el-icon class="el-icon-left el-preview" v-if="showIndex > 0" @click="doLeft">
<ArrowLeft />
@ -31,8 +31,9 @@
<el-icon class="el-icon-right el-preview" v-if="showIndex < fileList.length - 1" @click="doRight">
<ArrowRight />
</el-icon>
<template v-if="fileList.length>0">
<el-image :src="fileList[showIndex].name" fit="cover" :preview-src-list="[fileList[showIndex].name]"></el-image>
<template v-if="fileList.length > 0">
<el-image :src="fileList[showIndex].name" fit="cover"
:preview-src-list="[fileList[showIndex].name]"></el-image>
</template>
</template>
<img v-else :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto" />
@ -72,7 +73,7 @@ const props = defineProps({
});
const { proxy } = getCurrentInstance();
const emit = defineEmits();
const emit = defineEmits(["update:modelValue","change"]);
const number = ref(0);
const uploadList = ref([]);
const dialogImageUrl = ref("");
@ -107,25 +108,24 @@ watch(
{ deep: true, immediate: true }
);
function doDelete() {
function doDelete() {
proxy.$confirm("确认删除此图片？", "提示", {
confirmButtonText: "确 认",
cancelButtonText: "取 消"
}).then(() => {
handleDelete(fileList.value[showIndex.value])
if(fileList.value.length<1){
dialogVisible.value=false
if (fileList.value.length < 1) {
dialogVisible.value = false
}
showIndex.value--;
if (showIndex < 0) {
showIndex = 0;
}
showIndex.value--;
if(showIndex<0){
showIndex=0;
}
});
}
function doLeft() {
if (showIndex.value > 1) {
if (showIndex.value > 0) {
showIndex.value--;
}
}
@ -193,6 +193,7 @@ function handleDelete(file) {
if (findex > -1 && uploadList.value.length === number.value) {
fileList.value.splice(findex, 1);
emit("update:modelValue", listToString(fileList.value));
emit("change")
return false;
}
}
@ -206,6 +207,7 @@ function uploadedSuccessfully() {
uploadList.value = [];
number.value = 0;
emit("update:modelValue", listToString(fileList.value));
emit("change")
proxy.$modal.closeLoading();
}
}
@ -255,6 +257,7 @@ function listToString(list, separator) {
position: absolute;
z-index: 99;
top: 40%;
cursor: pointer;
&.el-icon-right {
right: 5%;
@ -272,8 +275,8 @@ function listToString(list, separator) {
width: auto;
height: auto;
z-index: 99;
font-size: 40px;;
font-size: 40px;
}
}
</style>

4
yanzhu-ui-vue3/src/views/login.vue
View File

@ -55,8 +55,8 @@ const route = useRoute()
const { proxy } = getCurrentInstance();
const loginForm = ref({
username: "admin",
password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""

4
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

@ -269,7 +269,7 @@ import { getDeptRole } from "@/api/system/role";
import {
changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, selectByPhone, deptTreeSelect, getUserByName
} from "@/api/system/user";
import { onMounted } from "vue";
const router = useRouter();
const { proxy } = getCurrentInstance();
@ -754,6 +754,8 @@ function getUserWorkType() {
});
data.prjWorkTypeObj = obj;
}
getDeptTree();
getList();
</script>

505
yanzhu-ui-vue3/src/views/trouble/problemmodifyDraft/index.vue
View File

@ -1,16 +1,17 @@
<template>
<div class="app-container problemmodify-draft">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="data.queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="检查类型" prop="problemType">
<el-select v-model="form.problemType" placeholder="请选择检查类型" clearable>
<el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="整改人" prop="lordSent">
<el-input v-model="queryParams.lordSent" style="width: 200px;" placeholder="请输入人员姓名/联系方式" clearable @keyup.enter="handleQuery" />
<el-select v-model="data.queryParams.problemType" placeholder="请选择检查类型" clearable>
<el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="整改人" prop="lordSent">
<el-input v-model="data.queryParams.userName" style="width: 200px;" placeholder="请输入人员姓名/联系方式" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -19,24 +20,30 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain size="mini" @click="handleAdd"
<el-button type="primary" plain size="mini" @click="handleAdd"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
<el-icon><Plus /></el-icon>新增</el-button>
<el-icon>
<Plus />
</el-icon>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain size="mini" @click="dataSynchronization" :disabled="single"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
<el-icon><CopyDocument /></el-icon>
<el-icon>
<CopyDocument />
</el-icon>
数据同步</el-button>
</el-col>
<el-col :span="1.5">
<el-tooltip content="批量提交选择的数据！" placement="bottom">
<el-button type="success" plain size="mini" @click="batchSubmitForm"
:disabled="multiple" v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
<el-icon><Check /></el-icon>批量提交</el-button>
<el-button type="success" plain size="mini" @click="batchSubmitForm" :disabled="multiple"
v-hasPermi="['trouble:smzSspProblemmodifyDraft:add']">
<el-icon>
<Check />
</el-icon>批量提交</el-button>
</el-tooltip>
</el-col>
</el-row>
<el-alert title="操作说明" class="tips" effect="dark" type="warning" :closable="false">
<template #title>
@ -44,91 +51,92 @@
<div><strong>批量提交:</strong>将选中行的数据，数据验证通过后一次全部提交！</div>
</template>
</el-alert>
<el-form :model="data.form" :rules="data.rules" ref="formRef">
<el-table :data="data.showList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="30" align="center" />
<el-table-column type="index" width="50" align="center" label="序号">
</el-table-column>
<el-table :data="problemmodifyDraftList">
<el-table-column type="index" width="50" align="center" label="序号">
</el-table-column>
<el-table-column align="center" width="240" class-name="td-up-img" label="问题图片">
<template #default="scope">
<image-upload v-model="scope.row.smarkUrl" previewAll :limit="5" :isShowTip="false" />
</template>
</el-table-column>
<el-table-column align="center" width="240" class-name="td-proble-type" label="隐患类型">
<template #default="scope">
<el-select v-model="scope.row.problemType" placeholder="请选择检查类型" clearable>
<el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
<el-select v-model="scope.row.dangerType" placeholder="请选择隐患类型" clearable style="margin-top:80px;">
<el-option v-for="dict in ssp_proble_sub_type" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="施工部位" align="center" prop="workParts" width="180">
<template #default="scope">
<el-input v-model="scope.row.workParts" placeholder="请输入施工部位" type="textarea" :rows="3" />
<el-table-column align="center" width="180" class-name="td-up-img" label="问题图片">
<template #default="scope">
<div :class="scope.row.errSmarkUrl?'is-err':''">
<image-upload v-model="scope.row.smarkUrl" previewAll :limit="5" :isShowTip="false" @change="scope.row.errSmarkUrl=scope.row.smarkUrl?false:true"/>
</div>
</template>
</el-table-column>
<el-table-column label="整改要求" align="center" prop="changeInfo" width="180">
<el-table-column align="center" width="180" class-name="td-proble-type" label="隐患类型">
<template #default="scope">
<div :class="scope.row.errProblemType?'is-err':''">
<el-select v-model="scope.row.problemType" placeholder="请选择检查类型" clearable>
<el-option v-for="dict in ssp_proble_type" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</div>
<el-select v-model="scope.row.dangerType" placeholder="请选择隐患类型" clearable style="margin-top:80px;">
<el-option v-for="dict in ssp_proble_sub_type" :key="dict.value" :label="dict.label" :value="dict.value">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="施工部位" align="center" prop="workParts" min-width="240" class-name="td-textarea">
<template #default="scope">
<el-input v-model="scope.row.workParts" placeholder="请输入施工部位" type="textarea" :rows="3" />
</template>
</el-table-column>
<el-table-column label="整改要求" align="center" prop="changeInfo" min-width="240" class-name="td-textarea">
<template #default="scope">
<el-input v-model="scope.row.changeInfo" placeholder="请输入整改要求" type="textarea" :rows="3" />
</template>
</el-table-column>
<el-table-column label="租户ID" align="center" prop="comId" />
<el-table-column label="项目id" align="center" prop="projectId" />
<el-table-column label="信息类型" align="center" prop="infoType" />
<el-table-column label="留痕图片" align="center" prop="marksPicture" />
<el-table-column label="留痕视频" align="center" prop="marksVideo" />
<el-table-column label="拍摄位置" align="center" prop="problemArea" />
<el-table-column label="施工部位" align="center" prop="workParts" />
<el-table-column label="整改要求" align="center" prop="changeInfo" />
<el-table-column label="主送人姓名" align="center" prop="lordSent" />
<el-table-column label="主送人手机号" align="center" prop="lordSentUser" />
<el-table-column label="抄送人姓名" align="center" prop="copySend" />
<el-table-column label="抄送人手机号" align="center" prop="copySendUser" />
<el-table-column label="流程状态" align="center" prop="checkState" />
<el-table-column label="整改定位" align="center" prop="nickedArea" />
<el-table-column label="整改截至时间" align="center" prop="nickedTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="工程类型" align="center" prop="projectType" />
<el-table-column label="工序名称" align="center" prop="processName" />
<el-table-column label="工程名称" align="center" prop="projectName" />
<el-table-column label="留痕说明" align="center" prop="nickedInfo" />
<el-table-column label="审核人" align="center" prop="checkUser" />
<el-table-column label="审核人手机号" align="center" prop="checkUserPhone" />
<el-table-column label="删除状态" align="center" prop="isDel" />
<el-table-column label="创建人" align="center" prop="createUser" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="修改人" align="center" prop="updateUser" />
<el-table-column label="修改时间" align="center" prop="updateTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="隐患类型" align="center" prop="dangerType" />
<el-table-column label="复检人" align="center" prop="recheckSend" />
<el-table-column label="复检人手机号" align="center" prop="recheckSendUser" />
<el-table-column label="角色类型" align="center" prop="roleType" />
<el-table-column label="问题类型" align="center" prop="problemType" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['trouble:problemmodifyDraft:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['trouble:problemmodifyDraft:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-table-column label="问题人员" align="center" width="300" class-name="td-select">
<template #default="scope">
<el-form-item label="整改人">
<el-select v-model="scope.row.lordSent" placeholder="请选择人员" clearable
popper-class="select-popper-group-pd">
<el-option-group v-for="group in data.modUserList" :key="group.label" :label="group.label">
<el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value" />
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="抄送人">
<el-select v-model="scope.row.copySend" placeholder="请选择人员" clearable multiple collapse-tags
popper-class="select-popper-group-pd" collapse-tags-tooltip>
<el-option-group v-for="group in data.ccUserList" :key="group.label" :label="group.label">
<el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value" />
</el-option-group>
</el-select>
</el-form-item>
<el-form-item label="复检人">
<el-select v-model="scope.row.recheckSend" placeholder="请选择人员" clearable
popper-class="select-popper-group-pd" collapse-tags-tooltip>
<el-option-group v-for="group in data.recheckUserList" :key="group.label" :label="group.label">
<el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value" />
</el-option-group>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="整改截至时间" align="center" prop="nickedTime" width="150">
<template #default="scope">
<el-form-item label="">
<el-date-picker v-model="scope.row.nickedTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
style="width: 200px" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="submitRow(scope.row)"
v-hasPermi="['trouble:problemmodifyDraft:edit']">提交</el-button><br />
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['trouble:problemmodifyDraft:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</template>
@ -140,10 +148,12 @@ import {
addProblemmodifyDraft,
updateProblemmodifyDraft,
} from "@/api/trouble/problemmodifyDraft";
import useUserStore from '@/store/modules/user'
import { listProProjectInfoSubdeptsUsers } from "@/api/manage/proProjectInfoSubdeptsUsers";
const userStore = useUserStore()
const { proxy } = getCurrentInstance();
const { ssp_proble_type,ssp_proble_sub_type } = proxy.useDict('ssp_proble_type','ssp_proble_sub_type');
const problemmodifyDraftList = ref([]);
const { ssp_proble_type, ssp_proble_sub_type } = proxy.useDict('ssp_proble_type', 'ssp_proble_sub_type');
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
@ -155,110 +165,35 @@ const title = ref("");
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传文件服务器地址
const data = reactive({
dataList: [],
showList: [],
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
comId: null,
projectId: null,
infoType: null,
marksPicture: null,
marksVideo: null,
problemArea: null,
workParts: null,
changeInfo: null,
lordSent: null,
lordSentUser: null,
copySend: null,
copySendUser: null,
checkState: null,
nickedArea: null,
nickedTime: null,
projectType: null,
processName: null,
projectName: null,
nickedInfo: null,
checkUser: null,
checkUserPhone: null,
smarkUrl: null,
isDel: null,
createUser: null,
createTime: null,
updateUser: null,
updateTime: null,
dangerType: null,
recheckSend: null,
recheckSendUser: null,
roleType: null,
problemType: null,
userName: null
},
rules: {
comId: [{ required: true, message: "租户ID不能为空", trigger: "blur" }],
},
selData: [],
modUserList: [],//整改人
ccUserList: [],//抄送人
recheckUserList: [],//复检人
});
const { queryParams, form, rules } = toRefs(data);
/** 查询安全问题草稿列表 */
function getList() {
loading.value = true;
listProblemmodifyDraft(queryParams.value).then((response) => {
problemmodifyDraftList.value = response.rows;
total.value = response.total;
loading.value = false;
});
}
// 取消按钮
function cancel() {
open.value = false;
reset();
}
// 表单重置
function reset() {
form.value = {
id: null,
comId: null,
projectId: null,
infoType: null,
marksPicture: null,
marksVideo: null,
problemArea: null,
workParts: null,
changeInfo: null,
lordSent: null,
lordSentUser: null,
copySend: null,
copySendUser: null,
checkState: null,
nickedArea: null,
nickedTime: null,
projectType: null,
processName: null,
projectName: null,
nickedInfo: null,
checkUser: null,
checkUserPhone: null,
smarkUrl: null,
isDel: null,
createUser: null,
createTime: null,
updateUser: null,
updateTime: null,
dangerType: null,
recheckSend: null,
recheckSendUser: null,
roleType: null,
problemType: null,
};
proxy.resetForm("problemmodifyDraftRef");
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
debugger
data.showList = data.dataList.filter(d => {
let ck1 = true;
if (data.queryParams.problemType) {
ck1 = d.problemType == data.queryParams.problemType;
}
return ck1;
});
}
/** 重置按钮操作 */
@ -269,6 +204,7 @@ function resetQuery() {
// 多选框选中数据
function handleSelectionChange(selection) {
data.selData = selection;
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
@ -276,21 +212,65 @@ function handleSelectionChange(selection) {
/** 新增按钮操作 */
function handleAdd() {
reset();
open.value = true;
title.value = "添加安全问题草稿";
let row = {
key: +new Date(),
id: null,
projectId: userStore.currentPrjId,
comId: userStore.currentComId,
problemType: null,
dangerType: null,
smarkUrl: null,
workParts: null,
changeInfo: null,
lordSent: null,
copySend: null,
recheckSend: null,
nickedTime: null,
isDel: 0,
infoType: 1
}
data.dataList.push(row);
data.showList.push(row);
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const _id = row.id || ids.value;
getProblemmodifyDraft(_id).then((response) => {
form.value = response.data;
open.value = true;
title.value = "修改安全问题草稿";
/** 数据同步 */
function dataSynchronization() {
let row = data.selData[0];
data.showList.forEach(it => {
if (it != row) {
it.problemType = row.problemType;
it.dangerType = row.dangerType;
it.smarkUrl = row.smarkUrl;
it.workParts = row.workParts;
it.changeInfo = row.changeInfo;
it.lordSent = row.lordSent;
it.copySend = row.copySend;
it.recheckSend = row.recheckSend;
it.nickedTime = row.nickedTime;
}
});
}
function submitRow(row) {
debugger
if (checkRow(row)) {
}
}
function checkRow(row) {
row.errSmarkUrl=false;
row.errProblemType=false;
if (!row.smarkUrl) {
row.errSmarkUrl=true;
return false;
}
if (!row.problemType) {
row.errProblemType=true;
return false;
}
if (!row.dangerType ) {
return false;
}
return true;
}
/** 提交按钮 */
function submitForm() {
@ -315,14 +295,15 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value;
if (data.dataList.length == 1) {
proxy.$modal.msgError("至少保留一条数据");
return;
}
proxy.$modal
.confirm('是否确认删除安全问题草稿编号为"' + _ids + '"的数据项？')
.confirm('是否确认删除数据项？')
.then(function () {
return delProblemmodifyDraft(_ids);
})
.then(() => {
getList();
data.showList.splice(row, 1);
data.dataList.splice(row, 1);
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => { });
@ -338,20 +319,118 @@ function handleExport() {
`problemmodifyDraft_${new Date().getTime()}.xlsx`
);
}
//getList();
problemmodifyDraftList.value.push({});
function makeSelectData(users, type) {
let objs = {};
users.forEach(it => {
let deptName = it.subDeptName;
if (!objs[deptName]) {
objs[deptName] = [];
}
objs[deptName].push(it);
})
let arr = [];
for (let k in objs) {
arr.push({
label: k,
options: objs[k].map(it => {
let pos = type ? `[${it.userPost == 2 ? '项目经理' : it.userPost == 3 ? '班组长' : ''}]` : ''
return {
value: it.userId,
label: it.userName + pos,
data: it
}
})
})
}
console.log("--->", arr)
return arr;
}
function getUserTree() {
let row = {
key: +new Date(),
id: null,
projectId: userStore.currentPrjId,
comId: userStore.currentComId,
problemType: null,
dangerType: null,
smarkUrl: null,
workParts: null,
changeInfo: null,
lordSent: null,
copySend: null,
recheckSend: null,
nickedTime: null,
isDel: 0,
infoType: 1
};
data.dataList.push(row)
data.showList.push(row);
listProProjectInfoSubdeptsUsers({ projectId: userStore.currentPrjId, pageNum: 1, pageSize: 1000 }).then(d => {
let users = d.rows || [];
data.modUserList = makeSelectData(users.filter(it => it.subDeptType == 4 || it.subDeptType == 5).filter(it => it.userPost == 2 || it.userPost == 3), true);
data.ccUserList = makeSelectData(users.filter(it => it.userPost != 4 && it.userPost != 5));
data.recheckUserList = makeSelectData(users.filter(it => it.subDeptType == 1));
})
}
getUserTree();
</script>
<style lang="scss">
.problemmodify-draft{
.td-up-img{
.component-upload-image{
.problemmodify-draft {
.td-up-img {
.component-upload-image {
height: 150px;
overflow: hidden;
.el-upload-list__item{
.el-upload-list__item {
position: absolute;
}
}
}
.td-textarea {
.cell {
width: 100%;
height: 100%;
.el-textarea {
width: 100%;
height: 150px;
.el-textarea__inner {
width: 100%;
height: 100%;
}
}
}
}
.td-select {
.el-select {
width: 100%;
}
}
.is-err{
position: relative;
padding-bottom:12px;
.el-upload--picture-card{
border-color: red;
}
&::after{
content: "不为空";
color: red;
left: 0px;
font-size:12px;
position:absolute;
bottom: -6px;
}
}
}
.select-popper-group-pd {
.el-select-group {
.el-select-dropdown__item {
padding-left: 30px;
}
}
}
</style>