yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

todo

Browse Source
master
jevononlie 5 months ago
parent 3894e9eb30
commit 40bf1116d6
4 changed files with 972 additions and 970 deletions
Show Stats Download Patch File Download Diff File

6
jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
Unescape View File

@ -1,8 +1,8 @@
/* /*
* @Author: 王文杰 * @Author: 王文杰
* @Date: 2024-02-02 14:19:40 * @Date: 2024-02-02 14:19:40
* @LastEditors: 王文杰 * @LastEditors: jevononlie 728254585@qq.com
* @LastEditTime: 2024-02-29 14:40:37 * @LastEditTime: 2024-05-17 17:43:12
* @FilePath: /jnpf-web/src/utils/apiUrl.js * @FilePath: /jnpf-web/src/utils/apiUrl.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@ -10,5 +10,5 @@ module.exports = {
// 开发环境接口配置 // 开发环境接口配置
// APIURl: 'http://127.0.0.1:30000' // APIURl: 'http://127.0.0.1:30000'
// 测试环境接口配置 // 测试环境接口配置
APIURl: 'http://222.71.165.187:30000' APIURl: 'http://192.168.0.23:30000'
} }

43
jnpf-java-boot/jnpf-web/src/views/stationarea/areaDialog.vue
Unescape View File

@ -0,0 +1,43 @@
<template>
<el-dialog title="电子围栏" :visible="true" top="20vh" width="50%" append-to-body modal-append-to-body
:before-close="handleClose" class="my-dialog">
<div class="cont">112</div>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
export default {
components: {
},
props: [],
data() {
return {
visible: true,
loading: false,
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
},
mounted() { },
methods: {
handleClose() {
this.$emit('areaVisibleChange', false)
}
},
}
</script>
<style lang="scss" scoped>
.my-dialog {
.cont {
min-height: 600px;
}
}
</style>

117
jnpf-java-boot/jnpf-web/src/views/stationarea/form.vue
Unescape View File

@ -2,67 +2,67 @@
<template> <template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'" <el-dialog :title="!dataForm.id ? '新建' :'编辑'" modal-append-to-body="false" :close-on-click-modal="false"
:close-on-click-modal="false" append-to-body append-to-body :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" > <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading"> <template v-if="!loading">
{{ areaVisible }}
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="区域名称" tipLabel="围栏区域名称" prop="areaName">
label="区域名称" tipLabel="围栏区域名称" prop="areaName" > <JnpfInput v-model="dataForm.areaName" @change="changeData('areaName',-1)" placeholder="电子围栏名称" clearable
<JnpfInput v-model="dataForm.areaName" @change="changeData('areaName',-1)" :style='{"width":"100%"}'>
placeholder="电子围栏名称" clearable :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="区域类型" tipLabel="请选择围栏类型" prop="areaType">
label="区域类型" tipLabel="请选择围栏类型" prop="areaType" > <JnpfSelect v-model="dataForm.areaType" @change="changeData('areaType',-1)" placeholder="请选择围栏类型"
<JnpfSelect v-model="dataForm.areaType" @change="changeData('areaType',-1)" clearable :style='{"width":"100%"}' :options="areaTypeOptions" :props="areaTypeProps">
placeholder="请选择围栏类型" clearable :style='{"width":"100%"}' :options="areaTypeOptions" :props="areaTypeProps" >
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="是否启用" prop="status">
label="是否启用" prop="status" > <JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)" optionType="default"
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)" direction="horizontal" size="small" :options="statusOptions" :props="statusProps">
optionType="default" direction="horizontal" size="small" :options="statusOptions" :props="statusProps" >
</JnpfRadio> </JnpfRadio>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="所属回收站" prop="stationCode">
label="所属回收站" prop="stationCode" >
<JnpfSelect v-model="dataForm.stationCode" @change="changeData('stationCode',-1)" <JnpfSelect v-model="dataForm.stationCode" @change="changeData('stationCode',-1)"
placeholder="选择本组织回收站进行绑定" clearable :style='{"width":"100%"}' :options="stationCodeOptions" :props="stationCodeProps" > placeholder="选择本组织回收站进行绑定" clearable :style='{"width":"100%"}' :options="stationCodeOptions"
:props="stationCodeProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="地图信息" tipLabel="在地图上绘制电子围栏" prop="areaMapInfo">
label="地图信息" tipLabel="在地图上绘制电子围栏" prop="areaMapInfo" > <JnpfInput @focus="handLeArea" v-model="dataForm.areaMapInfo" placeholder="绘制电子围栏区域" :maxlength="65539"
<JnpfInput v-model="dataForm.areaMapInfo" @change="changeData('areaMapInfo',-1)" readonly prefix-icon='ym-custom ym-custom-google-maps' :style='{"width":"100%"}'>
placeholder="绘制电子围栏区域" disabled :maxlength="65539" clearable prefix-icon='ym-custom ym-custom-google-maps' :style='{"width":"100%"}' show-password >
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="区域描述" tipLabel="请输入区域描述" prop="areaDesc">
label="区域描述" tipLabel="请输入区域描述" prop="areaDesc" > <JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)" placeholder="请输入不超过两百字的标题描述"
<JnpfTextarea v-model="dataForm.areaDesc" @change="changeData('areaDesc',-1)" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}'>
placeholder="请输入不超过两百字的标题描述" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
</JnpfTextarea> </JnpfTextarea>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<!-- <el-dialog title="登录" v-if="areaVisible" :visible="true" top="20vh" width="30%" append-to-body
modal-append-to-body>
</el-dialog> -->
<area-dialog v-if="areaVisible" @areaVisibleChange="handleAreaVisibleChange" ref="JNPFForm" />
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" <SelectDialog v-if="1" :config="currTableConf" :formData="dataForm" ref="selectDialog" @select="addForSelect"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> @close="selectDialogVisible=false" />
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id"> <div class="upAndDown-button" v-if="dataForm.id">
@ -81,8 +81,8 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import areaDialog from './areaDialog'
import request from '@/utils/request' import request from '@/utils/request'
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
@ -91,8 +91,11 @@
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {
areaDialog
},
props: [], props: [],
data() { data() {
return { return {
@ -112,13 +115,10 @@
selectDialogVisible: false, selectDialogVisible: false,
currTableConf: {}, currTableConf: {},
dataValueAll: {}, dataValueAll: {},
addTableConf:{ addTableConf: {},
},
//可选范围默认值 //可选范围默认值
ableAll:{ ableAll: {},
}, tableRows: {},
tableRows:{
},
Vmodel: "", Vmodel: "",
currVmodel: "", currVmodel: "",
dataForm: { dataForm: {
@ -130,43 +130,32 @@
areaDesc: undefined, areaDesc: undefined,
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule: {
{ areaName: [{
areaName: [
{
required: true, required: true,
message: '电子围栏名称', message: '电子围栏名称',
trigger: 'blur' trigger: 'blur'
}, }, ],
], areaType: [{
areaType: [
{
required: true, required: true,
message: '请至少选择一个', message: '请至少选择一个',
trigger: 'change' trigger: 'change'
}, }, ],
], status: [{
status: [
{
required: true, required: true,
message: '请至少选择一个', message: '请至少选择一个',
trigger: 'change' trigger: 'change'
}, }, ],
], stationCode: [{
stationCode: [
{
required: true, required: true,
message: '选择本组织回收站进行绑定', message: '选择本组织回收站进行绑定',
trigger: 'change' trigger: 'change'
}, }, ],
], areaMapInfo: [{
areaMapInfo: [
{
required: true, required: true,
message: '绘制电子围栏区域', message: '绘制电子围栏区域',
trigger: 'blur' trigger: 'blur'
}, }, ],
],
}, },
areaTypeOptions: [], areaTypeOptions: [],
areaTypeProps: { "label": "fullName", "value": "enCode" }, areaTypeProps: { "label": "fullName", "value": "enCode" },
@ -184,6 +173,7 @@
areaMapInfo: [], areaMapInfo: [],
areaDesc: [], areaDesc: [],
}, },
areaVisible: false
} }
}, },
computed: { computed: {
@ -235,6 +225,9 @@
this.visible = false this.visible = false
this.$emit('refreshDataList', true) this.$emit('refreshDataList', true)
}, },
handLeArea() {
this.areaVisible = true
},
changeData(model, index) { changeData(model, index) {
this.isEdit = false this.isEdit = false
this.childIndex = index this.childIndex = index
@ -512,7 +505,9 @@
this.dataAll() this.dataAll()
this.childIndex = -1 this.childIndex = -1
}, },
handleAreaVisibleChange(flag) {
this.areaVisible = flag
}
}, },
} }
</script> </script>

78
jnpf-java-boot/jnpf-web/src/views/stationarea/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
@ -12,16 +5,14 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="所属回收站"> <el-form-item label="所属回收站">
<JnpfSelect v-model="query.stationCode" placeholder="选择本组织回收站进行绑定" clearable <JnpfSelect v-model="query.stationCode" placeholder="选择本组织回收站进行绑定" clearable :options="stationCodeOptions"
:options="stationCodeOptions"
:props="stationCodeProps" multiple> :props="stationCodeProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="区域类型"> <el-form-item label="区域类型">
<JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable <JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable :options="areaTypeOptions"
:options="areaTypeOptions"
:props="areaTypeProps" multiple> :props="areaTypeProps" multiple>
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
@ -34,8 +25,7 @@
<template v-if="showAll"> <template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="是否启用"> <el-form-item label="是否启用">
<JnpfSelect v-model="query.status" placeholder="请选择" clearable <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
:options="statusOptions"
:props="statusProps"> :props="statusProps">
</JnpfSelect> </JnpfSelect>
</el-form-item> </el-form-item>
@ -43,7 +33,7 @@
</template> </template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="search()">查询{{ areaVisible }}</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button> <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开 展开
@ -67,73 +57,47 @@
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
@click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
:span-method="arraySpanMethod" <el-table-column prop="areaName" label="区域名称" align="left">
>
<el-table-column
prop="areaName"
label="区域名称" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="areaType" label="区域类型" align="left">
prop="areaType"
label="区域类型" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="stationCode" label="所属回收站" align="left">
prop="stationCode"
label="所属回收站" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="status" label="是否启用" align="left">
prop="status"
label="是否启用" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="areaMapInfo" label="地图信息" align="left">
prop="areaMapInfo"
label="地图信息" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="areaDesc" label="区域描述" align="left">
prop="areaDesc"
label="区域描述" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column label="操作" fixed="right" width="150">
fixed="right" width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
@superQuery="superQuery" />
</div> </div>
</template> </template>
@ -518,7 +482,7 @@
colseFlow(isrRefresh) { colseFlow(isrRefresh) {
this.flowVisible = false this.flowVisible = false
if (isrRefresh) this.reset() if (isrRefresh) this.reset()
}, }
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save