admin/src/components/business/OperaAreasWindow.vue
@@ -6,8 +6,8 @@ @confirm="confirm" > <el-form :model="form" ref="form" label-width="100px" label-suffix="：" :rules="rules"> <el-form-item :label="form.type==0?'市名称':'县区名称'" prop="name"> <el-input v-model="form.name" :placeholder="form.type==0?'输入市名称':'输入县区名称'" v-trim/> <el-form-item :label="form.type==1?'市名称':'县区名称'" prop="name"> <el-input v-model="form.name" :placeholder="form.type==1?'输入市名称':'输入县区名称'" v-trim/> </el-form-item> <el-form-item label="排序码" prop="sortnum"> <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim/> @@ -31,7 +31,7 @@ parentId: null, name: null, sortnum: '0', type: '', type: null }, // 验证规则 rules: { @@ -45,6 +45,31 @@ }) }, methods: { open (title, target) { this.title = title this.visible = true this.$nextTick(() => { this.$refs.form.resetFields() this.form[this.configData['field.id']] = null }) // 新建 if (target == null) { this.$nextTick(() => { for (const key in this.form) { this.form[key] = target[key] } }) return } // 编辑 this.$nextTick(() => { for (const key in this.form) { this.form[key] = target[key] } }) console.log(this.form) }, // 确认新建 __confirmCreate () { this.$refs.form.validate((valid) => { admin/src/views/Inspection/components/OperaYwPatrolLineWindow.vue
@@ -32,7 +32,7 @@ </el-form> <!-- --> <el-dialog title="添加巡检点" :close-on-click-modal="false" append-to-body :visible.sync="isShowModal" width="780px"> <el-dialog title="添加巡检点" :close-on-click-modal="false" append-to-body :visible.sync="isShowModal" width="880px"> <!-- <el-select class="w400" v-model="selPoint" clearable multiple filterable> <el-option v-for="item in pointList" :value="item.id" :label="item.name"></el-option> </el-select> --> @@ -50,6 +50,8 @@ </el-form-item> <el-button type="primary" @click="initData">搜索</el-button> <el-button @click="reset">重置</el-button> <el-button type="primary" @click="editClick()" icon="el-icon-plus" v-permissions="['business:ywpatrolpoint:create']">新建巡检点</el-button> </el-form> <el-table @selection-change="handleSelectionChange" v-loading="isWorking.search" :data="pointList" stripe> @@ -67,12 +69,14 @@ <el-button type="primary" @click="subModal">确 定</el-button> </span> </el-dialog> <OperaYwPatrolPointWindow ref="operaYwPatrolPointWindow" @success="handlePageChange" /> </GlobalWindow> </template> <script> import BaseOpera from '@/components/base/BaseOpera' import GlobalWindow from '@/components/common/GlobalWindow' import OperaYwPatrolPointWindow from '@/views/Inspection/components/OperaYwPatrolPointWindow' import Pagination from '@/components/common/Pagination' import { fetchList as getFetchList } from '@/api/Inspection/ywPatrolPoint' import { create, updateById, detailById } from '@/api/Inspection/ywPatrolLine' @@ -81,7 +85,7 @@ export default { name: 'OperaYwPatrolLineWindow', extends: BaseOpera, components: { GlobalWindow, Pagination }, components: { GlobalWindow, Pagination,OperaYwPatrolPointWindow }, data() { return { // 表单数据 @@ -120,6 +124,10 @@ }) }, methods: { editClick(row) { this.$refs.operaYwPatrolPointWindow.open('新建巡检点') // this.$refs.operaYwPatrolPointWindow.initData() }, confirm() { const { form, list } = this this.$refs['form'].validate((valid) => { server/system_gateway/src/main/resources/application-pro.yml
@@ -1,12 +1,17 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://localhost:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: funing@2024 url: jdbc:mysql://rm-bp136n33jr035pbfl3o.mysql.rds.aliyuncs.com:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: zhcg password: Fnwtzx@1127$dmtt driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis: # database: 0 host: 127.0.0.1 port: 6379 password: timeout: 5000 # 连接池中的最小空闲连接 jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: test active: pro application: name: system_gateway # 安全配置 server/system_timer/src/main/resources/application-pro.yml
@@ -1,9 +1,9 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://localhost:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: funing@2024 url: jdbc:mysql://rm-bp136n33jr035pbfl3o.mysql.rds.aliyuncs.com:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: zhcg password: Fnwtzx@1127$dmtt driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: pro application: name: systemTimer # 安全配置 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
@@ -56,5 +56,4 @@ return ApiResponse.success("操作成功"); } } server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: test active: pro application: name: visitsAdmin # 安全配置 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -1329,6 +1329,10 @@ if(model.getBillList()!=null && model.getBillList().size()>0){ for(YwContractBill bill: model.getBillList()){ //付款状态：0=待收款；1=已结清；2=部分结清；3=待付款；4=待退款；5=已关闭 if( Constants.formatBigdecimal(bill.getReceivableFee()).compareTo(new BigDecimal(0)) ==0){ //如果还没开始，账单直接关闭 continue; } if(Constants.equalsInteger(bill.getPayStatus(),Constants.ZERO) ||Constants.equalsInteger(bill.getPayStatus(),Constants.THREE)){ if(bill.getStartDate().getTime()>nowEnd){ server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncVisitServiceImpl.java
@@ -294,7 +294,7 @@ return ; } Constants.DEALING_HK_VISIT =true; String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_LOCAL_RESOURCE_PATH).getCode() +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode(); List<DeviceRole> roleList = deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda() .eq(DeviceRole::getType, Constants.ONE)); server/visits/dmvisit_service/src/main/resources/application-pro.yml
@@ -1,9 +1,9 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://localhost:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: root password: funing@2024 url: jdbc:mysql://rm-bp136n33jr035pbfl3o.mysql.rds.aliyuncs.com:3306/funingyunwei?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai username: zhcg password: Fnwtzx@1127$dmtt driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource redis:
