whychdw
2021-12-22 548c1616a96b9218d879a25cb25a7759df7753f7
修改内容
4个文件已修改
75 ■■■■ 已修改文件
src/pages/alarmMager/devicepaSetting.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataMager/threadMager.vue 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/dataTest/realTime.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/alarmMager/devicepaSetting.vue
@@ -24,20 +24,20 @@
        <div class="flex-page-content aa">
            <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" :show-overflow-tooltip="true" label="设备"></el-table-column>
                <el-table-column prop="UDepartment" :min-width="360" align="center" :show-overflow-tooltip="true" label="设备"></el-table-column>
                <el-table-column prop="UName" :min-width="220" align="center" label="告警名称"></el-table-column>
                <el-table-column prop="baseValue" :min-width="120" align="center" label="告警基准值"></el-table-column>
                <el-table-column prop="UShenFenId" :min-width="120" align="center" label="告警ID"></el-table-column>
                <el-table-column prop="UEmployeeId" :min-width="175" align="center" label="告警上限系数值(0.0~30.0)"></el-table-column>
                <el-table-column prop="UTelephone" :min-width="140" align="center" label="告警上限等级(1~4)"></el-table-column>
                <el-table-column prop="UEmployeeId" :min-width="200" align="center" label="告警上限系数值(0.0~30.0)"></el-table-column>
                <el-table-column prop="UTelephone" :min-width="200" align="center" label="告警上限等级(1~4)"></el-table-column>
                <el-table-column prop="is_alm_high_en" :min-width="120" align="center" label="告警上限使能">
                    <template slot-scope="scope">
                        <el-checkbox v-model="scope.row.is_alm_high_en" disabled></el-checkbox>
                    </template>
                </el-table-column>
                <el-table-column prop="alramDown" :min-width="175" align="center" label="告警下限系数值(0.0~30.0)"></el-table-column>
                <el-table-column prop="UMobDown" :min-width="140" align="center" label="告警下限等级(1~4)"></el-table-column>
                <el-table-column prop="is_alm_low_en" :min-width="100" align="center" label="告警下限使能">
                <el-table-column prop="alramDown" :min-width="200" align="center" label="告警下限系数值(0.0~30.0)"></el-table-column>
                <el-table-column prop="UMobDown" :min-width="200" align="center" label="告警下限等级(1~4)"></el-table-column>
                <el-table-column prop="is_alm_low_en" :min-width="130" align="center" label="告警下限使能">
                    <template slot-scope="scope">
                        <el-checkbox v-model="scope.row.is_alm_low_en" disabled></el-checkbox>
                    </template>
src/pages/dataMager/threadMager.vue
@@ -17,9 +17,22 @@
                width="180"
                align="center">
                    <template slot-scope="scope">
                        <el-button :disabled="!isCanEdit" icon="el-icon-s-tools" @click="handleClick(scope.row)" type="primary" size="mini">设置</el-button>
                      <el-popover
                        placement="top"
                        trigger="click">
                        <div class="el-popover-content">
                          <el-button size="mini" type="primary" @click="handleClick(scope.row)">参数设置</el-button>
                        <el-button 
                        icon="el-icon-refresh-right" type="danger" size="mini"
                            :disabled="scope.row.disabled"
                            size="mini"
                            :type="scope.row.btnType"
                            @click="confirmChange(scope.row)">{{ scope.row.btnText }}</el-button>
                        </div>
                        <el-button slot="reference" :disabled="!isCanEdit" icon="el-icon-s-tools" type="primary" size="mini">设置</el-button>
                      </el-popover>
                      <div class="white-block"></div>
                      <el-button
                      icon="el-icon-refresh-right" :type="scope.row.noRestart?'info':'danger'" size="mini"
                        :disabled="scope.row.noRestart || !isCanEdit"
                        @click="confirmHandler(scope.row)">重启</el-button>
                    </template>
@@ -222,11 +235,23 @@
                if(rs.code == 1) {
                    this.tblData.data = rs.data.map(item=>{
                        // 设置是否可以重启
                        if(item.ServerName == 'BMS_FBSDEV_LISTEN' || item.ServerFlag == 2) {
                        if(item.ServerFlag == 2) {
                            item.noRestart = true;
                        }else {
                            item.noRestart = false;
                        }
                        item.btnText = item.ServerFlag == 2?"启用线程":"禁用线程";
                        item.btnType = item.ServerFlag == 2?"success":"danger";
                        // 线程监控线程无法被禁用
                        if(item.ServerName == "BMS_FBSDEV_LISTEN" || item.ServerName == "BMS_FBSDEV") {
                          item.disabled = true;
                          item.btnType = "info";
                        }else {
                          item.disabled = false;
                        }
                        // 线程状态
                        item.progressStatus = this.getThreadState(item.ServerFlag);
                        // 运行时间
@@ -260,6 +285,17 @@
            this.form.ServerName = data.ServerName;
            this.form.ProcessVersion = data.ProcessVersion;
            this.dialog = true;
        },
        confirmChange(data) {
          this.$layer.confirm(data.btnText+":"+data.ProcessName_CN, {icon: 3},(index)=>{
            // 关闭面板
            this.$layer.close(index);
            let params = {
              ServerName: data.ServerName,
              ServerFlag: data.ServerFlag == 2?0:2
            };
            this.updateState(params);
          });
        },
        confirmHandler(data) {
            this.$layer.confirm('确定重启'+data.ProcessName_CN, {icon: 3},(index)=>{
@@ -343,10 +379,10 @@
                this.$layer.close(loading);
                let rs = JSON.parse(res.data.result);
                if(rs.code == 1) {
                    this.$layer.msg('重启成功!');
                    this.$layer.msg('成功!');
                    this.pwdDialog = false;
                }else {
                    this.$layer.msg('重启失败!');
                    this.$layer.msg('失败!');
                }
            }).catch(error=>{
                // 关闭弹出框
@@ -364,5 +400,12 @@
</script>
<style scoped>
.el-popover-content {
  background-color: #FFFFFF;
  padding: 8px 16px;
}
.white-block {
  display: inline-block;
  width: 8px;
}
</style>
src/pages/dataTest/realTime.vue
@@ -658,7 +658,7 @@
    <!-- 放电参数设置 -->
    <el-dialog
      :title="dischargeDialogTitle"
      width="700px"
      width="auto"
      :visible.sync="dischargeDialog.show"
      :close-on-click-modal="false"
      top="0"
src/pages/index.vue
@@ -476,7 +476,7 @@
        id: "allmap",
        center: ["119.2376", "40.0436"], // 秦皇岛市
        zoom: {
          value: 11,
          value: 9,
          show: true,
          max: 22,
        },
@@ -561,7 +561,7 @@
          if (rs.code == 1) {
            let data = rs.data[0];
            var _point = new BMap.Point(data.map_longitude, data.map_latitude);
            map.centerAndZoom(_point, data.map_level); // 用城市名设置地图中心点
            map.centerAndZoom(_point, 9); // 用城市名设置地图中心点
          }
        })
        .catch((error) => {
@@ -1069,7 +1069,7 @@
      let searchParams = {
        map_longitude: point.lng,
        map_latitude: point.lat,
        map_level: 11,
        map_level: 9,
      };
      let loading = this.$layer.loading();
      setMapCenterPoint(searchParams)