Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-08-19 7264485acdd440ac75807fa6f91b09bcdf4f2051

 src/views/securityGuard/securityGuard.vue

@@ -107,7 +107,7 @@
              >导出
            </el-button>
          </template>

 
          <template slot-scope="{ type, size, row }" slot="menu">
            <!-- <el-button
                style="display:none"
@@ -125,12 +125,12 @@
              >离职登记
            </el-button>
          </template>

 
          <template slot-scope="{ row }" slot="sex">
            <el-tag v-if="row.sex == 1">男</el-tag>
            <el-tag v-if="row.sex == 2">女</el-tag>
          </template>

 
          <template slot-scope="{ row }" slot="tenantName">
            <el-tag>{{ row.tenantName }}</el-tag>
          </template>
@@ -161,7 +161,7 @@
            :props="props"
          >
          </el-tree>

 
          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
            <el-button type="primary" @click="submitRole">确 定</el-button>
@@ -238,7 +238,7 @@
    </el-col>
  </el-row>
</template>

 
<script>
import {
  getUser,
@@ -262,7 +262,7 @@
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";
import { mapState } from "vuex";

 
export default {
  data() {
    const validatePass = (rule, value, callback) => {
@@ -311,7 +311,7 @@
          },
        ],
      },

 
      form: {},
      search: {},
      roleBox: false,
@@ -486,12 +486,12 @@
                row: true,
                prop: "myPicture",
              },

 
              // {
              //   label: "编号",
              //   prop: "code",
              // },

 
              {
                label: "所属辖区",
                prop: "jurisdiction",
@@ -930,7 +930,7 @@
    
  },
  created() {

 
  },
  mounted() {
    // this.option.column[0].hide = true
@@ -952,7 +952,7 @@
    handleTemplate1() {
      window.open(`/api/examSubjectChoices/export-template`);
    },

 
    //行点击事件
    rowClick(row) {
      this.$router.push({
@@ -1316,7 +1316,7 @@
            var ColumnDeptUpdate1 = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
          }

 
          let values = {
            ...params,
          };
@@ -1325,7 +1325,7 @@
            roleAlias: "111",
            ...that.query,
          };

 
          that.loading = true;
          getList(page.currentPage, page.pageSize, values).then((res) => {
            const data = res.data.data;
@@ -1337,7 +1337,7 @@
        });
      });
      

 
      
    },
    platformRowUpdate(row, index, done, loading) {
@@ -1408,17 +1408,17 @@
  },
};
</script>

 
<style>
.box {
  height: 800px;
}

 
.el-scrollbar {
  height: 100%;
}

 
.box .el-scrollbar__wrap {
  overflow: scroll;
}
</style>
</style>