whychdw
2020-10-19 cecaef14bbd8d4e1f63415b0aa5c53a9c6330e01
表格样式修改
18个文件已修改
116 ■■■■■ 已修改文件
package.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/common.css 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/css/theme/science-blue.css 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/js/realTime.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/batterypaSetting.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/batteryrHistoryquery.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/batteryrTimequery.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/deviceHistoryquery.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/deviceTimequery.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/devicepaSetting.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataMager/btsStatus.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataMager/dischargeTest.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataMager/historyInfoMager.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/realTime.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/jobManage/planManage.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/userMager/operationRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/userMager/userInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目需求.md 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -1,6 +1,6 @@
{
  "name": "admin_manage",
  "version": "2.1.1",
  "version": "2.1.2",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --mode dev",
src/assets/css/common.css
@@ -44,14 +44,14 @@
}
.filter-box-table {
    box-sizing: border-box;
    border-top: 1px solid #675e5e;
    border-right: 1px solid #675e5e;
    border-left: 1px solid #675e5e;
    border-top: 1px solid #4ba1fa;
    border-right: 1px solid #4ba1fa;
    border-left: 1px solid #4ba1fa;
}
.filter-box-table .table-cell {
    padding-top: 6px;
    padding-bottom: 6px;
    border-bottom: 1px solid #675e5e;
    border-bottom: 1px solid #4ba1fa;
}
.filter-box-table .table-cell {
    box-sizing: border-box;
src/assets/css/theme/science-blue.css
@@ -189,10 +189,11 @@
    background: none;
}
.el-science-blue .el-table th{
    background-image: linear-gradient(#62b0fa, #3497f3, #1660B9);
    background: none;
}
.el-science-blue .el-table thead {
    color: #FFFFFF;
    color: #d3ac6d;
    font-weight: bold;
}
.el-science-blue .el-table--enable-row-hover .el-table__body tr:hover>td,
.el-science-blue .el-table__body tr.hover-row>td {
@@ -201,7 +202,16 @@
.el-science-blue .el-table__fixed-right {
    background-color: #1d4a77;
}
.el-science-blue .el-table th.is-leaf {
    border-bottom: none;
}
.el-science-blue .el-table td {
    border-bottom: none;
    background: #0b388a;
}
.el-science-blue .el-table--striped .el-table__body tr.el-table__row--striped td {
    background: none;
}
/* el-popover */
.el-popover {
    padding: 0;
src/assets/js/realTime.js
@@ -179,4 +179,21 @@
        data: "json=" + JSON.stringify(searchParams)
    });
}
/**
 * èŽ·å–è®¾å¤‡çš„é€†å˜ä¿¡æ¯
 * @param dev_id    è®¾å¤‡id
 * @returns {AxiosPromise} è¿”回结果
 */
export const inversionInfo = (dev_id) => {
    // æž„造查询条件
    let params = {
        dev_id: dev_id,
    };
    // æŸ¥è¯¢åŽå°
    return axios({
        method: "post",
        url: "Fbs9100s_nibian_stateAction_action_serchByCondition",
        data: "json=" + JSON.stringify(params)
    });
}
src/pages/alarmMager/batterypaSetting.vue
@@ -1,7 +1,7 @@
<template>
    <flex-layout>
        <div class="table-layout filter-box-table flex-page-content">
            <el-table ref="tableBox" border size="mini" header-row-class-name="header-primary" height="100%" :data="userList"
            <el-table ref="tableBox" stripe size="mini" header-row-class-name="header-primary" height="100%" :data="userList"
             :style="{width: w}">
                <el-table-column prop="UDepartment" :width="80" align="center" label="编号"></el-table-column>
                <el-table-column prop="UName" :min-width="220" align="center" label="告警名称"></el-table-column>
src/pages/alarmMager/batteryrHistoryquery.vue
@@ -99,7 +99,7 @@
        <!-- è¡¨å• -->
        <div class="flex-page-content">
            <div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
                <el-table border size="small" :data="table.datas" height="100%" class="tableCent" ref="goodsDetailTable">
                <el-table stripe size="small" :data="table.datas" height="100%" class="tableCent" ref="goodsDetailTable">
                    <el-table-column v-for="header in table.headers" :key="header.prop" :prop="header.prop" :label="header.label"
                     :width="header.width" align="center"></el-table-column>
                    <el-table-column label="确认告警" width="86% " align="center">
@@ -560,7 +560,7 @@
    /* æ¡ä»¶é€‰æ‹© */
    .condiOpt {
        width: 100%;
        border: 1px solid #675e5e;
        border: 1px solid #4ba1fa;
        .trTitle {
            height: 35px;
src/pages/alarmMager/batteryrTimequery.vue
@@ -118,7 +118,7 @@
        </div>
        <!-- è¡¨å• -->
        <div class="flex-page-content">
            <el-table border size="small" :data="table.datas" height="100%" class="tableCent">
            <el-table stripe size="small" :data="table.datas" height="100%" class="tableCent">
                <el-table-column v-for="header in table.headers" :key="header.prop" :prop="header.prop" :label="header.label"
                 :width="header.width" :min-width="header.minWidth" align="center"></el-table-column>
                <el-table-column label="确认告警" align="center" :width="80">
@@ -622,7 +622,7 @@
    .condiOpt {
        width: 100%;
        border: 1px solid #675e5e;
        border: 1px solid #4ba1fa;
        .trTitle {
            height: 35px;
src/pages/alarmMager/deviceHistoryquery.vue
@@ -9,6 +9,7 @@
            @change="changeSelect1"
            :placeholder="this.selectPlace1"
            class="weihu"
            size="small"
          >
            <el-option
              v-for="item in devss"
@@ -20,7 +21,7 @@
        </div>
        <div class="table-cell text-right">机房名称:</div>
        <div class="table-cell">
            <el-select v-model="selectValue2"  class="rooms" @change="alramData">
            <el-select v-model="selectValue2"  class="rooms" @change="alramData" size="small">
              <el-option
                  v-for="item in opt"
                  :key="item.value"
@@ -38,7 +39,7 @@
    </div>
    <!-- è¡¨å• -->
    <div class="flex-page-content">
      <el-table border size="small" :data="table.datas" height="100%" class="tableCent">
      <el-table stripe size="small" :data="table.datas" height="100%" class="tableCent">
        <el-table-column
          v-for="header in table.headers"
          :key="header.prop"
src/pages/alarmMager/deviceTimequery.vue
@@ -9,6 +9,7 @@
              @change="changeSelect1"
              :placeholder="this.selectPlace1"
              class="weihu"
              size="small"
            >
              <el-option
                v-for="item in newDevie"
@@ -20,7 +21,7 @@
          </div>
          <div class="table-cell text-right">机房名称:</div>
          <div class="table-cell">
              <el-select v-model="selectValue2" @change="alarmDev" class="rooms">
              <el-select v-model="selectValue2" @change="alarmDev" class="rooms" size="small">
                <el-option
                    v-for="item in sesionsNews"
                    :key="item.value"
@@ -31,7 +32,7 @@
          </div>
          <div class="table-cell text-right">告警类型:</div>
          <div class="table-cell">
              <el-select placeholder="全部" class="dainchi" v-model="value">
              <el-select placeholder="全部" class="dainchi" v-model="value" size="small">
                <el-option
                    v-for="item in options"
                    :key="item.value"
@@ -44,7 +45,7 @@
    </div>
    <!-- è¡¨å• -->
    <div class="flex-page-content">
      <el-table border size="small" :data="table.datas" height="100%">
      <el-table stripe size="small" :data="table.datas" height="100%">
        <el-table-column
          v-for="header in table.headers"
          :key="header.prop"
src/pages/alarmMager/devicepaSetting.vue
@@ -6,13 +6,13 @@
                <div class="table-row">
                    <div class="table-cell text-right">设备</div>
                    <div class="table-cell">
                        <el-select :placeholder="selectPlace1" class="rooms" v-model="selectValue1" @change="sears">
                        <el-select :placeholder="selectPlace1" class="rooms" v-model="selectValue1" @change="sears" size="small">
                            <el-option v-for="item in sesionsNews" :key="item.value" :label="item.label" :value="item.id"></el-option>
                        </el-select>
                    </div>
                    <div class="table-cell text-right">告警名称</div>
                    <div class="table-cell">
                        <el-select placeholder="全部(共9种)" class="dainchi" v-model="valueAlam" @change="sears">
                        <el-select placeholder="全部(共9种)" class="dainchi" v-model="valueAlam" @change="sears" size="small">
                            <el-option v-for="item in devAranam" :key="item.value" :label="item.label" :value="item.value"></el-option>
                        </el-select>
                    </div>
@@ -22,7 +22,7 @@
        <!-- å†…容 -->
        <div class="flex-page-content aa">
            <el-table ref="tableBox" border size="mini" header-row-class-name="header-primary" height="100%" :data="userList"
            <el-table ref="tableBox" stripe size="mini" header-row-class-name="header-primary" height="100%" :data="userList"
             :style="{width: w}">
                <el-table-column prop="UDepartment" :min-width="240" align="center" label="设备"></el-table-column>
                <el-table-column prop="UName" :min-width="220" align="center" label="告警名称"></el-table-column>
src/pages/dataMager/btsStatus.vue
@@ -32,7 +32,7 @@
      </div>
      <div class="flex-page-content">
          <!-- è¡¨å• -->
          <el-table border size="small" :data="dataList" height="100%" class="tableCent">
          <el-table stripe size="small" :data="dataList" height="100%" class="tableCent">
            <el-table-column prop="stationName" align="center" label="机房名称"></el-table-column>
            <el-table-column prop="dev_id" align="center" label="设备ID"></el-table-column>
            <el-table-column prop="deviceName" align="center" label="设备名称"></el-table-column>
src/pages/dataMager/dischargeTest.vue
@@ -48,15 +48,14 @@
        </table>
      </div>
      <!-- è¡¨å• -->
      <el-table border size="small" :data="table.datas" height="82%" class="tableCent">
      <el-table stripe size="small" :data="table.datas" height="82%" class="tableCent">
        <el-table-column
          v-for="header in table.headers"
          :key="header.prop"
          :prop="header.prop"
          :label="header.label"
          :width="header.width"
          align="center"
        ></el-table-column>
          align="center"></el-table-column>
      </el-table>
      <!-- åº•部 -->
src/pages/dataMager/historyInfoMager.vue
@@ -68,7 +68,7 @@
      </div>
      <div class="flex-page-content">
          <!-- è¡¨å• -->
          <el-table border size="small" :data="table.datas" height="100%" class="tableCent">
          <el-table stripe size="small" :data="table.datas" height="100%" class="tableCent">
            <el-table-column
              v-for="header in table.headers"
              :key="header.prop"
@@ -150,7 +150,7 @@
                {
                    prop: "StationName",
                    label: "机房名称",
                    width: "200"
                    width: "360"
                },
                {
                    prop: "BattGroupName",
@@ -160,7 +160,7 @@
                {
                    prop: "test_starttime",
                    label: "测试日期",
                    width: "100"
                    width: "150"
                },
                {
                    prop: "test_starttypeHex",
src/pages/dataTest/realTime.vue
@@ -124,9 +124,18 @@
                            <bar-chart ref="curr" id="curr" unit="A"></bar-chart>
                        </el-tab-pane>
                        <el-tab-pane label="数据表格" name="tblData">
                            <el-table border size="small" :data="table.datas" height="100%">
                                <el-table-column v-for="header in table.headers" :key="header.prop" :prop="header.prop" :label="header.label"
                                 :width="header.width" align="center"></el-table-column>
                            <el-table
                            stripe
                            size="small"
                            :data="table.datas"
                            height="100%">
                                <el-table-column
                                v-for="header in table.headers"
                                :key="header.prop"
                                :prop="header.prop"
                                :label="header.label"
                                :width="header.width"
                                align="center"></el-table-column>
                            </el-table>
                        </el-tab-pane>
                    </el-tabs>
src/pages/jobManage/planManage.vue
@@ -64,7 +64,7 @@
        <div class="flex-page-content">
            <div class="contentBox">
                <div class="tableBox">
                    <el-table ref="multipleTable" border size="small" :data="dataList" height="100%" @selection-change="handleSelectionChange" class="tableCent">
                    <el-table ref="multipleTable" stripe size="small" :data="dataList" height="100%" @selection-change="handleSelectionChange" class="tableCent">
                        <el-table-column align="center" width="55" type="selection" label="批量操作"></el-table-column>
                        <el-table-column prop="StationName1" width="120" align="center" label="维护区"></el-table-column>
                        <el-table-column prop="StationName" width="120" align="center" label="机房名称"></el-table-column>
@@ -98,12 +98,11 @@
                        <el-table-column prop="chargecurrset" width="120" align="center" label="充电电流(A)"></el-table-column>
                        <el-table-column prop="plan_circle" width="120" align="center" label="单次周期(天)"></el-table-column>
                        <el-table-column prop="plan_rate" width="120" align="center" label="执行次数"></el-table-column>
                        <el-table-column prop="plan_rate" fixed="right" width="420" align="center" label="操作">
                        <el-table-column prop="plan_rate" fixed="right" width="240" align="center" label="操作">
                            <template slot-scope="scope">
                                <el-button type="primary" @click="consoleLog(scope.row)" size="mini">启用计划</el-button>
                                <el-button type="info" size="mini">取消计划</el-button>
                                <el-button type="warning" size="mini" @click="clearSelect">取消选择</el-button>
                                <el-button type="danger" size="mini">删除计划</el-button>
                                <el-button type="primary" @click="consoleLog(scope.row)" size="mini">启用</el-button>
                                <el-button type="info" size="mini">取消</el-button>
                                <el-button type="danger" size="mini">删除</el-button>
                            </template>
                        </el-table-column>
                    </el-table>
src/pages/userMager/operationRecord.vue
@@ -34,7 +34,7 @@
            </div>
        </div>
        <div class="flex-page-content">
            <el-table border size="mini" header-row-class-name="header-primary" height="100%" :data="userList">
            <el-table stripe size="mini" header-row-class-name="header-primary" height="100%" :data="userList">
                <el-table-column prop="uId" align="center" label="用户ID"></el-table-column>
                <el-table-column prop="UName" align="center" label="操作人姓名"></el-table-column>
                <el-table-column prop="uOprateType" align="center" label="操作类型"></el-table-column>
src/pages/userMager/userInfo.vue
@@ -2,7 +2,7 @@
    <!-- ç”¨æˆ·ä¿¡æ¯ -->
    <flex-layout>
        <div class="flex-page-content">
                <el-table ref="tableBox" border size="mini" header-row-class-name="header-primary" height="100%"  :data="userList">
                <el-table ref="tableBox" stripe size="mini" header-row-class-name="header-primary" height="100%"  :data="userList">
                    <el-table-column prop="UDepartment" width="60px"  align="center"  label="维护区"></el-table-column>
                    <el-table-column prop="UName" width="90px" align="center"  label="姓名"></el-table-column>
                    <el-table-column prop="UShenFenId"  width="90px" align="center"  label="身份证号"></el-table-column>
ÏîÄ¿ÐèÇó.md
@@ -18,7 +18,7 @@
1.修改色调
2.表格线条颜色修改
3.百度地图淡化,右下角添加图标标识,去除右侧的饼状图。引入inmap框架(重要)
4.实时数据tab切换最后位置添加逆变信息,最前方添加电源信息(重要)
4.实时数据tab切换最后位置添加逆变信息,最前方添加电源信息,默认显示电路拓扑图(重要)
5.历史数据 åœ¨çº¿å’Œç»„端电压位置调整 æ·»åŠ å¯¼å‡ºæ•°æ®åŠŸèƒ½å’Œä¸¤æ¬¡åŽ†å²è®°å½•å¯¹æ¯”åŠŸèƒ½
6.添加卡片实现1班,2班,3班管理
7.头部卡片在机房停电停电数后添加电源告警数