ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili-vue

sy-water-data-board-ui
hxh 2 months ago
parent
94f8e98554 fdfa9db347
commit
0904f21ca5
7 changed files with 96 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/components/linkNameSelect/linkDike.vue
  2. 1
      src/components/linkNameSelect/linkSluice.vue
  3. 39
      src/layout/components/Navbar.vue
  4. 74
      src/views/dike/engineeringCondition/identificationPlate/index.vue
  5. 10
      src/views/dike/safetyManage/confirmDelimitationManage/index.vue
  6. 22
      src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
  7. 28
      src/views/sluice/engineeringCondition/identificationPlate/index.vue

3
src/components/linkNameSelect/linkDike.vue
View File

@ -30,14 +30,12 @@
style="width: 100%" style="width: 100%"
v-scroll="selectSearch" v-scroll="selectSearch"
filterable filterable
:filter-method="aaaa"
clearable clearable
remote remote
reserve-keyword reserve-keyword
:remote-method="remoteMethod" :remote-method="remoteMethod"
:loading="loading" :loading="loading"
@change="handleChange" @change="handleChange"
@blur="handleChange"
> >
<el-option <el-option
v-for="dict in dikeNameOptions" v-for="dict in dikeNameOptions"
@ -142,6 +140,7 @@ export default {
}, },
chooseDike(item) { chooseDike(item) {
this.form.dikeName = item.dikeName; this.form.dikeName = item.dikeName;
this.form.adcd = item.adcd
}, },
}, },
}; };

1
src/components/linkNameSelect/linkSluice.vue
View File

@ -149,6 +149,7 @@ export default {
}, },
chooseDike(item) { chooseDike(item) {
this.form.wagaName = item.wagaName; this.form.wagaName = item.wagaName;
this.form.adcd=item.adcd
}, },
}, },
}; };

39
src/layout/components/Navbar.vue
View File

@ -141,14 +141,31 @@ export default {
}, },
methods: { methods: {
handleSelectTab(e) { handleSelectTab(e) {
sessionStorage.setItem("topTab", e); sessionStorage.setItem('topTab', e)
this.$store.dispatch("changeTopTab", e); this.$store.dispatch('changeTopTab', e)
this.$router.replace({ console.log(e)
path: "/", if (e === 'sluice') {
query: { this.$router.replace({
timestamp: new Date().getTime(), path: '/sluice/engineeringCondition/sluiceBaseInfo',
}, query: {
}); timestamp: new Date().getTime()
}
})
}else if (e==='dike'){
this.$router.replace({
path: '/dike/engineeringCondition/dikeBaseInfo',
query: {
timestamp: new Date().getTime()
}
})
}else {
this.$router.replace({
path: '/',
query: {
timestamp: new Date().getTime()
}
})
}
}, },
toggleSideBar() { toggleSideBar() {
this.$store.dispatch("app/toggleSideBar"); this.$store.dispatch("app/toggleSideBar");
@ -171,11 +188,9 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.navbar { .navbar {
// background: #122c7d !important; // background: #122c7d !important;
background: linear-gradient( background: linear-gradient(270deg,
270deg,
rgba(61, 156, 204, 1) 1%, rgba(61, 156, 204, 1) 1%,
rgba(131, 179, 107, 1) 100% rgba(131, 179, 107, 1) 100%) !important;
) !important;
// height: 70px; // height: 70px;
height: 56px; height: 56px;
overflow: hidden; overflow: hidden;

74
src/views/dike/engineeringCondition/identificationPlate/index.vue
View File

@ -108,7 +108,7 @@
>搜索</el-button >搜索</el-button
> --> > -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -121,7 +121,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['yg:dikeMark:add']" v-hasPermi="['yg:dikeMark:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -132,7 +132,7 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['yg:dikeMark:edit']" v-hasPermi="['yg:dikeMark:edit']"
>修改</el-button >修改</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -143,7 +143,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['yg:dikeMark:remove']" v-hasPermi="['yg:dikeMark:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
@ -238,7 +238,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['yg:dikeMark:edit']" v-hasPermi="['yg:dikeMark:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="mini"
@ -246,7 +246,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['yg:dikeMark:remove']" v-hasPermi="['yg:dikeMark:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -637,7 +637,7 @@ export default {
form: {}, form: {},
comForm: { comForm: {
dikeName: null, dikeName: null,
embankmentCode: null, dikeCode: null,
adcd: null, adcd: null,
}, },
noticeForm: {}, noticeForm: {},
@ -761,8 +761,8 @@ export default {
// if (this.comForm.dikeName) { // if (this.comForm.dikeName) {
// this[counterType][this[counterType].length - 1].dikeName = // this[counterType][this[counterType].length - 1].dikeName =
// this.comForm.dikeName; // this.comForm.dikeName;
// this[counterType][this[counterType].length - 1].embankmentCode = // this[counterType][this[counterType].length - 1].dikeCode =
// this.comForm.embankmentCode; // this.comForm.dikeCode;
// } // }
// 赋值标牌类型 // 赋值标牌类型
// this[counterType][this[counterType].length - 1].type = type; // this[counterType][this[counterType].length - 1].type = type;
@ -783,8 +783,8 @@ export default {
// if (this.comForm.dikeName) { // if (this.comForm.dikeName) {
// this.counter0[this.counter0.length - 1].dikeName = // this.counter0[this.counter0.length - 1].dikeName =
// this.comForm.dikeName; // this.comForm.dikeName;
// this.counter0[this.counter0.length - 1].embankmentCode = // this.counter0[this.counter0.length - 1].dikeCode =
// this.comForm.embankmentCode; // this.comForm.dikeCode;
// } // }
// // 赋值标牌类型 // // 赋值标牌类型
// this.counter0[this.counter0.length - 1].type = "0"; // this.counter0[this.counter0.length - 1].type = "0";
@ -814,27 +814,27 @@ export default {
// this.$refs[ele].appendChild(child.$el); //插入元素内部的最后一个子节点之后 // this.$refs[ele].appendChild(child.$el); //插入元素内部的最后一个子节点之后
}, },
chooseEmbankmenName(data) { chooseEmbankmenName(data) {
// embankmentCode // dikeCode
this.comForm.embankmentCode = data.embankmentCode; this.comForm.dikeCode = data.dikeCode;
this.comForm.adcd = data.adcd; this.comForm.adcd = data.adcd;
// console.log(33333, this.comForm); // console.log(33333, this.comForm);
// // 将第一个表单和后面新增的表单赋值，水闸编码和水闸名称 // // 将第一个表单和后面新增的表单赋值，水闸编码和水闸名称
// this.$refs["noticeForm0"][0].form.dikeName = data.dikeName; // this.$refs["noticeForm0"][0].form.dikeName = data.dikeName;
// this.$refs["noticeForm0"][0].form.embankmentCode = data.embankmentCode; // this.$refs["noticeForm0"][0].form.dikeCode = data.dikeCode;
// // this.$refs["noticeForm0"][0].form.type = "0"; // // this.$refs["noticeForm0"][0].form.type = "0";
// this.counter0.forEach((item) => { // this.counter0.forEach((item) => {
// item.dikeName = data.dikeName; // item.dikeName = data.dikeName;
// item.embankmentCode = data.embankmentCode; // item.dikeCode = data.dikeCode;
// }); // });
// // this.noticeForm.dikeName = data.dikeName; // // this.noticeForm.dikeName = data.dikeName;
// this.warnForm.dikeName = data.dikeName; // this.warnForm.dikeName = data.dikeName;
// this.nameForm.dikeName = data.dikeName; // this.nameForm.dikeName = data.dikeName;
// this.guideForm.dikeName = data.dikeName; // this.guideForm.dikeName = data.dikeName;
// // this.noticeForm.embankmentCode = data.embankmentCode; // // this.noticeForm.dikeCode = data.dikeCode;
// this.warnForm.embankmentCode = data.embankmentCode; // this.warnForm.dikeCode = data.dikeCode;
// this.nameForm.embankmentCode = data.embankmentCode; // this.nameForm.dikeCode = data.dikeCode;
// this.guideForm.embankmentCode = data.embankmentCode; // this.guideForm.dikeCode = data.dikeCode;
}, },
/** 查询水闸标识标牌列表 */ /** 查询水闸标识标牌列表 */
getList() { getList() {
@ -867,13 +867,13 @@ export default {
this.counter3 = [{}]; this.counter3 = [{}];
this.comForm = { this.comForm = {
dikeName: null, dikeName: null,
embankmentCode: null, dikeCode: null,
adcd: null, adcd: null,
}; };
this.noticeForm = { this.noticeForm = {
id: null, id: null,
adcd: null, adcd: null,
embankmentCode: null, dikeCode: null,
markName: null, markName: null,
dikeName: null, dikeName: null,
markLocation: null, markLocation: null,
@ -893,7 +893,7 @@ export default {
this.warnForm = { this.warnForm = {
id: null, id: null,
adcd: null, adcd: null,
embankmentCode: null, dikeCode: null,
markName: null, markName: null,
dikeName: null, dikeName: null,
markLocation: null, markLocation: null,
@ -913,7 +913,7 @@ export default {
this.guideForm = { this.guideForm = {
id: null, id: null,
adcd: null, adcd: null,
embankmentCode: null, dikeCode: null,
markName: null, markName: null,
dikeName: null, dikeName: null,
markLocation: null, markLocation: null,
@ -933,7 +933,7 @@ export default {
this.nameForm = { this.nameForm = {
id: null, id: null,
adcd: null, adcd: null,
embankmentCode: null, dikeCode: null,
markName: null, markName: null,
dikeName: null, dikeName: null,
markLocation: null, markLocation: null,
@ -1000,7 +1000,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map((item) => item.embankmentCode); this.ids = selection.map((item) => item.dikeCode);
this.single = selection.length !== 1; this.single = selection.length !== 1;
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
@ -1016,12 +1016,12 @@ export default {
this.reset(); this.reset();
this.isEdit = true; this.isEdit = true;
console.log(77777, row); console.log(77777, row);
const embankmentCode = row.embankmentCode; const dikeCode = row.dikeCode;
getDikeMark(embankmentCode).then((response) => { getDikeMark(dikeCode).then((response) => {
// this.form = response.data; // this.form = response.data;
console.log("回显的数据", response); console.log("回显的数据", response);
this.comForm.dikeName = response.data[0].dikeName; this.comForm.dikeName = response.data[0].dikeName;
this.comForm.embankmentCode = response.data[0].embankmentCode; this.comForm.dikeCode = response.data[0].dikeCode;
this.comForm.adcd = response.data[0].adcd; this.comForm.adcd = response.data[0].adcd;
console.log("this.comForm", this.comForm); console.log("this.comForm", this.comForm);
this.counter0 = response.data.filter((item) => item.type == 0); this.counter0 = response.data.filter((item) => item.type == 0);
@ -1089,26 +1089,26 @@ export default {
this.counter0.length > 1 this.counter0.length > 1
? this.counter0 ? this.counter0
: this.$refs["noticeForm0"][0].form.markName : this.$refs["noticeForm0"][0].form.markName
? [this.$refs["noticeForm0"][0].form] ? [this.$refs["noticeForm0"][0].form]
: []; : [];
const C1 = const C1 =
this.counter1.length > 1 this.counter1.length > 1
? this.counter1 ? this.counter1
: this.$refs["warnForm0"][0].form.markName : this.$refs["warnForm0"][0].form.markName
? [this.$refs["warnForm0"][0].form] ? [this.$refs["warnForm0"][0].form]
: []; : [];
const C2 = const C2 =
this.counter2.length > 1 this.counter2.length > 1
? this.counter2 ? this.counter2
: this.$refs["guideForm0"][0].form.markName : this.$refs["guideForm0"][0].form.markName
? [this.$refs["guideForm0"][0].form] ? [this.$refs["guideForm0"][0].form]
: []; : [];
const C3 = const C3 =
this.counter3.length > 1 this.counter3.length > 1
? this.counter3 ? this.counter3
: this.$refs["nameForm0"][0].form.markName : this.$refs["nameForm0"][0].form.markName
? [this.$refs["nameForm0"][0].form] ? [this.$refs["nameForm0"][0].form]
: []; : [];
// console.log("C0C0", C0, C1); // console.log("C0C0", C0, C1);
if (this.isEdit) { if (this.isEdit) {
@ -1156,7 +1156,7 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.embankmentCode || this.ids; const ids = row.dikeCode || this.ids;
if (ids) { if (ids) {
this.$confirm("是否删除选中的数据？", "警告", { this.$confirm("是否删除选中的数据？", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",

10
src/views/dike/safetyManage/confirmDelimitationManage/index.vue
View File

@ -45,7 +45,7 @@
@change="handleQuery" @change="handleQuery"
> >
<el-option <el-option
v-for="dict in sluiceTypeOptions" v-for="dict in dikeTypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
@ -62,7 +62,7 @@
>搜索</el-button >搜索</el-button
> --> > -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -174,7 +174,7 @@
icon="el-icon-view" icon="el-icon-view"
@click="viewInfo(scope.row)" @click="viewInfo(scope.row)"
v-hasPermi="['df:qqhj:view']" v-hasPermi="['df:qqhj:view']"
>查看</el-button >查看</el-button
> >
<el-button <el-button
size="mini" size="mini"
@ -182,7 +182,7 @@
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
@click="comfirm(scope.row)" @click="comfirm(scope.row)"
v-hasPermi="['df:qqhj:comfirm']" v-hasPermi="['df:qqhj:comfirm']"
>确权划界</el-button >确权划界</el-button
> >
<!-- <el-button <!-- <el-button
size="mini" size="mini"
@ -437,7 +437,7 @@ export default {
// 工程规模字典 // 工程规模字典
projectScaleOptions: [], projectScaleOptions: [],
// 堤防类型字典 // 堤防类型字典
sluiceTypeOptions: [], dikeTypeOptions: [],
// 工程等别字典 // 工程等别字典
engineerLevelOptions: [], engineerLevelOptions: [],
// 主要建筑物级别字典 // 主要建筑物级别字典

22
src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
View File

@ -51,7 +51,7 @@
>搜索</el-button >搜索</el-button
> --> > -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -65,7 +65,7 @@
:disabled="!multiple" :disabled="!multiple"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['df:jbxx:add']" v-hasPermi="['df:jbxx:add']"
>申报</el-button >申报</el-button
> >
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
@ -174,7 +174,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleAddEdit(scope.row)" @click="handleAddEdit(scope.row)"
v-hasPermi="['df:jbxx:addEdit']" v-hasPermi="['df:jbxx:addEdit']"
>修改申报</el-button >修改申报</el-button
> >
</template> </template>
@ -227,7 +227,7 @@
icon="el-icon-folder-checked" icon="el-icon-folder-checked"
@click="transformCertificate(scope.row)" @click="transformCertificate(scope.row)"
v-hasPermi="['df:jbxx:transform']" v-hasPermi="['df:jbxx:transform']"
>换证</el-button >换证</el-button
> >
</template> </template>
@ -257,8 +257,8 @@
scope.row.zxStatus == 1 scope.row.zxStatus == 1
? "注销不通过原因" ? "注销不通过原因"
: scope.row.zxStatus == 0 : scope.row.zxStatus == 0
? "注销申请中" ? "注销申请中"
: "申请注销" : "申请注销"
}} }}
</el-button> </el-button>
</el-popconfirm> </el-popconfirm>
@ -513,7 +513,7 @@
v-for="dict in isGateProjectOptions" v-for="dict in isGateProjectOptions"
:key="dict.dictValue + '是否为套闸工程'" :key="dict.dictValue + '是否为套闸工程'"
:label="dict.dictValue" :label="dict.dictValue"
>{{ dict.dictLabel }}</el-radio >{{ dict.dictLabel }}</el-radio
> >
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -1235,7 +1235,7 @@ export default {
startDate: null, startDate: null,
compDate: null, compDate: null,
admDep: null, admDep: null,
isGateProject: "0", isGateProject: null,
observationProject: null, observationProject: null,
levelDatum: null, levelDatum: null,
dikeOverview: null, dikeOverview: null,
@ -1246,11 +1246,11 @@ export default {
owerDept: null, owerDept: null,
remark: null, remark: null,
relation: null, relation: null,
status: "0", status: null,
securityCategory: null, securityCategory: null,
adcd: null, adcd: null,
hzStatus: "0", hzStatus:null,
zxStatus: "0", zxStatus: null,
reason: null, reason: null,
startLoc: null, startLoc: null,
endLoc: null, endLoc: null,

28
src/views/sluice/engineeringCondition/identificationPlate/index.vue
View File

@ -108,7 +108,7 @@
>搜索</el-button >搜索</el-button
> --> > -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -121,7 +121,7 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['yg:sluiceMark:add']" v-hasPermi="['yg:sluiceMark:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -132,7 +132,7 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['yg:sluiceMark:edit']" v-hasPermi="['yg:sluiceMark:edit']"
>修改</el-button >修改</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -143,7 +143,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['yg:sluiceMark:remove']" v-hasPermi="['yg:sluiceMark:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
@ -239,7 +239,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['yg:sluiceMark:edit']" v-hasPermi="['yg:sluiceMark:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="mini"
@ -247,7 +247,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['yg:sluiceMark:remove']" v-hasPermi="['yg:sluiceMark:remove']"
>删除</el-button >删除</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -1098,26 +1098,26 @@ export default {
this.counter0.length > 1 this.counter0.length > 1
? this.counter0 ? this.counter0
: this.$refs["noticeForm0"][0].form.markName : this.$refs["noticeForm0"][0].form.markName
? [this.$refs["noticeForm0"][0].form] ? [this.$refs["noticeForm0"][0].form]
: []; : [];
const C1 = const C1 =
this.counter1.length > 1 this.counter1.length > 1
? this.counter1 ? this.counter1
: this.$refs["warnForm0"][0].form.markName : this.$refs["warnForm0"][0].form.markName
? [this.$refs["warnForm0"][0].form] ? [this.$refs["warnForm0"][0].form]
: []; : [];
const C2 = const C2 =
this.counter2.length > 1 this.counter2.length > 1
? this.counter2 ? this.counter2
: this.$refs["guideForm0"][0].form.markName : this.$refs["guideForm0"][0].form.markName
? [this.$refs["guideForm0"][0].form] ? [this.$refs["guideForm0"][0].form]
: []; : [];
const C3 = const C3 =
this.counter3.length > 1 this.counter3.length > 1
? this.counter3 ? this.counter3
: this.$refs["nameForm0"][0].form.markName : this.$refs["nameForm0"][0].form.markName
? [this.$refs["nameForm0"][0].form] ? [this.$refs["nameForm0"][0].form]
: []; : [];
// // console.log("C0C0", C0, C1); // // console.log("C0C0", C0, C1);
if (this.isEdit) { if (this.isEdit) {

Write Preview
Loading…
Cancel
Save