Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-03-26 7b3ded19acade1ea4617e299934bf244fd51ec3b

 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
            },