浏览代码

修改bug

xusl 9 月之前
父节点
当前提交
bc51288705

+ 5 - 0
ipp-ap/src/views/idp/data/nwp/index.vue

@@ -75,6 +75,7 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
+                 @on-load="queryNWPDataByStationCode"
       >
       </avue-crud>
     </basic-container>
@@ -134,7 +135,11 @@ export default {
         this.tableLoading = false
       })
     },
+
     queryNWPDataByStationCode() {
+      if (this.stationCode=='' || this.stationCode==null){
+        return
+      }
       const param = new URLSearchParams()
       param.append('currentPage', this.page.currentPage)
       param.append('pageSize', this.page.pageSize)

+ 3 - 2
ipp-ap/src/views/idp/system/sysUser/index.vue

@@ -121,7 +121,8 @@
               title-width="100"
             >
               <el-form-item label="用户名" prop="userName" class="formItem" >
-                <el-input v-model="formData.userName" placeholder="填写用户名" clearable></el-input>
+                <el-input v-model="formData.userName" placeholder="填写用户名" clearable v-if="this.isEdit==true" disabled></el-input>
+                <el-input v-model="formData.userName" placeholder="填写用户名" clearable v-if="this.isEdit==false"></el-input>
               </el-form-item>
               <el-form-item label="密码" prop="passWord" class="formItem" >
                 <el-input v-model="formData.passWord" placeholder="填写密码" clearable></el-input>
@@ -440,7 +441,7 @@
                 this.loadButton = false
                 this.getAll()
               }).catch((error) => {
-                this.$message.error('修改用户出错' + error)
+                this.$message.error('保存用户出错' + error)
               })
             }
             this.showEdit = false

+ 5 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/controller/SysUserController.java

@@ -52,6 +52,11 @@ public class SysUserController {
     @PostMapping(value = "sysUser/")
     public R save(@RequestBody SysUser sysUser) {
         try {
+            // 验证用户名不能重复
+            SysUser dbUser = sysUserServiceImpl.findByUserName(sysUser.getUserName());
+            if (dbUser!=null){
+                return R.failed("用户名存在不能添加");
+            }
           // 用户名密码md5
           sysUser = md5User(sysUser);
             sysUserServiceImpl.save(sysUser);

+ 1 - 0
ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/PowerStationStatusDataServiceImpl.java

@@ -281,6 +281,7 @@ public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationS
         QueryWrapper<Nwp> nwpWrapper = new QueryWrapper<>();
         nwpWrapper.between("pre_time", startTime, endTime);
         nwpWrapper.eq("station_code",stationCode);
+        nwpWrapper.eq("forecast_manufactor","SYJY");
         List<Nwp> nwpDataList = nwpService.list(nwpWrapper);
         // 保存环境数据map
         Map<Long, String> hjsjMap = new HashMap<>();