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

Merge branch 'dev-gmj' into 'master'

Browse Source 
修改表单星号样式及修改核酸过期人员列表分页样式

See merge request !21
This commit is contained in:
杜海鹏 2022-06-27 15:58:20 +08:00
commit 22aaa1efe0
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/projectFront/buildersDiary/diaryMod.vue
View File

@ -49,8 +49,8 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<!-- 单位工程名称 --> <!-- 单位工程名称 -->
<label class="xingxing"></label> <!-- <label class="xingxing"></label> -->
<el-form-item :label="$t('message.buildersDiary.unitProjectName')+'：'" prop="buildName"> <el-form-item class="xingxing" :label="$t('message.buildersDiary.unitProjectName')+'：'" prop="buildName">
<el-input v-model="ruleForm.buildName"></el-input> <el-input v-model="ruleForm.buildName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -68,8 +68,8 @@
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<!-- 施工项目部门 --> <!-- 施工项目部门 -->
<label class="xingxing"></label> <!-- <label class="xingxing"></label> -->
<el-form-item :label="$t('message.buildersDiary.constructionProjectDepartment')+'：'" prop="buildProjectDept"> <el-form-item class="xingxing" :label="$t('message.buildersDiary.constructionProjectDepartment')+'：'" prop="buildProjectDept">
<el-input v-model="ruleForm.buildProjectDept"></el-input> <el-input v-model="ruleForm.buildProjectDept"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -87,15 +87,15 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<!-- 项目负责人 --> <!-- 项目负责人 -->
<label class="xingxing"></label> <!-- <label class="xingxing"></label> -->
<el-form-item :label="$t('message.buildersDiary.projectDutyPeople')+'：'" prop="projectDirector"> <el-form-item class="xingxing":label="$t('message.buildersDiary.projectDutyPeople')+'：'" prop="projectDirector">
<el-input v-model="ruleForm.projectDirector"></el-input> <el-input v-model="ruleForm.projectDirector"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<!-- 单位工程施工员 --> <!-- 单位工程施工员 -->
<label class="xingxing"></label> <!-- <label class="xingxing"></label> -->
<el-form-item :label="$t('message.buildersDiary.unitConstructionPeople')+'：'" prop="constructionCrew"> <el-form-item class="xingxing" :label="$t('message.buildersDiary.unitConstructionPeople')+'：'" prop="constructionCrew">
<el-input v-model="ruleForm.constructionCrew"></el-input> <el-input v-model="ruleForm.constructionCrew"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -757,6 +757,7 @@ export default {
created() { created() {
this.uploadUrl = this.$store.state.UPLOADURL; this.uploadUrl = this.$store.state.UPLOADURL;
this.fileUrl = this.$store.state.FILEURL; this.fileUrl = this.$store.state.FILEURL;
this.projectSn = this.$store.state.projectSn; this.projectSn = this.$store.state.projectSn;
this.type = this.$props.status; this.type = this.$props.status;
}, },
@ -784,6 +785,7 @@ export default {
//上传成功 //上传成功
handleSuccess(file) { handleSuccess(file) {
let data = { name: file.data[0].filename, url: file.data[0].imageUrl }; let data = { name: file.data[0].filename, url: file.data[0].imageUrl };
console.log(data,'datadatadatadata')
this.fileList.push(data); this.fileList.push(data);
}, },
//删除成功 //删除成功
@ -953,11 +955,17 @@ export default {
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.xingxing{
position: relative;
}
.xingxing::before{ .xingxing::before{
content: "*"; content: "*";
color: red; color: red;
font-size: 14px; font-size: 14px;
margin-right: 6px; position: absolute;
top: 10px;
left: 0px;
} }
.diaryMod { .diaryMod {

24
src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
View File

@ -60,17 +60,17 @@
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination
class="pagerBox"
:current-page="pageNo"
background
layout="prev, pager, next"
:page-size="pageSize"
@current-change="handleCurrentChange"
:total="total"
> <el-pagination
</el-pagination> class="pagerBox"
@current-change="handleCurrentChange"
:current-page="pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="pageSize"
layout="total, sizes, prev, pager, next"
:total="total"
background
></el-pagination>
</div> </div>
</div> </div>
</div> </div>
@ -109,7 +109,7 @@ export default {
classParame: 1, classParame: 1,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
total: '' total: 0
} }
}, },
created() { created() {
@ -121,11 +121,13 @@ export default {
this.pageNo = val; this.pageNo = val;
this.getDataList(); this.getDataList();
}, },
//刷选
screen(v) { screen(v) {
this.classParame = v; this.classParame = v;
this.pageNo = 1; this.pageNo = 1;
this.getDataList(); this.getDataList();
}, },
//获取数据列表
getDataList() { getDataList() {
selectWorkScheduleListApi({ selectWorkScheduleListApi({
selectType: this.classParame, selectType: this.classParame,