yin_yu820 5 өдөр өмнө
parent
commit
89c1fdb24c

+ 6 - 0
jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/controller/EnterpriseElectricityController.java

@@ -105,6 +105,12 @@ public class EnterpriseElectricityController {
 	@PostMapping("save")
 	public  ResponseEntity <String> save(@Valid @RequestBody EnterpriseElectricityDTO enterpriseElectricityDTO) {
 		//新增或编辑表单保存
+
+		//设置初始阅读量10
+		if(enterpriseElectricityDTO.getId()==null||enterpriseElectricityDTO.getId().equals("")||enterpriseElectricityDTO.getId().equals("0")){
+			enterpriseElectricityDTO.setDes9("10");
+		}
+
 		enterpriseElectricityService.saveOrUpdate (enterpriseElectricityWrapper.toEntity (enterpriseElectricityDTO));
         return ResponseEntity.ok ( "保存成功" );
 	}

+ 5 - 0
jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/security/config/WebSecurityConfig.java

@@ -86,6 +86,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/enterpriseinfo/enterpriseInfo/getnologinstr",
                         "/enterpriseinfo/enterpriseInfo/getIndustryChainList",
                         "/enterpriseinfo/enterpriseInfo/loginid",
+
+                        "/dp/dp/getDzfCount",
+                        "/dp/dp/getZcs",
+
                         "/sys/sysConfig/getConfig",
                         "/getAppFlowChart",
                         "/sys/getCode",
@@ -94,6 +98,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/app/sys/getCode", "/map/mapVisualization/**",
                         "/sys/casLogin" ).permitAll ( ) // 允许请求无需认证
                 .antMatchers ( HttpMethod.OPTIONS, "/**" ).permitAll ( )
+                .antMatchers("/v2/api-docs", "/swagger-ui.html", "/swagger-resources/**").denyAll()
                 .anyRequest ( ).authenticated ( ) // 所有请求都需要验证
                 .and ( )
                 .apply ( securityConfigurerAdapter ( ) );

+ 3 - 2
jp-mobile/pages/policy/policyInfo.vue

@@ -216,6 +216,7 @@
 			},
 			
 			getComById(query) {
+				uni.showLoading()	
 				loginService.policyInfo({
 					id: query.id,
 				}).then(({
@@ -236,10 +237,10 @@
 						
 					}
 					
-					
+					uni.hideLoading();
 
 				}).catch((e) => {
-				
+					uni.hideLoading();
 				})
 			},
 			

+ 12 - 0
jp-ui/src/views/modules/enterpriseelectricity/EnterpriseElectricityForm.vue

@@ -229,6 +229,18 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+
+            // 1. 把不支持的块级标签整体换成 div
+            this.inputForm.des4 = this.inputForm.des4.replace(/<\/?(section|article|aside|header|footer|nav|center)\b[^>]*>/gi,'<div>');
+            // 2. 把不支持的行内标签整体换成 span,并保留文字
+            this.inputForm.des4 = this.inputForm.des4.replace(/<\/?(font|u|s|del|strike)\b[^>]*>/gi,'<span>');
+
+            // 1. 把不支持的块级标签整体换成 div
+            this.inputForm.des6 = this.inputForm.des6.replace(/<\/?(section|article|aside|header|footer|nav|center)\b[^>]*>/gi,'<div>');
+            // 2. 把不支持的行内标签整体换成 span,并保留文字
+            this.inputForm.des6 = this.inputForm.des6.replace(/<\/?(font|u|s|del|strike)\b[^>]*>/gi,'<span>');
+
+
             enterpriseElectricityService.save(this.inputForm).then(({data}) => {
               this.visible = false
               this.$message.success(data)