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

shuishen

2021-03-26 7b3ded19acade1ea4617e299934bf244fd51ec3b

 src/views/clientManagement/clientManagement.vue

@@ -28,7 +28,7 @@
                   @on-load="onLoad">
          <template slot="menuLeft">
            <el-button type="danger"
                       size="small"
                       size="mini"
                       icon="el-icon-delete"
                       plain
                       v-if="permission.clientManagement_delete"
@@ -258,9 +258,9 @@
            },
            {
              label: "上级菜单",
              prop: "pid",
              prop: "deptId",
              type: "tree",
              dicUrl: "/api/blade-jfpts/catalogs/catalogs/tree",
              dicUrl: "/api/blade-system/dept/trees",
              hide: true,
              props: {
                label: "title"
@@ -352,13 +352,26 @@
                  value: "1"
                }
              ]
            }, {
            },
            {
              label: "设备状态",
              align: "center",
              prop: "dxzt",
              slot: true,
              addDisplay: false,
              editDisplay: false,
            },
            {
              label: "故障状态",
              prop: "state",
              addDisplay: false,
              editDisplay: false
            },
            {
              label: "故障原因",
              prop: "reason",
              addDisplay: false,
              editDisplay: false
            },
            {
              label: "设备类型",
@@ -472,7 +485,7 @@
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.clientManagement_add, false),
          viewBtn: this.vaildData(this.permission.clientManagement_view, false),
          viewBtn: this.vaildData(null, false),
          delBtn: this.vaildData(this.permission.clientManagement_delete, false),
          editBtn: this.vaildData(this.permission.clientManagement_edit, false)
        };
@@ -554,7 +567,7 @@
          });
      },
      searchReset() {
        this.treeDeptId = null;
        this.treeDeptId = "";
        this.query = {};
        this.onLoad(this.page);
      },