111

commandCenter/src/components/common/Header.vue

@@ -1,130 +1,140 @@
 <template>
-    <div class="v-header">
-        <div class="v-header-left">
-            <div class="left-img inlineBlock"></div>
-            <div class="system-title">
-                <div class="zh">智慧社区指挥调度中心</div>
-                <div class="en">Smart Community Space Management System</div>
-            </div>
-            <div class="left-img rights inlineBlock"></div>
-        </div>
-        <div class="v-header-center">
-            <div
-                class="tabSelect"
-                v-for="(item, index) in tagTableArr"
-                :key="index"
-                :class="tagTabIndex == index ? 'active' : ''"
-                @click="selectTab(index)"
-            >
-                {{ item }}
-            </div>
-        </div>
-        <div class="v-header-right">
-            <div class="right-imgs"></div>
-            <div>
-                <span class="selectIocn"></span>
-                <el-select
-                    v-model="communityId"
-                    placeholder="所有社区"
-                    class="saveColumn-select"
-                    @change="$store.commit('setHomeCommunityAll', communityId)"
-                >
-                    <el-option v-for="(item, index) in communityList" :label="item.communityName" :value="item.id" :key="index"></el-option>
-                </el-select>
-            </div>
+  <div class="v-header">
+    <div class="v-header-left">
+      <div class="left-img inlineBlock"></div>
+      <div class="system-title">
+        <div class="zh">智慧社区指挥调度中心</div>
+        <div class="en">Smart Community Space Management System</div>
+      </div>
+      <div class="left-img rights inlineBlock"></div>
+    </div>
+    <div class="v-header-center">
+      <div
+        class="tabSelect"
+        v-for="(item, index) in tagTableArr"
+        :key="index"
+        :class="tagTabIndex == index ? 'active' : ''"
+        @click="selectTab(index)"
+      >
+        {{ item }}
+      </div>
+    </div>
+    <div class="v-header-right">
+      <div class="right-imgs"></div>
+      <div>
+        <span class="selectIocn"></span>
+        <el-select
+          v-model="communityId"
+          placeholder="所有社区"
+          class="saveColumn-select"
+          @change="$store.commit('setHomeCommunityAll', communityId)"
+        >
+          <el-option
+            v-for="(item, index) in communityList"
+            :label="item.communityName"
+            :value="item.id"
+            :key="index"
+          ></el-option>
+        </el-select>
+      </div>
 
-            <div class="time">
-                <div class="date">{{ time.date }}</div>
-                <div class="dates">
-                    <div class="thisTime">{{ time.thisTime }}</div>
-                    <div class="week">{{ time.week }}</div>
-                </div>
-            </div>
+      <div class="time">
+        <div class="date">{{ time.date }}</div>
+        <div class="dates">
+          <div class="thisTime">{{ time.thisTime }}</div>
+          <div class="week">{{ time.week }}</div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 <script>
 import envConfig from '@/config';
 export default {
-    name: 'vheader',
-    data() {
-        return {
-            name: '',
-            envConfig: envConfig,
-            tagTableArr: ['指挥调度', '社区资产', '产业招商', '运营服务', '财务分析', '视频监控'],
-            tagTabIndex: 0,
-            time: {
-                thisTime: '2000/01/01',
-                week: '星期一',
-                date: '00:00:00'
-            },
-            communityList: [],
-            communityId: ''
-        };
-    },
-    computed: {
-        cruUserInfo() {
-            return this.$store.getters['getCruUserInfo'];
+  name: 'vheader',
+  data () {
+    return {
+      name: '',
+      envConfig: envConfig,
+      tagTableArr: ['指挥调度', '社区资产', '产业招商', '运营服务', '财务分析', '视频监控'],
+      tagTabIndex: 0,
+      time: {
+        thisTime: '2000/01/01',
+        week: '星期一',
+        date: '00:00:00'
+      },
+      communityList: [],
+      communityId: ''
+    };
+  },
+  computed: {
+    cruUserInfo () {
+      return this.$store.getters['getCruUserInfo'];
+    }
+  },
+  methods: {
+    getUserInfo () {
+      this.$http.postForm('/sc-user-center/user/findLoginUserById').then(({ status, data, msg }) => {
+        if (status === 0) {
+          this.$store.commit('setcCruUserInfo', data);
+        } else {
+          this.$message.error('获取用户信息失败');
         }
+      });
     },
-    methods: {
-        getUserInfo() {
-            this.$http.postForm('/sc-user-center/user/findLoginUserById').then(({ status, data, msg }) => {
-                if (status === 0) {
-                    this.$store.commit('setcCruUserInfo', data);
-                } else {
-                    this.$message.error('获取用户信息失败');
-                }
-            });
-        },
-        // 退出登录
-        logOut() {
-            var access_token = localStorage.getItem('SC_token');
-            this.$http.postForm('/sc-user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
-                if (0 === status) {
-                    this.$message({
-                        type: 'success',
-                        message: '您已退出登录'
-                    });
-                    localStorage.removeItem('SC_token');
-                    sessionStorage.removeItem('SC_listMuen');
-                    this.$store.commit('setloginInfo', '');
-                    this.$store.dispatch('tags', []);
+    // 退出登录
+    logOut () {
+      var access_token = localStorage.getItem('SC_token');
+      this.$http.postForm('/sc-user-auth/user/logout', { access_token: access_token }).then(({ status, data, msg }) => {
+        if (0 === status) {
+          this.$message({
+            type: 'success',
+            message: '您已退出登录'
+          });
+          localStorage.removeItem('SC_token');
+          sessionStorage.removeItem('SC_listMuen');
+          this.$store.commit('setloginInfo', '');
+          this.$store.dispatch('tags', []);
 
-                    sessionStorage.removeItem('tabs');
-                    window.location.href = this.envConfig.loginUrl;
-                } else {
-                    this.$message.error(msg);
-                }
-            });
-        },
-        getTime() {
-            this.time.date = this.$moment().format('HH:mm:ss');
-            this.time.week = this.$moment().format('dddd');
-            this.time.thisTime = this.$moment().format('YYYY/MM/DD');
-        },
-        communityNameList() {
-            this.$http.get('/sc-community/assets/community/list').then(({ data, msg, status }) => {
-                if (status == 0) {
-                    this.communityList = data;
-                    this.communityId = data[0].id;
-                    this.$store.commit('setHomeCommunityAll', this.communityId);
-                    this.$store.commit('setAreaSelect', data);
-                }
-            });
-        },
-        selectTab(index) {
-            this.tagTabIndex = index;
+          sessionStorage.removeItem('tabs');
+          window.location.href = this.envConfig.loginUrl;
+        } else {
+          this.$message.error(msg);
+        }
+      });
+    },
+    getTime () {
+      this.time.date = this.$moment().format('HH:mm:ss');
+      this.time.week = this.$moment().format('dddd');
+      this.time.thisTime = this.$moment().format('YYYY/MM/DD');
+    },
+    communityNameList () {
+      this.$http.get('/sc-community/assets/community/list').then(({ data, msg, status }) => {
+        if (status == 0) {
+          this.communityList = data;
+          this.communityId = data[0].id;
+          this.$store.commit('setHomeCommunityAll', this.communityId);
+          this.$store.commit('setAreaSelect', data);
         }
+      });
     },
-    mounted() {},
-    created() {
-        setInterval(() => {
-            this.getTime();
-        }, 1000);
-        this.getUserInfo();
-        this.communityNameList();
+    selectTab (index) {
+      this.tagTabIndex = index;
+      if (index == 0) {
+        this.$router.push('/homeIndex')
+      } else if (index == 1) {
+        this.$router.push('/communityAssets')
+      }
     }
+  },
+  mounted () { },
+  created () {
+    setInterval(() => {
+      this.getTime();
+    }, 1000);
+    this.getUserInfo();
+    this.communityNameList();
+  }
 };
 </script>
 <style lang='scss' scoped>

commandCenter/src/router/index.js

@@ -10,7 +10,7 @@ const quietRoute = [
     {
         path: '/',
         component: () => import(/* webpackChunkName: "404" */ '@/components/common/Home.vue'),
-        redirect:"/homeIndex",
+        redirect: '/homeIndex',
         children: [
             {
                 path: '/homeIndex',
@@ -18,6 +18,12 @@ const quietRoute = [
                 component: () => import(/* webpackChunkName: "404" */ '@views/commandDispatch/index.vue'),
                 meta: { title: 'homeIndex' }
             },
+            {
+                path: '/communityAssets',
+                name: 'communityAssets',
+                component: () => import(/* webpackChunkName: "404" */ '@views/communityAssets/index.vue'),
+                meta: { title: 'communityAssets' }
+            },
             {
                 path: '/403',
                 component: () => import(/* webpackChunkName: "404" */ '@views/errorPage/403.vue'),
@@ -27,14 +33,14 @@ const quietRoute = [
                 path: '/404',
                 component: () => import(/* webpackChunkName: "404" */ '@views/errorPage/404.vue'),
                 meta: { title: '404' }
-            },
-        ],
+            }
+        ]
     },
     {
         path: '*',
         redirect: '/404'
     }
-]
+];
 export default new Router({
     mode: 'history',
     base: process.env.BASE_URL,

commandCenter/src/views/commandDispatch/index.vue

@@ -1,234 +1,281 @@
 <template>
-    <div class="index-content">
-        <div
-            class="img-content"
-            :class="{ mouseStyle: openCur == 1 }"
-            ref="divImg"
-            :style="`backgroundImage:url(${imgUrl});backgroundSize: 100% 100%;`"
-            @click="openCur == 1 ? paintingPoint($event) : null"
-        ></div>
-        <div class="point" :style="`left:${item.xcoordinate}%;top:${item.ycoordinate}%`" v-for="(item, index) in points" :key="index">
-            <span class="point-type" :class="`point-type${item.deviceType}`" @click="openCur !== 2 ? togglePop(item) : null"></span>
-            <span class="textStyle">{{ item.deviceName }}</span>
-            <span class="pointClose" @click="pointClose(item)" v-if="openCur == 2">x</span>
-        </div>
-        <div class="index-content-left" v-if="showChart">
-            <last-month-alarm></last-month-alarm>
-            <alarm-trend-analysis></alarm-trend-analysis>
-            <proportion-of-alarm-types></proportion-of-alarm-types>
-            <work-order-processing-status></work-order-processing-status>
-        </div>
-        <div class="index-content-right-buttom" @click="toggleShow"><span></span>{{ !showChart ? '显示' : '隐藏' }}图表</div>
-        <div class="index-dotting-list" :class="showChart ? '' : 'showChart'">
-            <div class="list-type" @click="addPoint()" :class="{ thisDotting: openCur == 1 }">
-                <span class="zoniot_font zoniot-icon-tianjia1"></span>添加
-            </div>
-            <div class="list-type" @click="editPoint" :class="{ thisDotting: openCur == 2 }">
-                <span class="zoniot_font zoniot-icon-bianji3"></span>编辑
-            </div>
-            <!-- <div class="list-type" @click="submitPoint" :class="{ thisDotting: openCur == 3 }">
+  <div class="index-content">
+    <div
+      class="img-content"
+      :class="{ mouseStyle: openCur == 1 }"
+      ref="divImg"
+      :style="`backgroundImage:url(${imgUrl});backgroundSize: 100% 100%;`"
+      @click="openCur == 1 ? paintingPoint($event) : null"
+    ></div>
+    <div
+      class="point"
+      :style="`left:${item.xcoordinate}%;top:${item.ycoordinate}%`"
+      v-for="(item, index) in points"
+      :key="index"
+    >
+      <span
+        class="point-type"
+        :class="`point-type${item.deviceType}`"
+        @click="openCur !== 2 ? togglePop(item) : null"
+      ></span>
+      <span class="textStyle">{{ item.deviceName }}</span>
+      <span
+        class="pointClose"
+        @click="pointClose(item)"
+        v-if="openCur == 2"
+      >x</span>
+    </div>
+    <div
+      class="index-content-left"
+      v-if="showChart"
+    >
+      <last-month-alarm></last-month-alarm>
+      <alarm-trend-analysis></alarm-trend-analysis>
+      <proportion-of-alarm-types></proportion-of-alarm-types>
+      <work-order-processing-status></work-order-processing-status>
+    </div>
+    <div
+      class="index-content-right-buttom"
+      @click="toggleShow"
+    ><span></span>{{ !showChart ? '显示' : '隐藏' }}图表</div>
+    <div
+      class="index-dotting-list"
+      :class="showChart ? '' : 'showChart'"
+    >
+      <div
+        class="list-type"
+        @click="addPoint()"
+        :class="{ thisDotting: openCur == 1 }"
+      >
+        <span class="zoniot_font zoniot-icon-tianjia1"></span>添加
+      </div>
+      <div
+        class="list-type"
+        @click="editPoint"
+        :class="{ thisDotting: openCur == 2 }"
+      >
+        <span class="zoniot_font zoniot-icon-bianji3"></span>编辑
+      </div>
+      <!-- <div class="list-type" @click="submitPoint" :class="{ thisDotting: openCur == 3 }">
                 <span class="zoniot_font zoniot-icon-baocun"></span>保存
             </div> -->
-        </div>
-        <div class="rightFloatType" :class="showChart ? '' : 'showChart'">
-            <el-checkbox-group v-model="showPointArr">
-                <el-checkbox :class="'typeIcon' + items.type" v-for="items in deviceArr" :label="items.type" :key="items.type">{{
+    </div>
+    <div
+      class="rightFloatType"
+      :class="showChart ? '' : 'showChart'"
+    >
+      <el-checkbox-group v-model="showPointArr">
+        <el-checkbox
+          :class="'typeIcon' + items.type"
+          v-for="items in deviceArr"
+          :label="items.type"
+          :key="items.type"
+        >{{
                     items.label
                 }}</el-checkbox>
-            </el-checkbox-group>
-        </div>
-        <div class="index-content-right" v-if="showChart">
-            <water-consumption></water-consumption>
-            <power-consumption></power-consumption>
-            <patrol-task-completion-rate></patrol-task-completion-rate>
-            <key-areas></key-areas>
-        </div>
-        <div class="index-content-buttom" v-if="showChart">
-            <passenger-flow-statistics></passenger-flow-statistics>
-        </div>
-        <modular-loading :loadding="false" tipsText="地图加载中"></modular-loading>
+      </el-checkbox-group>
+    </div>
+    <div
+      class="index-content-right"
+      v-if="showChart"
+    >
+      <water-consumption></water-consumption>
+      <power-consumption></power-consumption>
+      <patrol-task-completion-rate></patrol-task-completion-rate>
+      <key-areas></key-areas>
     </div>
+    <div
+      class="index-content-buttom"
+      v-if="showChart"
+    >
+      <passenger-flow-statistics></passenger-flow-statistics>
+    </div>
+    <modular-loading
+      :loadding="false"
+      tipsText="地图加载中"
+    ></modular-loading>
+  </div>
 </template>
 
 <script>
 import smallModuleIndex from '@views/smallModule/index.js';
 import { mapState } from 'vuex';
 export default {
-    mixins: [smallModuleIndex],
-    data() {
-        return {
-            showChart: true,
-            loadding: true,
-            openCur: null,
-            deviceArr: [
-                {
-                    type: 1,
-                    label: '摄像头'
-                },
-                {
-                    type: 2,
-                    label: '门禁机'
-                },
-                {
-                    type: 3,
-                    label: '停车道闸'
-                },
-                {
-                    type: 4,
-                    label: '水表'
-                },
-                {
-                    type: 5,
-                    label: '电表'
-                }
-            ],
-            mixins_query: {
-                communityId: ''
-            },
-            showPointArr: [1, 2, 3, 4, 5],
-            point: [],
-            imgUrl: require('@/assets/img/homeIcon/bg_bottom.png')
-        };
-    },
-    computed: {
-        ...mapState(['homeCommunityAll']),
-        points() {
-            let showArr = [];
-            this.point.map((item) => {
-                if (this.showPointArr.includes(item.deviceType)) {
-                    showArr.push(item);
-                }
-            });
-            return showArr;
-        }
-    },
-    watch: {
-        //全局社区接口调用
-        homeCommunityAll(val) {
-            try {
-                this.mixins_query.communityId = val;
-                this.getData();
-            } catch {}
-        }
-    },
-    methods: {
-        addPoint() {
-            if (this.openCur == 1) {
-                this.openCur = null;
-            } else {
-                this.openCur = 1;
-            }
-        },
-        editPoint() {
-            if (this.openCur == 2) {
-                this.openCur = null;
-            } else {
-                this.openCur = 2;
-            }
-        },
-        submitPoint() {
-            this.openCur = 3;
-        },
-        togglePop(row) {
-            let url = '',
-                width = '2.89rem',
-                height = '2.25rem',
-                showHide = false;
-
-            if (row.deviceType == 1) {
-                url = 'typeCamera';
-            } else if (row.deviceType == 2) {
-                url = 'typeAccessControl';
-            } else if (row.deviceType == 3) {
-                url = 'typeCard';
-                showHide = true;
-            } else if (row.deviceType == 4) {
-                url = 'typeHydropower';
-                height = '2.65rem';
-            } else if (row.deviceType == 5) {
-                url = 'typeHydropower';
-                height = '1.2rem';
-            }
-            new Promise((resolve) => {
-                this.$store.dispatch('addPopup', {
-                    url: `/commandDispatch/pop/${url}.vue`,
-                    title: row.deviceName,
-                    notip: true,
-                    width: width,
-                    height: height,
-                    fullscreen: false,
-                    showFooter: true,
-                    showAlarm: true,
-                    showHide: showHide,
-                    props: {
-                        row,
-                        callback: resolve
-                    }
-                });
-            }).then(() => {});
+  mixins: [smallModuleIndex],
+  data () {
+    return {
+      showChart: true,
+      loadding: true,
+      openCur: null,
+      deviceArr: [
+        {
+          type: 1,
+          label: '摄像头'
         },
-        paintingPoint(e) {
-            let width = window.getComputedStyle(this.$refs.divImg).width.replace(/px/, ''),
-                height = window.getComputedStyle(this.$refs.divImg).height.replace(/px/, '');
-            let pointObj = {
-                xcoordinate: Number(((e.x / width) * 100).toFixed(6)),
-                ycoordinate: Number(((e.y / height) * 100).toFixed(6))
-            };
-            new Promise((resolve) => {
-                this.$store.dispatch('addPopup', {
-                    url: '/commandDispatch/pop/dottingEquipment.vue',
-                    title: '添加设备',
-                    notip: true,
-                    width: '3.89rem',
-                    height: '2.25rem',
-                    props: {
-                        pointObj,
-                        deviceArr: this.deviceArr,
-                        callback: resolve
-                    }
-                });
-            }).then(() => {
-                this.getData();
-            });
+        {
+          type: 2,
+          label: '门禁机'
         },
-        pointClose(item) {
-            this.$msgBox(`删除`, '删除后将无法恢复，请问是否继续?')
-                .then(() => {
-                    this.$http.get('/sc-community/community/layer/delete', { id: item.id }).then(({ status, data, msg }) => {
-                        if (0 === status) {
-                            this.$message({
-                                type: 'success',
-                                message: '删除成功!'
-                            });
-                            this.getData();
-                        }
-                    });
-                })
-                .catch(() => {});
+        {
+          type: 3,
+          label: '停车道闸'
         },
-        toggleShow() {
-            this.showChart = !this.showChart;
+        {
+          type: 4,
+          label: '水表'
         },
-        getData() {
-            this.$http
-                .post('/sc-community/community/layer/list', this.mixins_query)
-                .then(({ status, data, msg }) => {
-                    if (status == 0 && !!data) {
-                        this.point = data;
-                    } else {
-                        this.$message.error(msg);
-                    }
-                    loading.close();
-                })
-                .catch(() => {});
+        {
+          type: 5,
+          label: '电表'
         }
+      ],
+      mixins_query: {
+        communityId: ''
+      },
+      showPointArr: [1, 2, 3, 4, 5],
+      point: [],
+      imgUrl: require('@/assets/img/homeIcon/bg_bottom.png')
+    };
+  },
+  computed: {
+    ...mapState(['homeCommunityAll']),
+    points () {
+      let showArr = [];
+      this.point.map((item) => {
+        if (this.showPointArr.includes(item.deviceType)) {
+          showArr.push(item);
+        }
+      });
+      return showArr;
+    }
+  },
+  watch: {
+    //全局社区接口调用
+    homeCommunityAll (val) {
+      try {
+        this.mixins_query.communityId = val;
+        this.getData();
+      } catch { }
+    }
+  },
+  methods: {
+    addPoint () {
+      if (this.openCur == 1) {
+        this.openCur = null;
+      } else {
+        this.openCur = 1;
+      }
+    },
+    editPoint () {
+      if (this.openCur == 2) {
+        this.openCur = null;
+      } else {
+        this.openCur = 2;
+      }
     },
+    submitPoint () {
+      this.openCur = 3;
+    },
+    togglePop (row) {
+      let url = '',
+        width = '2.89rem',
+        height = '2.25rem',
+        showHide = false;
 
-    created() {
-        if (!!this.mixins_query.communityId) {
-            this.getData();
-        }
+      if (row.deviceType == 1) {
+        url = 'typeCamera';
+      } else if (row.deviceType == 2) {
+        url = 'typeAccessControl';
+      } else if (row.deviceType == 3) {
+        url = 'typeCard';
+        showHide = true;
+      } else if (row.deviceType == 4) {
+        url = 'typeHydropower';
+        height = '2.65rem';
+      } else if (row.deviceType == 5) {
+        url = 'typeHydropower';
+        height = '1.2rem';
+      }
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: `/commandDispatch/pop/${url}.vue`,
+          title: row.deviceName,
+          notip: true,
+          width: width,
+          height: height,
+          fullscreen: false,
+          showFooter: true,
+          showAlarm: true,
+          showHide: showHide,
+          props: {
+            row,
+            callback: resolve
+          }
+        });
+      }).then(() => { });
+    },
+    paintingPoint (e) {
+      let width = window.getComputedStyle(this.$refs.divImg).width.replace(/px/, ''),
+        height = window.getComputedStyle(this.$refs.divImg).height.replace(/px/, '');
+      let pointObj = {
+        xcoordinate: Number(((e.x / width) * 100).toFixed(6)),
+        ycoordinate: Number(((e.y / height) * 100).toFixed(6))
+      };
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: '/commandDispatch/pop/dottingEquipment.vue',
+          title: '添加设备',
+          notip: true,
+          width: '3.89rem',
+          height: '2.25rem',
+          props: {
+            pointObj,
+            deviceArr: this.deviceArr,
+            callback: resolve
+          }
+        });
+      }).then(() => {
+        this.getData();
+      });
+    },
+    pointClose (item) {
+      this.$msgBox(`删除`, '删除后将无法恢复，请问是否继续?')
+        .then(() => {
+          this.$http.get('/sc-community/community/layer/delete', { id: item.id }).then(({ status, data, msg }) => {
+            if (0 === status) {
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              });
+              this.getData();
+            }
+          });
+        })
+        .catch(() => { });
+    },
+    toggleShow () {
+      this.showChart = !this.showChart;
+    },
+    getData () {
+      this.$http
+        .post('/sc-community/community/layer/list', this.mixins_query)
+        .then(({ status, data, msg }) => {
+          if (status == 0 && !!data) {
+            this.point = data;
+          } else {
+            this.$message.error(msg);
+          }
+          loading.close();
+        })
+        .catch(() => { });
+    }
+  },
+
+  created () {
+    if (!!this.mixins_query.communityId) {
+      this.getData();
     }
+  }
 };
 </script>
 <style lang="scss" scoped>

commandCenter/src/views/communityAssets/index.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="index-content">
+    <div class="contentShow">
+      <div class="index-community list_1-1_2-2"></div>
+      <div class="index-house"></div>
+      <div class="index-household"></div>
+
+      <div class="index-household pad_top"></div>
+      <div class="index-gender pad_top"></div>
+      <div class="index-equipment list_2-3_2-2 pad_top mar_left"></div>
+
+      <div class="index-trend list_3-1_3-2 pad_top"></div>
+      <div class="index-giveAlarm list_3-3_3-2 pad_top mar_left"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+</script>
+
+
+<style lang="scss" scoped>
+@import '@assets/css/public-style.scss';
+@import '@views/communityAssets/style.scss';
+
+@import '@assets/css/public-style.scss';
+$BackColor: #171f32;
+.list_border {
+    border: 1px solid $BackColor;
+    border-radius: 4px;
+}
+.mr10 {
+    margin: rem(10);
+}
+@mixin moveHover {
+    box-shadow: inset 0px 1px 50px 0px rgba(14, 174, 255, 0.5);
+    border: 1px dashed #1396dc;
+}
+.moveHover {
+    box-shadow: inset 0px 1px 50px 0px rgba(14, 174, 255, 0.5);
+    border: 1px dashed #1396dc;
+}
+
+.contentShow {
+    width: 100%;
+    height: calc(100% - 90px);
+    border-radius: 4px;
+    padding: 20px;
+    display: grid;
+    grid-template-columns: 2fr 2fr 2fr 2fr;
+    grid-template-rows: 1fr 1fr 1fr;
+    gap: 0px;
+    position: absolute;
+    top: 90px;
+}
+.list_1-1_2-2 {
+    grid-area: 1/1 / span 1 / span 2;
+    background: #171f32;
+    // height: 303px;
+    border-radius: 4px;
+}
+.index-house {
+    // height: 303px;
+    background: #171f32;
+    margin: 0 20px;
+    border-radius: 4px;
+}
+.index-household {
+    // height: 303px;
+    background: #171f32;
+    border-radius: 4px;
+}
+.index-gender {
+    // height: 303px;
+    background: #171f32;
+    margin-left: 20px;
+    border-radius: 4px;
+}
+.list_2-3_2-2 {
+    grid-area: 2/3 / span 1 / span 2;
+    background: #171f32;
+    // height: 303px;
+    border-radius: 4px;
+}
+.pad_top {
+    margin-top: 20px;
+}
+.mar_left {
+    margin-left: 20px;
+}
+
+.list_3-1_3-2 {
+    grid-area: 3/1 / span 3 / span 2;
+    background: #171f32;
+    border-radius: 4px;
+}
+.list_3-3_3-2 {
+    grid-area: 3/3 / span 3 / span 2;
+    background: #171f32;
+    border-radius: 4px;
+}
+</style>

commandCenter/src/views/communityAssets/style.css

@@ -0,0 +1 @@
+.index-content{height:100%;width:100%;position:relative;overflow-y:auto;min-height:800px}

commandCenter/src/views/communityAssets/style.scss

@@ -0,0 +1,8 @@
+$name: index-content;
+.#{$name} {
+    height: 100%;
+    width: 100%;
+    position: relative;
+    overflow-y: auto;
+    min-height: 800px;
+}

operationSupport/src/views/newWorkBench/components/workbenchMent/paidAnalysis.vue

@@ -5,10 +5,10 @@
         <div class="model-title-text">实收分析</div>
         <div class="model-title-right">
           <el-date-picker
-            value-format="yyyy-MM"
+            value-format="yyyy"
             v-model="date"
-            type="month"
-            placeholder="选择月"
+            type="year"
+            placeholder="选择年"
             class="saveColumn-select"
             @change="changeTime"
             :clearable="false"
@@ -72,7 +72,8 @@ export default {
       clientOptions: discountedChart('(元)', dataDay, dataArr),
       mixins_query: {
         communityId: '',
-        date: '',
+        endTime: '',
+        startTime: '',
         chargeType: ''
       },
       date: '',
@@ -105,42 +106,38 @@ export default {
     };
   },
   created () {
-    this.mixins_query.date = this.$moment().format('YYYY-MM') + '-01';
-    this.date = this.$moment().format('YYYY-MM');
+
+    this.mixins_query.endTime = this.$moment().format('YYYY');
+    this.mixins_query.startTime = this.$moment().format('YYYY');
+    this.date = this.$moment().format('YYYY');
     this.getData();
   },
   methods: {
     getData () {
       this.$http
-        .get('/sc-community/statisticActuallyReceived', this.mixins_query)
+        .post('/sc-charge/charge/report/total/month', this.mixins_query)
         .then(({ status, data, msg }) => {
           debugger
           if (status == 0) {
-            let date = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
-            let dateRes = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
             let dateTime = [];
+            // let dateTimes = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
             let dateTimes = [];
+            let dateRes = [];
             for (let i = 0; i < data.length; i++) {
-              for (let k = i; k < date.length; k++) {
-                if ((data[i].date.substr(5, 1) == '0' ? data[i].date.substr(6) : data[i].date.substr(5)) == date[k]) {
-                  dateTime.push(date[k])
-                  dateRes[k] = data[i].receivedAmount
-                }
-                dateTime.push(date[k])
-              }
+              dateTime.push(data[i].months)
+              dateRes.push(data[i].totalAmount)
             }
-            dateTime = Array.from(new Set(dateTime))
             for (let j = 0; j < dateTime.length; j++) {
               dateTimes.push(dateTime[j] + '月')
             }
             this.clientOptions = discountedChart('(元)', dateTimes, dateRes);
-
           }
         })
         .catch((err) => { });
     },
     changeTime (v) {
-      this.mixins_query.date = v + '-01';
+      this.mixins_query.endTime = v;
+      this.mixins_query.startTime = v;
       this.getData();
     },
   }