diff --git a/.npmrc b/.npmrc index 81dffa18..b32e9535 100644 --- a/.npmrc +++ b/.npmrc @@ -1,5 +1,5 @@ registry=http://192.168.1.87:4873/ email=aixianling@sinoecare.com always-auth=true -_auth="YWRtaW46YWRtaW4xMjM=" package-lock=false +//192.168.1.87:4873/:_auth="YWRtaW46YWRtaW4xMjM=" diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue index 30a6a1e0..59e78786 100644 --- a/src/components/pages/selectGird.vue +++ b/src/components/pages/selectGird.vue @@ -81,17 +81,18 @@ export default { if (this.isMyGirds) { url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2` } - if(this.$route.query.action) { + if (this.$route.query.action) { url = this.$route.query.action } this.$http.post(url, null, {params}).then((res) => { if (res?.data) { let parents = res.data.map(e => e.parentGirdId) + console.log(parents) this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)})) this.treeInit() - if(this.$route.query.selected) { //确认按钮弹窗报错 - this.allData.map((item) => { - if(item.id == this.$route.query.selected) { + if (this.$route.query.selected) { //确认按钮弹窗报错 + this.allData.map((item) => { + if (item.id == this.$route.query.selected) { this.SelectGird = item } }) @@ -106,7 +107,10 @@ export default { params: {girdId: last} }).then(res => { if (res?.data) { - this.selectList = [{girdName: '可选范围', id: ''}, res.data.filter(e => !!this.allData.find(a => a.id == e.id))].flat() + this.selectList = [{ + girdName: '可选范围', + id: '' + }, res.data.filter(e => !!this.allData.find(a => a.id == e.id))].flat() this.getGridsByGridMemberAndParent({id: last}) } }) @@ -131,14 +135,14 @@ export default { let {id: parentGirdId} = row this.options = this.allData.filter(e => e.parentGirdId == parentGirdId) this.options.map((item) => item.isChecked = this.selected.includes(item.id)) - + }, girdNameClick(row, index) { if (!index) { //第一级别 this.selectList = [] this.treeInit(true) } else { - this.selectList.splice(index, 8) + this.selectList.splice(index + 1, 8) this.getGridsByGridMemberAndParent(row) } }, diff --git a/src/project/lulong/AppHandSnapshot/Statistics.vue b/src/project/lulong/AppHandSnapshot/Statistics.vue index fdb802c8..0f42073a 100644 --- a/src/project/lulong/AppHandSnapshot/Statistics.vue +++ b/src/project/lulong/AppHandSnapshot/Statistics.vue @@ -2,16 +2,10 @@
- - - - - + + +
@@ -19,15 +13,15 @@
概况总览
-

{{item.value}}

-

{{item.label}}

+

{{ item.value }}

+

{{ item.label }}

事件办结率
-
{{finshNum || 0}}%
+
{{ finshNum || 0 }}%
@@ -40,10 +34,11 @@
巡查事件分类 - +
-
+
@@ -53,6 +48,7 @@