diff --git a/src/api/taicangpop/data.js b/src/api/taicangpop/data.js index afd8ac4..59763a1 100644 --- a/src/api/taicangpop/data.js +++ b/src/api/taicangpop/data.js @@ -15,6 +15,12 @@ export function getNum(data) { }); } +export function getNumNew(data) { + return request({ + url: `/taicangpop/data/getNumNew?buildingid=${data.buildingId}`, + method: "get", + }); +} export function getPeopellist(data) { return request({ url: `/taicangpop/data/getpeopellist?deptid=${data.deptid}&deptname=${data.deptname}`, diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 99e2c19..b7842e7 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -252,6 +252,6 @@ aside { .taicang-dialog-small { width: 850px !important; .dialog-main { - min-height: 500px; + min-height: auto; } } diff --git a/src/components/NavigationBar/index.vue b/src/components/NavigationBar/index.vue index 48d1379..6b4ef64 100644 --- a/src/components/NavigationBar/index.vue +++ b/src/components/NavigationBar/index.vue @@ -121,7 +121,10 @@ export default { computed: { ...mapGetters(["name", "yjTotal"]), handlerBtn() { - return this.$route.name == "xiaoqu" && this.$auth.hasRole("admin"); + return ( + this.$route.name == "xiaoqu" && + this.$auth.hasRoleOr(["admin", "leader"]) + ); }, }, }; diff --git a/src/views/components/xiaoqu/ColorCell/index.vue b/src/views/components/xiaoqu/ColorCell/index.vue index 6fe4218..f4cfad8 100644 --- a/src/views/components/xiaoqu/ColorCell/index.vue +++ b/src/views/components/xiaoqu/ColorCell/index.vue @@ -40,6 +40,11 @@ v-show="item.is_x" /> + +
+
+
+
@@ -163,6 +168,21 @@ export default { margin-right: 3px; } } + .point-color { + position: absolute; + bottom: 0px; + left: 0; + display: flex; + align-items: center; + z-index: 10; + + & > div { + height: 10px; + width: 10px; + border-radius: 50%; + border: 1px solid white; + } + } } } .grid-item-main:hover, diff --git a/src/views/components/xiaoqu/building.vue b/src/views/components/xiaoqu/building.vue index db5e3ed..5d29109 100644 --- a/src/views/components/xiaoqu/building.vue +++ b/src/views/components/xiaoqu/building.vue @@ -35,7 +35,7 @@