diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue
index 15b45864..1a7ed031 100644
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/yanzhu-bigscreen/src/components/header.vue
@@ -143,7 +143,7 @@ export default {
isFullScreen: false,
showMenus: [],
showMenusNavIds: [],
- notDetail:false,
+ notDetail: false,
};
},
computed: {
@@ -176,7 +176,7 @@ export default {
const prjId = urlParams.get("prjId");
localStorage.setItem("selProj", prjId);
setTimeout(() => {
- if(this.notDetail == false){
+ if (this.notDetail == false) {
location.hash = "#/detail";
}
}, 800);
@@ -238,13 +238,13 @@ export default {
if (!tmps.includes(2)) {
let nav = tmps[0];
nav = tmps[0];
- tmps = this.showMenusNavIds.filter((item) => String(item).startsWith(nav+""));
+ tmps = this.showMenusNavIds.filter((item) => String(item).startsWith(nav + ""));
if (tmps.length > 1) {
- nav= tmps[1];
+ nav = tmps[1];
}
this.$store.dispatch("ChangeNav", nav);
this.doNav(+nav);
- this.notDetail=true;
+ this.notDetail = true;
}
console.log(this.showMenusNavIds);
});
@@ -294,6 +294,9 @@ export default {
case 702:
this.$router.push("/bimRoaming");
break;
+ case 704:
+ this.$router.push("/bimBriefing");
+ break;
case 701:
this.$router.push("/bimManage");
break;
diff --git a/yanzhu-bigscreen/src/router/index.js b/yanzhu-bigscreen/src/router/index.js
index cb5a0210..f55bf2e6 100644
--- a/yanzhu-bigscreen/src/router/index.js
+++ b/yanzhu-bigscreen/src/router/index.js
@@ -72,6 +72,13 @@ const routes = [
component: () =>
import(/* webpackChunkName: "bimRoaming" */ "../views/bimRoaming.vue"),
},
+ {
+ path: "/bimBriefing",
+ name: "bimBriefing",
+ meta: { nav: 704 },
+ component: () =>
+ import(/* webpackChunkName: "bimBriefing" */ "../views/bimBriefing.vue"),
+ },
{
path: "/videoMonitor",
name: "videoMonitor",
diff --git a/yanzhu-bigscreen/src/views/bimBriefing.vue b/yanzhu-bigscreen/src/views/bimBriefing.vue
new file mode 100644
index 00000000..30469e62
--- /dev/null
+++ b/yanzhu-bigscreen/src/views/bimBriefing.vue
@@ -0,0 +1,25 @@
+
+
+ 111
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java
index 701c00e1..817acfc4 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java
@@ -16,6 +16,7 @@ import com.yanzhu.manage.domain.GreenCarbonData;
import com.yanzhu.manage.domain.GreenCarbonItem;
import com.yanzhu.manage.service.IGreenCarbonDataService;
import com.yanzhu.manage.service.IGreenCarbonItemService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -188,7 +189,8 @@ public class GreenCarbonItemController extends BaseController
List list = greenCarbonItemService.selectGreenCarbonItemList(where);
if(list.size()>0){
for(GreenCarbonItem it : list){
- if(!it.getId().equals(greenCarbonItem.getId())){
+ if(!it.getId().equals(greenCarbonItem.getId())
+ && StringUtils.equals(it.getCarbonName(),greenCarbonItem.getCarbonName())){
return AjaxResult.error("当前项目已存在相同数据!");
}
}