guanqb
2022-11-11 46547b5fe6fae9224007fc0a9e8f3b0557f3880b
Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
1 files modified
55 ■■■■ changed files
src/views/home/components/rightContainer.vue 55 ●●●● patch | view | raw | blame | history
src/views/home/components/rightContainer.vue
@@ -4,16 +4,9 @@
            <div class="title">
                案件统计
                <div class="timer">
                    <el-date-picker
                        v-model="eventTime"
                        type="daterange"
                        align="right"
                        unlink-panels
                        range-separator="至"
                        start-placeholder="开始日期"
                        end-placeholder="结束日期"
                        :picker-options="pickerOptions"
                    ></el-date-picker>
                    <el-date-picker v-model="eventTime" type="daterange" align="right" unlink-panels range-separator="至"
                        start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
                    </el-date-picker>
                </div>
            </div>
            <div id="EventChangeEcharts" class="echarts-box"></div>
@@ -21,28 +14,15 @@
        <div class="alert-box">
            <div class="title">
                <span style="margin-right:130px">安保活动</span>
                <span
                    class="activity"
                    :class="{ choosed: acttype == 0 }"
                    @click="actTabClick(0)"
                >正在进行</span>
                <span class="activity" :class="{ choosed: acttype == 0 }" @click="actTabClick(0)">正在进行</span>
                <span>/</span>
                <span
                    class="activity"
                    :class="{ choosed: acttype == 1 }"
                    @click="actTabClick(1)"
                >历史活动</span>
                <span class="activity" :class="{ choosed: acttype == 1 }" @click="actTabClick(1)">历史活动</span>
            </div>
            <div id="peopleList" class="echarts-box">
                <el-table
                    :data="acttype == 0 ? underwayArr : historyArr"
                    style="width: 100%"
                <el-table :data="acttype == 0 ? underwayArr : historyArr" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                    :row-class-name="tableRowClassName"
                    ref="activityTable"
                    @row-click="activityRowClick"
                >
                    :row-class-name="tableRowClassName" ref="activityTable" @row-click="activityRowClick">
                    <el-table-column prop="activityName" label="活动名称" width="100"></el-table-column>
                    <el-table-column prop="startTime" label="开始时间" width="100"></el-table-column>
                    <el-table-column prop="endTime" label="结束时间" width="100"></el-table-column>
@@ -53,19 +33,11 @@
        <div class="crowd-box">
            <div class="title">
                <span style="margin-right:130px">现有设备</span>
                <span
                    class="equiment"
                    :class="{ choosed: linetype == 0 }"
                    @click="lineTabClick(0)"
                >在线设备</span>
                <span class="equiment" :class="{ choosed: linetype == 0 }" @click="lineTabClick(0)">在线设备</span>
                <span>/</span>
                <span
                    class="activity"
                    :class="{ choosed: linetype == 1 }"
                    @click="lineTabClick(1)"
                >离线设备</span>
                <span class="activity" :class="{ choosed: linetype == 1 }" @click="lineTabClick(1)">离线设备</span>
            </div>
            <div id="EquipmentEcharts" class="echarts-box"></div>
            <div style="overflow: hidden;" id="EquipmentEcharts" class="echarts-box"></div>
        </div>
    </div>
</template>
@@ -163,7 +135,8 @@
        initEquipmentOptions (dataArr) {
            return {
                tooltip: {
                    trigger: 'item'
                    trigger: 'item',
                    confine: true
                },
                legend: {
                    left: '60%',
@@ -581,7 +554,7 @@
                border: 1px solid rgba(20, 50, 123, 1);
                cursor: pointer;
                & > div {
                &>div {
                    height: 26px;
                    line-height: 26px;
                }
@@ -596,7 +569,7 @@
            flex: 1;
        }
        .sub-tab + .echarts-box {
        .sub-tab+.echarts-box {
            margin-top: 10px;
        }