样式修改

lijinlong^2
吕天方 1 year ago
parent aa9cad8d17
commit 7a3be68c1e

@ -155,21 +155,21 @@
header-align="center" header-align="center"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="ecoTypeLarge" prop="ecoTypeLarge"
label="经济类型" label="经济类型"
show-overflow-tooltip show-overflow-tooltip
header-align="center" header-align="center"
> >
</el-table-column> --> </el-table-column>
<el-table-column <!-- <el-table-column
prop="indusTypeClass" prop="indusTypeClass"
label="业类型" label="业类型"
show-overflow-tooltip show-overflow-tooltip
header-align="center" header-align="center"
> >
</el-table-column> </el-table-column> -->
<!-- <el-table-column <el-table-column
prop="majorHazardLevel" prop="majorHazardLevel"
label="重大危险源等级" label="重大危险源等级"
show-overflow-tooltip show-overflow-tooltip
@ -182,7 +182,7 @@
show-overflow-tooltip show-overflow-tooltip
header-align="center" header-align="center"
> >
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="uscCode" prop="uscCode"
label="统一社会信用代码" label="统一社会信用代码"
@ -210,16 +210,16 @@
</div> </div>
<div class="pagination"> <div class="pagination">
<my-pagination :total="total" @pagesChange="pagesChange"> <my-pagination :total="total" @pagesChange="pagesChange">
<div>重点企业数 <!-- <div>重点企业数
<span :class=" count == unCount ? 'selectedNumber' : 'unselectedNumber'">{{ unCount }}</span>/ <span :class=" count == unCount ? 'selectedNumber' : 'unselectedNumber'">{{ unCount }}</span>/
<span class="sum">{{ count }}</span> <span class="sum">{{ count }}</span>
</div> </div> -->
</my-pagination> </my-pagination>
</div> </div>
</div> </div>
<div v-else class="release-planning"> <div v-else class="release-planning">
<div class="inputs centered"> <el-form ref="form" :model="form2" label-width="100px" class="form-inline" :rules="rules">
<div class="inputs-span">计划年月:</div> <el-form-item label="计划年月:" prop="plannedYear">
<el-date-picker <el-date-picker
v-model="form2.plannedYear" v-model="form2.plannedYear"
type="month" type="month"
@ -229,39 +229,31 @@
placeholder="请选择年月" placeholder="请选择年月"
> >
</el-date-picker> </el-date-picker>
</div> </el-form-item>
<div class="inputs centered"> <el-form-item label="计划标题:" prop="planName">
<div class="inputs-span">计划标题:</div>
<div class="input">
<el-input <el-input
v-model="form2.planName" v-model="form2.planName"
:maxlength="50" :maxlength="50"
placeholder="请输入计划标题" placeholder="请输入计划标题"
></el-input> ></el-input>
</div> </el-form-item>
</div> <el-form-item label="计划内容:" prop="planContent" class="form-textarea">
<div class="inputs">
<div class="inputs-span">计划内容:</div>
<div class="input">
<el-input <el-input
v-model="form2.planContent" v-model="form2.planContent"
type="textarea" type="textarea"
resize="none" resize="none"
placeholder="请输入计划内容" placeholder="请输入计划内容"
></el-input> ></el-input>
</div> </el-form-item>
</div> <el-form-item label="备注:" class="form-textarea">
<div class="inputs">
<div class="inputs-span">备注:</div>
<div class="input">
<el-input <el-input
v-model="form2.remark" v-model="form2.remark"
type="textarea" type="textarea"
resize="none" resize="none"
placeholder="请输入备注" placeholder="请输入备注"
></el-input> ></el-input>
</div> </el-form-item>
</div> </el-form>
</div> </div>
<div class="next"> <div class="next">
<div class="selected"> <div class="selected">
@ -296,6 +288,7 @@ export default {
listThree: [], listThree: [],
listFour: [], listFour: [],
listFive: [], listFive: [],
options:[],
props: { props: {
value: "county", value: "county",
label: "institutionName", label: "institutionName",
@ -322,6 +315,17 @@ export default {
planContent: "", planContent: "",
remark: "", remark: "",
}, },
rules: {
plannedYear: [
{ required: true, message: '请选择年月', trigger: 'blur' },
],
planName: [
{ required: true, message: '请输入计划标题', trigger: 'blur' }
],
planContent: [
{ required: true, message: '请输入计划内容', trigger: 'blur' }
]
},
total: 0, total: 0,
pages: { pages: {
pageNum: 1, pageNum: 1,
@ -330,9 +334,9 @@ export default {
loading: false, loading: false,
isamend: false, isamend: false,
amendId: "", amendId: "",
count: 0, // count: 0,
unCount: 0, // unCount: 0,
unselected: 0, // unselected: 0,
selectList: [], selectList: [],
disabled:false, disabled:false,
}; };
@ -355,7 +359,7 @@ export default {
if(this.form.subdistrict.length > 0){ if(this.form.subdistrict.length > 0){
if(this.form.subdistrict.length == 2) { if(this.form.subdistrict.length == 2) {
this.form.subdistrict = this.form.subdistrict[1] this.form.subdistrict = this.form.subdistrict[1]
this.subdistrict = this.form.subdistrict.slice(0, 10); this.subdistrict = this.form.subdistrict.slice(0, 11);
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict }; obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
} else if(this.form.subdistrict.length == 1) { } else if(this.form.subdistrict.length == 1) {
this.form.subdistrict = this.form.subdistrict[0] this.form.subdistrict = this.form.subdistrict[0]
@ -371,7 +375,7 @@ export default {
this.subdistrict = this.form.subdistrict.slice(0, 7); this.subdistrict = this.form.subdistrict.slice(0, 7);
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict }; obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
} else if(this.dept.parentId == 101){ } else if(this.dept.parentId == 101){
this.subdistrict = this.form.subdistrict.slice(0, 10); this.subdistrict = this.form.subdistrict.slice(0, 11);
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict }; obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
} }
} }
@ -440,8 +444,15 @@ export default {
this.commentData(data.data,dept); this.commentData(data.data,dept);
this.filtrate() this.filtrate()
if (item == "newlyIncreased") { if (item == "newlyIncreased") {
// if (this.dept.deptName !== "") { //
// this.bPlanEnterprise(); // if(dept.parentId == 101){
// this.tableData.map((item)=>{
// if(item.isPoint == 1) {
// this.$nextTick(() => {
// this.$refs.multipleTable.toggleRowSelection(item);
// });
// }
// })
// } // }
// this.getTable(this.pages); // this.getTable(this.pages);
} else { } else {
@ -461,12 +472,12 @@ export default {
this.nextText = "下一步"; this.nextText = "下一步";
Object.keys(this.form).forEach((key) => (this.form[key] = "")); Object.keys(this.form).forEach((key) => (this.form[key] = ""));
Object.keys(this.form2).forEach((key) => (this.form2[key] = "")); Object.keys(this.form2).forEach((key) => (this.form2[key] = ""));
this.unCount = 0; // this.unCount = 0;
this.pages.pageNum = 1; this.pages.pageNum = 1;
this.pages.pageSize = 10; this.pages.pageSize = 10;
this.selected = 0; this.selected = 0;
this.unselected = 0; // this.unselected = 0;
this.count = 0; // this.count = 0;
if (item == "newsuccess") { if (item == "newsuccess") {
this.$emit("close"); this.$emit("close");
} }
@ -494,12 +505,12 @@ export default {
let data = await this.$api.yingji.basicList(pages); let data = await this.$api.yingji.basicList(pages);
// console.log(data.data.count, ''); // console.log(data.data.count, '');
// console.log(this.unCount,'this.unCount') // console.log(this.unCount,'this.unCount')
this.count = data.data.count; // this.count = data.data.count;
data.data.count == this.unselected // data.data.count == this.unselected
? (this.unCount = data.data.count) // ? (this.unCount = data.data.count)
: this.unselected == 0 // : this.unselected == 0
? (this.unCount = 0) // ? (this.unCount = 0)
: (this.unCount = data.data.count - this.unselected); // : (this.unCount = data.data.count - this.unselected);
this.total = data.data.total; this.total = data.data.total;
// console.log(this.unselected,'this.unselected') // console.log(this.unselected,'this.unselected')
if (data.code == 200) { if (data.code == 200) {
@ -535,7 +546,7 @@ export default {
let arr2 = []; let arr2 = [];
let keyCount = 0; let keyCount = 0;
this.multipleSelection.map((item) => { this.multipleSelection.map((item) => {
arr.push(item.subdistrict); arr.push('0' + item.subdistrict);
arr2.push(item.uscCode); arr2.push(item.uscCode);
if (item.isPoint == "1") { if (item.isPoint == "1") {
keyCount++; keyCount++;
@ -546,18 +557,21 @@ export default {
this.$message.error("请至少选择一家企业"); this.$message.error("请至少选择一家企业");
return; return;
} }
if (this.dept.parentId == 101) { // if (this.dept.parentId == 101) {
if (this.count == this.unselected + keyCount) { // if (this.count == this.unselected + keyCount) {
this.nextStep = true; // this.nextStep = true;
this.nextText = "发布计划"; // this.nextText = "";
} else { // } else {
this.$message.error("请将重点企业全选"); // this.$message.error("");
} // }
} else { // }
else {
this.nextStep = true; this.nextStep = true;
this.nextText = "发布计划"; this.nextText = "发布计划";
} }
} else { } else {
this.$refs.form.validate(async (valid) => {
if (valid) {
let downloadLoadingInstance = Loading.service({ let downloadLoadingInstance = Loading.service({
text: this.isamend ? "正在修改计划,请稍后" : "正在发布计划,请稍后", text: this.isamend ? "正在修改计划,请稍后" : "正在发布计划,请稍后",
spinner: "el-icon-loading", spinner: "el-icon-loading",
@ -578,13 +592,9 @@ export default {
planNumb, planNumb,
}; };
let data; let data;
if (this.isamend) { if (this.isamend) {
obj = { ...obj, id: this.amendId }; obj = { ...obj, id: this.amendId };
if (
this.form2.plannedYear != "" &&
this.form2.planName != "" &&
this.form2.planContent != ""
) {
data = await this.$api.yingji.bPlanManage("put", obj); data = await this.$api.yingji.bPlanManage("put", obj);
if (data.code == 200) { if (data.code == 200) {
downloadLoadingInstance.close(); downloadLoadingInstance.close();
@ -595,18 +605,6 @@ export default {
this.Close("newsuccess"); this.Close("newsuccess");
} }
} else { } else {
downloadLoadingInstance.close();
this.$message({
message: "年份、计划标题、计划内容、都不能为空",
type: "error",
});
}
} else {
if (
this.form2.plannedYear != "" &&
this.form2.planName != "" &&
this.form2.planContent != ""
) {
data = await this.$api.yingji.bPlanEnterprise("post", obj); data = await this.$api.yingji.bPlanEnterprise("post", obj);
if (data.code == 200) { if (data.code == 200) {
downloadLoadingInstance.close(); downloadLoadingInstance.close();
@ -616,14 +614,12 @@ export default {
}); });
this.Close("newsuccess"); this.Close("newsuccess");
} }
} else {
downloadLoadingInstance.close();
this.$message({
message: "年份、计划标题、计划内容、都不能为空",
type: "error",
});
} }
} else {
// console.log('error submit!!');
return false;
} }
});
} }
}, },
// //
@ -795,7 +791,7 @@ export default {
} }
::v-deep .el-select { ::v-deep .el-select {
background-color: transparent; background-color: transparent;
width: 180px; width: 160px;
.el-input__inner { .el-input__inner {
height: 33px; height: 33px;
} }
@ -939,7 +935,41 @@ export default {
} }
} }
.release-planning { .release-planning {
padding: 0 10px 0 0; padding: 10px 10px 0 0;
.form-inline {
::v-deep .el-select {
background-color: transparent;
width: 190px;
.el-input__inner {
height: 33px;
font-size: 15px;
font-family: 'Alibaba PuHuiTi';
font-weight: 400;
color: #525966;
}
// border-radius: 2px;
}
::v-deep .el-input {
.el-input__inner {
font-size: 15px;
font-family: 'Alibaba PuHuiTi';
font-weight: 400;
color: #525966;
}
}
.form-textarea {
::v-deep .el-textarea {
height: 180px;
.el-textarea__inner {
height: 100%;
font-size: 15px;
font-family: 'Alibaba PuHuiTi';
font-weight: 400;
color: #525966;
}
}
}
}
.inputs { .inputs {
display: flex; display: flex;
margin-top: 20px; margin-top: 20px;

@ -0,0 +1,54 @@
<template>
<el-dialog
:visible.sync="dialogVisible"
:show-close="false"
:destroy-on-close="true"
:close-on-click-modal="false"
append-to-body
custom-class="dialog-boxed"
width="70%"
>
<div class="dialog-slot">
<div class="closeClick">
<div class="newplan">
<div class="line"></div>
<div class="span">计划详情</div>
</div>
<img src="@/assets/images/close.png" alt="" @click="Close" />
</div>
</div>
<div class="content">
<div class="filtrate">
<el-descriptions :column="2" border v-loading="detailLoad">
<el-descriptions-item
:label="item.label"
v-for="(item, index) in listDes"
:key="index"
>
{{
item.value == "null"
? ""
: item.value == "false"
? "暂无"
: item.value
}}
</el-descriptions-item>
</el-descriptions>
</div>
</div>
</el-dialog>
</template>
<script>
export default {
data() {
return {
detailLoad:[]
}
},
methods:{
},
}
</script>
<style lang="scss" scoped>
</style>

@ -4,7 +4,7 @@
* @Author: JC9527 * @Author: JC9527
* @Date: 2023-09-04 10:20:06 * @Date: 2023-09-04 10:20:06
* @LastEditors: JC9527 * @LastEditors: JC9527
* @LastEditTime: 2023-09-26 13:14:38 * @LastEditTime: 2023-09-26 16:02:57
--> -->
<template> <template>
<div class="plan-management"> <div class="plan-management">
@ -12,14 +12,6 @@
<div class="drup-downs"> <div class="drup-downs">
<div class="year"> <div class="year">
<div class="year-span">年份:</div> <div class="year-span">年份:</div>
<!-- <el-select v-model="value" placeholder="请选择">
<el-option
v-for="item in optionsyear"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select> -->
<el-date-picker <el-date-picker
v-model="form.plannedYear" v-model="form.plannedYear"
type="month" type="month"
@ -41,10 +33,10 @@
</div> </div>
</div> </div>
<div class="btns"> <div class="btns">
<div class="export" @click="exportFile"> <!-- <div class="export" @click="exportFile">
<img src="@/assets/images/export.png" alt=""> <img src="@/assets/images/export.png" alt="">
<span>导出excel</span> <span>导出excel</span>
</div> </div> -->
<div class="newProject" @click="newProject"> <div class="newProject" @click="newProject">
<img src="@/assets/images/newProject.png" alt=""> <img src="@/assets/images/newProject.png" alt="">
<span>新增计划</span> <span>新增计划</span>
@ -199,35 +191,34 @@
id: 1, id: 1,
plannedYear: '2016-05-02', plannedYear: '2016-05-02',
district: '王小虎', district: '王小虎',
planNumb: '上海市普陀区金沙江路 1518 弄' planNumb: '200',
}, {
id: 2,
plannedYear: '2016-05-04',
district: '王小虎',
planNumb: '上海市普陀区金沙江路 1517 弄'
}, {
id: 3,
plannedYear: '2016-05-01',
district: '王小虎',
planNumb: '上海市普陀区金沙江路 1519 弄',
children: [{ children: [{
id: 31, id: 31,
plannedYear: '2016-05-01', plannedYear: '2016-05-01',
district: '王小虎', district: '王小虎',
planNumb: '上海市普陀区金沙江路 1519 弄' planNumb: '200'
}, { }, {
id: 32, id: 32,
plannedYear: '2016-05-01', plannedYear: '2016-05-01',
district: '王小虎', district: '王小虎',
planNumb: '上海市普陀区金沙江路 1519 弄' planNumb: '200'
}] }]
}, { }, {
id: 4, id: 2,
plannedYear: '2016-05-04',
district: '王小虎',
planNumb: '200'
}, {
id: 256,
plannedYear: '2016-05-01',
district: '王小虎',
planNumb: '200',
}, {
id: 257,
plannedYear: '2016-05-03', plannedYear: '2016-05-03',
district: '王小虎', district: '王小虎',
planNumb: '上海市普陀区金沙江路 1516 弄' planNumb: '200'
}], }],
// multipleSelection: [],
pages:{ pages:{
pageSize:10, pageSize:10,
pageNum:1 pageNum:1
@ -261,7 +252,6 @@
methods:{ methods:{
// //
pagesChange(pages){ pagesChange(pages){
// console.log(pages)
this.getList(pages) this.getList(pages)
}, },
// //
@ -378,7 +368,6 @@
async getList(pages){ async getList(pages){
this.loading = true; this.loading = true;
let res = await this.$api.yingji.bPlanManage('get',_,pages); let res = await this.$api.yingji.bPlanManage('get',_,pages);
// console.log(res);
if(res.code == 200) { if(res.code == 200) {
this.loading = false; this.loading = false;
} }
@ -391,7 +380,6 @@
item.county = item.subdistrict item.county = item.subdistrict
delete item.children; delete item.children;
} else { } else {
// this.props.value = 'subdistrict'
this.commentData(item.children,this.dept) this.commentData(item.children,this.dept)
} }
}) })
@ -473,7 +461,7 @@
font-weight: bold; font-weight: bold;
color: #525966; color: #525966;
line-height: 40px; line-height: 40px;
// margin-right: 10px; margin-right: 100px;
} }
::v-deep .el-cascader { ::v-deep .el-cascader {
background-color: transparent; background-color: transparent;

@ -49,8 +49,8 @@ module.exports = {
// }, // },
// }, // },
'/api': { '/api': {
target: `http://39.101.188.84:9033`, // target: `http://39.101.188.84:9033`,
// target: `http://192.168.0.119:9033`, target: `http://192.168.0.119:9033`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/api': '' '^/api': ''

Loading…
Cancel
Save