diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml index dd3900fe..7b45ed9c 100644 --- a/yanzhu-auth/src/main/resources/bootstrap.yml +++ b/yanzhu-auth/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # 服务注册地址 server-addr: @discovery.server-addr@ # 服务分组 - group: lijun + # group: lijun config: # 配置中心地址 server-addr: @discovery.server-addr@ diff --git a/yanzhu-bigscreen/public/bimImages/1.png b/yanzhu-bigscreen/public/bimImages/1.png new file mode 100644 index 00000000..ad43a030 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/1.png differ diff --git a/yanzhu-bigscreen/public/bimImages/2.png b/yanzhu-bigscreen/public/bimImages/2.png new file mode 100644 index 00000000..67d50585 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/2.png differ diff --git a/yanzhu-bigscreen/public/bimImages/3.png b/yanzhu-bigscreen/public/bimImages/3.png new file mode 100644 index 00000000..cfe8c4d6 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/3.png differ diff --git a/yanzhu-bigscreen/public/bimImages/4.png b/yanzhu-bigscreen/public/bimImages/4.png new file mode 100644 index 00000000..da30b944 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/4.png differ diff --git a/yanzhu-bigscreen/public/bimImages/5.png b/yanzhu-bigscreen/public/bimImages/5.png new file mode 100644 index 00000000..7073fa73 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/5.png differ diff --git a/yanzhu-bigscreen/public/bimImages/arrow_left_open.png b/yanzhu-bigscreen/public/bimImages/arrow_left_open.png new file mode 100644 index 00000000..510ff821 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/arrow_left_open.png differ diff --git a/yanzhu-bigscreen/public/bimImages/arrow_left_retract.png b/yanzhu-bigscreen/public/bimImages/arrow_left_retract.png new file mode 100644 index 00000000..62835fe2 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/arrow_left_retract.png differ diff --git a/yanzhu-bigscreen/public/bimImages/arrow_right_open.png b/yanzhu-bigscreen/public/bimImages/arrow_right_open.png new file mode 100644 index 00000000..e786809d Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/arrow_right_open.png differ diff --git a/yanzhu-bigscreen/public/bimImages/arrow_right_retract.png b/yanzhu-bigscreen/public/bimImages/arrow_right_retract.png new file mode 100644 index 00000000..c2cca0f7 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/arrow_right_retract.png differ diff --git a/yanzhu-bigscreen/public/bimImages/pitMonitor.png b/yanzhu-bigscreen/public/bimImages/pitMonitor.png new file mode 100644 index 00000000..0ed75985 Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/pitMonitor.png differ diff --git a/yanzhu-bigscreen/public/bimImages/power.png b/yanzhu-bigscreen/public/bimImages/power.png new file mode 100644 index 00000000..af6da13c Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/power.png differ diff --git a/yanzhu-bigscreen/public/bimImages/towerMonitor.png b/yanzhu-bigscreen/public/bimImages/towerMonitor.png new file mode 100644 index 00000000..12d0093e Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/towerMonitor.png differ diff --git a/yanzhu-bigscreen/public/bimImages/videoMonitor.png b/yanzhu-bigscreen/public/bimImages/videoMonitor.png new file mode 100644 index 00000000..95eea9df Binary files /dev/null and b/yanzhu-bigscreen/public/bimImages/videoMonitor.png differ diff --git a/yanzhu-bigscreen/public/index.html b/yanzhu-bigscreen/public/index.html index 58ed880d..3b6e819f 100644 --- a/yanzhu-bigscreen/public/index.html +++ b/yanzhu-bigscreen/public/index.html @@ -25,6 +25,8 @@ + + @@ -49,7 +51,8 @@ - + + \ No newline at end of file + diff --git a/yanzhu-bigscreen/src/router/index.js b/yanzhu-bigscreen/src/router/index.js index 591d0c04..cb5a0210 100644 --- a/yanzhu-bigscreen/src/router/index.js +++ b/yanzhu-bigscreen/src/router/index.js @@ -1,6 +1,11 @@ import Vue from "vue"; import VueRouter from "vue-router"; +const originalPush = VueRouter.prototype.push +// 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题 +VueRouter.prototype.push = function push(location) { + return originalPush.call(this, location).catch(err => err) +} Vue.use(VueRouter); const routes = [ @@ -49,9 +54,23 @@ const routes = [ { path: "/greenCarbon", name: "greenCarbon", - meta: { nav: 23 }, + meta: { nav: 6 }, component: () => - import(/* webpackChunkName: "progress" */ "../views/greenCarbon.vue"), + import(/* webpackChunkName: "greenCarbon" */ "../views/greenCarbon.vue"), + }, + { + path: "/bimManage", + name: "bimManage", + meta: { nav: 701 }, + component: () => + import(/* webpackChunkName: "bimManage" */ "../views/bimManage.vue"), + }, + { + path: "/bimRoaming", + name: "bimRoaming", + meta: { nav: 702 }, + component: () => + import(/* webpackChunkName: "bimRoaming" */ "../views/bimRoaming.vue"), }, { path: "/videoMonitor", diff --git a/yanzhu-bigscreen/src/views/bim/001.png b/yanzhu-bigscreen/src/views/bim/001.png new file mode 100644 index 00000000..f992ef90 Binary files /dev/null and b/yanzhu-bigscreen/src/views/bim/001.png differ diff --git a/yanzhu-bigscreen/src/views/bim/videoDialog.vue b/yanzhu-bigscreen/src/views/bim/videoDialog.vue new file mode 100644 index 00000000..dfc6e1c0 --- /dev/null +++ b/yanzhu-bigscreen/src/views/bim/videoDialog.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/yanzhu-bigscreen/src/views/bimManage.vue b/yanzhu-bigscreen/src/views/bimManage.vue new file mode 100644 index 00000000..caeb689d --- /dev/null +++ b/yanzhu-bigscreen/src/views/bimManage.vue @@ -0,0 +1,1701 @@ + + + + + diff --git a/yanzhu-bigscreen/src/views/bimRoaming copy.vue b/yanzhu-bigscreen/src/views/bimRoaming copy.vue new file mode 100644 index 00000000..eb03bedb --- /dev/null +++ b/yanzhu-bigscreen/src/views/bimRoaming copy.vue @@ -0,0 +1,398 @@ + + + + + diff --git a/yanzhu-bigscreen/src/views/bimRoaming.vue b/yanzhu-bigscreen/src/views/bimRoaming.vue new file mode 100644 index 00000000..1a373779 --- /dev/null +++ b/yanzhu-bigscreen/src/views/bimRoaming.vue @@ -0,0 +1,857 @@ + + + + + diff --git a/yanzhu-bigscreen/src/views/greenCarbon.vue b/yanzhu-bigscreen/src/views/greenCarbon.vue index f599dede..1abb8851 100644 --- a/yanzhu-bigscreen/src/views/greenCarbon.vue +++ b/yanzhu-bigscreen/src/views/greenCarbon.vue @@ -268,7 +268,7 @@ export default { series: [ { type: 'pie', - radius: '70%', + radius: '50%', avoidLabelOverlap: false, bottom: is1K ? '5%' : is2K ? '15%' : '10%', top: '-10%', diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index 341e7fd0..af45bfb8 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pi.project_person_phone = #{projectPersonPhone} and pi.project_status = #{projectStatus} and pi.is_del = #{isDel} - and pi.is_del !=2 + and pi.is_del not in (1,2) order by pi.project_sort, pi.id desc order by psu.sort_by, pi.id desc @@ -423,7 +423,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pi.project_person_phone = #{projectPersonPhone} and pi.project_status = #{projectStatus} and pi.is_del = #{isDel} - and pi.is_del!= 2 + and pi.is_del=0 order by pi.project_sort, pi.id desc order by psu.sort_by, pi.id desc diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml index 8c5c99bf..63e3dece 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysDeptMapper.xml @@ -71,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.dept_id from sys_dept d left join sys_role_dept rd on d.dept_id = rd.dept_id - where rd.role_id = #{roleId} + where d.del_flag = '0' and + rd.role_id = #{roleId} and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) @@ -80,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"