doum
2026-03-06 d3c376f9aaf578e3870d9934fd30e902792f9c5d
海康电表维护
已修改8个文件
113 ■■■■ 文件已修改
admin/public/index.html 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/workbench/index.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/store/index.js 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/admissionStatistics.vue 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/carStatistics.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/login.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/public/index.html
admin/src/api/workbench/index.js
@@ -30,5 +30,7 @@
}
// pc工作台
export function getWorkbenchData (data) {
  return request.get('/visitsAdmin/cloudService/business/staging/pCWorkPlatformData', data)
  return request.get('/visitsAdmin/cloudService/business/staging/pCWorkPlatformData', {
    params: {...data  }
  })
}
admin/src/store/index.js
@@ -1,11 +1,13 @@
import Vue from 'vue'
import Vuex from 'vuex'
import router from '../router'
Vue.use(Vuex)
const state = {
  // 登录用户信息
  userInfo: null,
  tableHeightNew: 300,
  sysConfig: { title: '', subtitle: '' },
  primaryColor: '#2080f7',
  // 首页
  homePage: null,
@@ -27,10 +29,21 @@
  // tags数组
  tags: [],
  // tagsview标签显示隐藏
  isCollapse: false
  isCollapse: false,
  // 顶部菜单索引
  currentIndex: 0
}
const mutations = {
  // 设置顶部菜单索引
  setCurrentIndex (state, index) {
    console.log('设置顶部菜单索引', index)
    state.currentIndex = index
  },
  setSysconfig (state, config) {
    state.sysConfig = { title: config.title || '', subtitle: config.subtitle || '' }
    document.title =  state.sysConfig.title+ state.sysConfig.subtitle
  },
  // 切换菜单状态
  switchCollapseMenu (state, value) {
    if (value != null) {
@@ -60,7 +73,7 @@
  },
  // 设置首页路由信息
  setTopMenuCurrent (state, current) {
    console.log("setTopMenuCurrent",current)
    console.log('setTopMenuCurrent', current)
    if(current.id !== state.topMenuCurrent.id){
      state.topMenuList.list.forEach(item => {
        console.log(item.id, item.id)
@@ -73,7 +86,7 @@
  },
  // 重置菜单
  resetMenus: (state) => {
    state.topMenuId=null;
    state.topMenuId = null
    state.menuData.list = []
  },
  //  tags
admin/src/views/business/admissionStatistics.vue
@@ -87,7 +87,7 @@
                    <el-table
                        style="width: 100%; margin-top: 15px;"
                        :data="list"
                        :header-row-style="{ backgroundColor: '#F7F7F7' }"
              header-row-style="background-color: #F7F7F7;"
                        border
                    >
                        <el-table-column :prop="item" :label="item" align="center" :fixed="index === 0 ? true : index === column.length - 1 ? 'right' : false" v-for="(item, index) in column" :key="index"></el-table-column>
@@ -102,7 +102,7 @@
                <el-table
                    style="width: 100%; margin-top: 15px;"
                    :data="info.yearSortList"
                    :header-row-style="{ backgroundColor: '#F7F7F7' }"
            header-row-style="background-color: #F7F7F7;"
                    border
                >
                    <el-table-column prop="name" label="人员分类" align="center"></el-table-column>
@@ -133,9 +133,9 @@
    }
  },
  mounted () {
    var now = new Date()
    var year = now.getFullYear()
    var month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`
    var now = new Date();
    var year = now.getFullYear();
    var month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`;
    this.value = `${year}-${month}`
    this.date1 = `${year}-${month}`
@@ -152,13 +152,13 @@
    },
    changeBB () {
      if (this.radio === 'month') {
        const now = new Date()
        const year = now.getFullYear()
        const month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`
        let now = new Date();
        let year = now.getFullYear();
        let month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`;
        this.date1 = `${year}-${month}`
      } else {
        const now = new Date()
        const year = now.getFullYear()
        let now = new Date();
        let year = now.getFullYear();
        this.date1 = `${year}`
      }
      this.getReportLists()
@@ -173,13 +173,14 @@
            return
          }
          this.column = res[0]
          this.list = res.slice(1).map(row => {
            const obj = {}
              const obj = {};
            this.column.forEach((header, index) => {
              obj[header] = row[index]
            })
            return obj
          })
                obj[header] = row[index];
              });
              return obj;
            });
          // if (res.length === 0) {
          //   this.column = []
          //   this.list = []
@@ -192,13 +193,13 @@
    },
    changeDateType () {
      if (this.dateType === 'month') {
        const now = new Date()
        const year = now.getFullYear()
        const month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`
        let now = new Date();
        let year = now.getFullYear();
        let month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`;
        this.value = `${year}-${month}`
      } else {
        const now = new Date()
        const year = now.getFullYear()
        let now = new Date();
        let year = now.getFullYear();
        this.value = `${year}`
      }
      this.getRataLists()
@@ -234,10 +235,10 @@
      const myChart = echarts.init(document.querySelector('.echart1'))
      const names = this.info.cumulativeDataList.map(item => item.name)
      const datas = this.info.cumulativeDataList.map(item => item.total)
      let names = this.info.cumulativeDataList.map(item => item.name)
      let datas = this.info.cumulativeDataList.map(item => item.total)
      const option = {
      let option = {
        grid: {
          left: '0%',
          right: '5%',
@@ -263,7 +264,7 @@
          axisLabel: {
            formatter: function (value) {
              // 四舍五入到最近的整数
              return Math.round(value)
              return Math.round(value);
            }
          }
        },
@@ -342,16 +343,16 @@
      console.log(dom)
      const myChart = echarts.init(dom)
      const data = this.listZB.map(item => {
      let data = this.listZB.map(item => {
        return {
          value: item.total,
          name: item.name
        }
      })
      const option = {
      let option = {
        tooltip: {
          trigger: 'item'
          trigger: 'item',
        },
        legend: {
          show: false,
@@ -366,11 +367,11 @@
            labelLine: {
              normal: {
                length: 30,
                length2: 70
                length2: 70,
              }
            },
            label: {
              formatter: '{a|{b}} {d}%',
              formatter: "{a|{b}} {d}%",
              rich: {
                a: {
                  color: '#333333',
@@ -392,7 +393,7 @@
    initDept3 () {
      const myChart = echarts.init(document.querySelector('#echart3'))
      const option = {
      let option = {
        grid: {
          left: '5%',
          right: '10%',
@@ -501,7 +502,7 @@
        .main_table {
            display: flex;
            align-items: flex-start;
    align-items: start;
            justify-content: space-between;
            margin-top: 10px;
            .main_table_list {
@@ -663,6 +664,7 @@
                box-sizing: border-box;
                /*border-right: 12px solid #f7f7f7;*/
                .echart1 {
                    width: 100%;
                    height: 100%;
admin/src/views/business/carStatistics.vue
@@ -87,7 +87,7 @@
                    <el-table
                        style="width: 100%; margin-top: 15px;"
                        :data="list"
                        :header-row-style="{ backgroundColor: '#F7F7F7' }"
              header-row-style="background-color: #F7F7F7;"
                        border
                    >
                        <el-table-column :prop="item" :label="item" align="center" :fixed="index === 0 ? true : index === column.length - 1 ? 'right' : false" v-for="(item, index) in column" :key="index"></el-table-column>
@@ -102,7 +102,7 @@
                <el-table
                    style="width: 100%; margin-top: 15px;"
                    :data="info.yearSortList"
                    :header-row-style="{ backgroundColor: '#F7F7F7' }"
            header-row-style="background-color: #F7F7F7;"
                    border
                >
                    <el-table-column prop="name" label="车辆分类" align="center"></el-table-column>
@@ -168,11 +168,6 @@
      getReportLists() {
        getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 0 })
            .then(res => {
              if (res.length === 0) {
                this.column = []
                this.list = []
                return
              }
              if (!res || res.length === 0) {
                this.column = []
@@ -199,8 +194,8 @@
              //   }, {});
              // });
              // console.log(this.column)
              // console.log(this.list)
            console.log(this.column)
            console.log(this.list)
              // if (res.length === 0) {
              //   this.column = []
@@ -531,7 +526,7 @@
        .main_table {
            display: flex;
            align-items: flex-start;
    align-items: start;
            justify-content: space-between;
            margin-top: 10px;
            .main_table_list {
@@ -699,7 +694,7 @@
                    margin-top: 18px;
                }
            }
wor
            .dept_wrap {
                width: 420px;
                flex-shrink: 0;
admin/src/views/login.vue
@@ -104,18 +104,17 @@
    ...mapState(['sysConfig'])
  },
  mounted () {
    alert(1)
    this.username = localStorage.getItem('username') || ''
    this.password = localStorage.getItem('password') || ''
    this.phone = localStorage.getItem('phone') || ''
    const isRemPsd = localStorage.getItem('isRemPsd') || false
    this.isRemPsd = JSON.parse(isRemPsd)
    this.refreshCaptcha()
    this.getSystemConfig()
    this.getSystemConfigDo()
  },
  methods: {
    ...mapMutations(['setUserInfo', 'setSysconfig']),
    getSystemConfig () {
    getSystemConfigDo () {
      getSystemConfig()
        .then((res) => {
          if (res && res.subtitle) {
server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: system_gateway
  # 安全配置
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: pro
    active: dev
  application:
    name: visitsAdmin
    # 安全配置