Browse Source

Merge branch 'master' into release-sy-v1.0.0

sy-water-data-board-ui
hxh 2 months ago
parent
commit
91480cfbbf
  1. 3
      src/components/linkNameSelect/linkDike.vue
  2. 1
      src/components/linkNameSelect/linkSluice.vue
  3. 40
      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

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

1
src/components/linkNameSelect/linkSluice.vue

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

40
src/layout/components/Navbar.vue

@ -152,14 +152,32 @@ export default {
this.handleJump(e.value);
return;
}
sessionStorage.setItem("topTab", e.value);
this.$store.dispatch("changeTopTab", e.value);
this.$router.replace({
path: `/`,
query: {
timestamp: new Date().getTime(),
},
});
sessionStorage.setItem('topTab', e)
this.$store.dispatch('changeTopTab', e)
console.log(e)
if (e === 'sluice') {
this.$router.replace({
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() {
this.$store.dispatch("app/toggleSideBar");
@ -186,11 +204,9 @@ export default {
<style lang="scss" scoped>
.navbar {
// background: #122c7d !important;
background: linear-gradient(
270deg,
background: linear-gradient(270deg,
rgba(61, 156, 204, 1) 1%,
rgba(131, 179, 107, 1) 100%
) !important;
rgba(131, 179, 107, 1) 100%) !important;
// height: 70px;
height: 56px;
overflow: hidden;

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

@ -107,7 +107,7 @@
>搜索</el-button
> -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>重置</el-button
>
</el-form-item>
</el-form>
@ -120,7 +120,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['yg:dikeMark:add']"
>新增</el-button
>新增</el-button
>
</el-col>
<el-col :span="1.5">
@ -131,7 +131,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['yg:dikeMark:edit']"
>修改</el-button
>修改</el-button
>
</el-col>
<el-col :span="1.5">
@ -142,7 +142,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['yg:dikeMark:remove']"
>删除</el-button
>删除</el-button
>
</el-col>
<right-toolbar
@ -237,7 +237,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['yg:dikeMark:edit']"
>修改</el-button
>修改</el-button
>
<el-button
size="mini"
@ -245,7 +245,7 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['yg:dikeMark:remove']"
>删除</el-button
>删除</el-button
>
</template>
</el-table-column>
@ -639,7 +639,7 @@ export default {
form: {},
comForm: {
dikeName: null,
embankmentCode: null,
dikeCode: null,
adcd: null,
},
noticeForm: {},
@ -739,8 +739,8 @@ export default {
// if (this.comForm.dikeName) {
// this[counterType][this[counterType].length - 1].dikeName =
// this.comForm.dikeName;
// this[counterType][this[counterType].length - 1].embankmentCode =
// this.comForm.embankmentCode;
// this[counterType][this[counterType].length - 1].dikeCode =
// this.comForm.dikeCode;
// }
//
// this[counterType][this[counterType].length - 1].type = type;
@ -761,8 +761,8 @@ export default {
// if (this.comForm.dikeName) {
// this.counter0[this.counter0.length - 1].dikeName =
// this.comForm.dikeName;
// this.counter0[this.counter0.length - 1].embankmentCode =
// this.comForm.embankmentCode;
// this.counter0[this.counter0.length - 1].dikeCode =
// this.comForm.dikeCode;
// }
// //
// this.counter0[this.counter0.length - 1].type = "0";
@ -792,27 +792,27 @@ export default {
// this.$refs[ele].appendChild(child.$el); //
},
chooseEmbankmenName(data) {
// embankmentCode
this.comForm.embankmentCode = data.embankmentCode;
// dikeCode
this.comForm.dikeCode = data.dikeCode;
this.comForm.adcd = data.adcd;
// console.log(33333, this.comForm);
// //
// 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.counter0.forEach((item) => {
// item.dikeName = data.dikeName;
// item.embankmentCode = data.embankmentCode;
// item.dikeCode = data.dikeCode;
// });
// // this.noticeForm.dikeName = data.dikeName;
// this.warnForm.dikeName = data.dikeName;
// this.nameForm.dikeName = data.dikeName;
// this.guideForm.dikeName = data.dikeName;
// // this.noticeForm.embankmentCode = data.embankmentCode;
// this.warnForm.embankmentCode = data.embankmentCode;
// this.nameForm.embankmentCode = data.embankmentCode;
// this.guideForm.embankmentCode = data.embankmentCode;
// // this.noticeForm.dikeCode = data.dikeCode;
// this.warnForm.dikeCode = data.dikeCode;
// this.nameForm.dikeCode = data.dikeCode;
// this.guideForm.dikeCode = data.dikeCode;
},
/** 查询水闸标识标牌列表 */
getList() {
@ -845,13 +845,13 @@ export default {
this.counter3 = [{}];
this.comForm = {
dikeName: null,
embankmentCode: null,
dikeCode: null,
adcd: null,
};
this.noticeForm = {
id: null,
adcd: null,
embankmentCode: null,
dikeCode: null,
markName: null,
dikeName: null,
markLocation: null,
@ -871,7 +871,7 @@ export default {
this.warnForm = {
id: null,
adcd: null,
embankmentCode: null,
dikeCode: null,
markName: null,
dikeName: null,
markLocation: null,
@ -891,7 +891,7 @@ export default {
this.guideForm = {
id: null,
adcd: null,
embankmentCode: null,
dikeCode: null,
markName: null,
dikeName: null,
markLocation: null,
@ -911,7 +911,7 @@ export default {
this.nameForm = {
id: null,
adcd: null,
embankmentCode: null,
dikeCode: null,
markName: null,
dikeName: null,
markLocation: null,
@ -978,7 +978,7 @@ export default {
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.embankmentCode);
this.ids = selection.map((item) => item.dikeCode);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@ -994,12 +994,12 @@ export default {
this.reset();
this.isEdit = true;
console.log(77777, row);
const embankmentCode = row.embankmentCode;
getDikeMark(embankmentCode).then((response) => {
const dikeCode = row.dikeCode;
getDikeMark(dikeCode).then((response) => {
// this.form = response.data;
console.log("回显的数据", response);
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;
console.log("this.comForm", this.comForm);
this.counter0 = response.data.filter((item) => item.type == 0);
@ -1067,26 +1067,26 @@ export default {
this.counter0.length > 1
? this.counter0
: this.$refs["noticeForm0"][0].form.markName
? [this.$refs["noticeForm0"][0].form]
: [];
? [this.$refs["noticeForm0"][0].form]
: [];
const C1 =
this.counter1.length > 1
? this.counter1
: this.$refs["warnForm0"][0].form.markName
? [this.$refs["warnForm0"][0].form]
: [];
? [this.$refs["warnForm0"][0].form]
: [];
const C2 =
this.counter2.length > 1
? this.counter2
: this.$refs["guideForm0"][0].form.markName
? [this.$refs["guideForm0"][0].form]
: [];
? [this.$refs["guideForm0"][0].form]
: [];
const C3 =
this.counter3.length > 1
? this.counter3
: this.$refs["nameForm0"][0].form.markName
? [this.$refs["nameForm0"][0].form]
: [];
? [this.$refs["nameForm0"][0].form]
: [];
// console.log("C0C0", C0, C1);
if (this.isEdit) {
@ -1134,7 +1134,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.embankmentCode || this.ids;
const ids = row.dikeCode || this.ids;
if (ids) {
this.$confirm("是否删除选中的数据?", "警告", {
confirmButtonText: "确定",

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

@ -45,7 +45,7 @@
@change="handleQuery"
>
<el-option
v-for="dict in sluiceTypeOptions"
v-for="dict in dikeTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
@ -62,7 +62,7 @@
>搜索</el-button
> -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>重置</el-button
>
</el-form-item>
</el-form>
@ -174,7 +174,7 @@
icon="el-icon-view"
@click="viewInfo(scope.row)"
v-hasPermi="['df:qqhj:view']"
>查看</el-button
>查看</el-button
>
<el-button
size="mini"
@ -182,7 +182,7 @@
icon="el-icon-edit-outline"
@click="comfirm(scope.row)"
v-hasPermi="['df:qqhj:comfirm']"
>确权划界</el-button
>确权划界</el-button
>
<!-- <el-button
size="mini"
@ -431,7 +431,7 @@ export default {
//
projectScaleOptions: [],
//
sluiceTypeOptions: [],
dikeTypeOptions: [],
//
engineerLevelOptions: [],
//

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

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

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

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

Loading…
Cancel
Save