webSocket调整，改为在请求页调用，防止关闭后自动登录的情况

zengh

2021-03-26 ea0c15eba3525b922459c67b6001269245c95df8

webSocket调整，改为在请求页调用，防止关闭后自动登录的情况

 src/api/client/client.js

@@ -2,7 +2,7 @@

export const getList = (current, size, params,pid) => {
  return request({
    url: '/api/blade-jfpts/equipment/equipment/pages',
    url: '/api/blade-jfpts/equipment/equipment/pageDept',
    method: 'get',
    params: {
      ...params,
@@ -77,3 +77,13 @@
  })
}

export const getDeptTree = (tenantId) => {
  return request({
    url: '/api/blade-system/dept/tree',
    method: 'get',
    params: {
      tenantId,
    }
  })
}


 src/views/clientManagement/clientManagement.vue

@@ -258,9 +258,9 @@
            },
            {
              label: "上级菜单",
              prop: "pid",
              prop: "deptId",
              type: "tree",
              dicUrl: "/api/blade-jfpts/catalogs/catalogs/tree",
              dicUrl: "/api/blade-system/dept/tree",
              hide: true,
              props: {
                label: "title"
@@ -567,7 +567,7 @@
          });
      },
      searchReset() {
        this.treeDeptId = null;
        this.treeDeptId = "";
        this.query = {};
        this.onLoad(this.page);
      },

 src/views/system/user.vue

@@ -93,14 +93,7 @@
          <template slot-scope="{ row }" slot="online_status">
            <el-tag
            >{{
              row.online_status == "0" ? "掉线" : row.online_status == "1" ? "在线" : "掉线"
              }}
            </el-tag>
          </template>
          <template slot-scope="{ row }" slot="work_status">
            <el-tag
            >{{
              row.work_status == "0" ? "闲置" : row.work_status == "1" ? "工作中" : "闲置"
              row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
              }}
            </el-tag>
          </template>
@@ -318,11 +311,6 @@
            }, {
              label: "在线状态",
              prop: "online_status",
              slot: true,
              display: false
            }, {
              label: "工作状态",
              prop: "work_status",
              slot: true,
              display: false
            },