提交内容

whychdw

2021-06-22 0bd159409f804661fd8d59dbce06584a5fce75ae

提交内容

 package.json

@@ -1,6 +1,6 @@
{
  "name": "admin_manage",
  "version": "1.0.5",
  "version": "2.2.5",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve --mode dev",

 src/assets/js/apis/pageSetting/realTime.js

@@ -75,4 +75,11 @@
            data: 'json='+JSON.stringify(searchParams)
        });
    },
    searchVersion() {
        return axios({
            method: 'post',
            url: 'PageParamAction!findByCategoryId',
            data: 'json='+JSON.stringify({categoryId:6})
        });
    },
}

 src/components/PageHeader.vue

@@ -8,7 +8,7 @@
                    <span class="header-carve-up" v-if="logoConfig.value"></span>
                    <span>通信电源监控主站</span>
                    <!--          <span>综合电力监控平台</span>-->
                    <span class="sys-version">V{{ version }}</span>
                    <span class="sys-version">{{ version }}</span>
                </div>
                <div class="page-header-content">
                    <div class="header-info-list">
@@ -147,7 +147,7 @@
                showProgress: false,
                pifuDrawer: false,
                showLogo: false,
                version: config.version,
                version: '',
                username: sessionStorage.getItem('username'),
                termDateShow: true,
                termDate: 0,
@@ -613,6 +613,17 @@
                }).catch(error => {
                    console.log(error);
                });
            },
            searchVersion() {
                this.$apis.pageSetting.realTime.searchVersion().then(res=>{
                    let rs = JSON.parse(res.data.result);
                    if(rs.code == 1) {
                        let data = rs.data[0];
                        this.version = data.param;
                    }
                }).catch(error=>{

                });
            }
        },
        computed: {
@@ -747,6 +758,9 @@

            // 查询剩余天数
            this.getLicenseResTime();

            // 查询版本
            this.searchVersion();
        },
        destroyed() {
            this.timer.stop();

 src/pages/dataTest/movingRingSystem/dialog/dcConfig.vue

@@ -16,7 +16,7 @@
            </el-form-item>
            <el-row :gutter="layout.gutter">
                <el-col :span="layout.span">
                    <el-form-item label="直流开关路数" prop="outputSWCount">
                    <el-form-item label="直流开关输出路数" prop="outputSWCount">
                        <el-input
                            placeholder="请输入直流开关输出路数"
                            v-model="params.outputSWCount">
@@ -24,7 +24,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="layout.span">
                    <el-form-item label="直流开关路数" prop="inputSWCount">
                    <el-form-item label="直流开关输入路数" prop="inputSWCount">
                        <el-input
                            placeholder="请输入直流开关输入路数"
                            v-model="params.inputSWCount">