整合冲突

liuyg

2021-07-13 5fd9ab0d9b04fd7c29d2a147e3717ab7eff431be

整合冲突

 src/api/desk/notice.js

@@ -12,6 +12,18 @@
  })
}

export const getListPage = (current, size, params) => {
    return request({
        url: '/api/blade-desk/notice/page',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}

export const remove = (ids) => {
  return request({
    url: '/api/blade-desk/notice/remove',
@@ -47,4 +59,3 @@
    }
  })
}


 src/api/securityGuard/securityGuard.js

@@ -1,14 +1,13 @@
import request from '@/router/axios';

export const getList = (current, size, params, deptId) => {
export const getList = (current, size, params) => {
    return request({
        url: '/api/blade-user/page',
        method: 'get',
        params: {
            ...params,
            current,
            size,
            deptId,
            size
        }
    })
}

 src/router/views/index.js

@@ -156,17 +156,30 @@
            import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
    }]
}, {
    path: '/securityGuard',
    path: '/securityGuardDetail',
    component: Layout,
    redirect: '/securityGuard/securityGuardDetail',
    redirect: '/securityGuardDetail/index',
    children: [{
        path: 'securityGuardDetail',
        path: 'index',
        name: '保安员详情',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
    }]
}, {
    path: '/resource',
    component: Layout,
    redirect: '/resource/attach',
    children: [{
        path: 'attach',
        name: '附件上传',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import( /* webpackChunkName: "views" */ '@/views/resource/attach')
    }]
}, {
    path: '/securityUnitChild',
@@ -210,6 +223,19 @@
//     }]
// },
{
    path: '/desk',
    component: Layout,
    redirect: '/desk/notice',
    children: [{
        path: 'index',
        name: '通知公告',
        meta: {
            i18n: 'dict'
        },
        component: () =>
            import( /* webpackChunkName: "views" */ '@/views/desk/notice')
    }]
}, {
    path: '/dispatch',
    component: Layout,
    redirect: '/dispatch/dispatch',

 src/views/desk/notice.vue

@@ -35,7 +35,7 @@
        <el-tag>{{ row.categoryName }}</el-tag>
      </template>
      <template slot-scope="{ type, size, row }" slot="menu">
        <el-button :size="size" :type="type" @click="handleDelete"
        <el-button :size="size" :type="type" @click="handleUploadPage(row)"
          >附件上传
        </el-button>
      </template>
@@ -44,7 +44,7 @@
</template>

<script>
import { getList, remove, update, add, getNotice } from "@/api/desk/notice";
import { getListPage, remove, update, add, getNotice } from "@/api/desk/notice";
import { mapGetters } from "vuex";

export default {
@@ -53,6 +53,7 @@
      form: {},
      query: {},
      loading: true,
      deptId: "",
      page: {
        pageSize: 10,
        currentPage: 1,
@@ -68,6 +69,7 @@
        searchMenuSpan: 6,
        border: false,
        index: true,
        stripe: true,
        viewBtn: true,
        selection: true,
        excelBtn: false,
@@ -105,6 +107,23 @@
                required: true,
                message: "请输入通知类型",
                trigger: "blur",
              },
            ],
          },
          {
            label: "发布单位",
            prop: "deptId",
            type: "tree",
            dicUrl: "/api/blade-system/dept/lazy-tree",
            props: {
              label: "title",
              value: "id",
            },
            rules: [
              {
                required: true,
                message: "所属组织机构",
                trigger: "click",
              },
            ],
          },
@@ -180,7 +199,22 @@
      return ids.join(",");
    },
  },
  mounted() {
    //获取deptId
    this.deptId = JSON.parse(
      window.localStorage.getItem("saber-userInfo")
    ).content.dept_id;
  },
  methods: {
    //跳转到附近列表页面
    handleUploadPage(row) {
      this.$router.push({
        path: `/resource/attach`,
        query: {
          deptId: row.deptId,
        },
      });
    },
    rowSave(row, done, loading) {
      add(row).then(
        () => {
@@ -290,18 +324,20 @@
      const { releaseTimeRange } = this.query;
      let values = {
        ...params,
        ...this.deptId,
      };
      if (releaseTimeRange) {
        values = {
          ...params,
          releaseTime_datege: releaseTimeRange[0],
          releaseTime_datelt: releaseTimeRange[1],
          ...this.deptId,
          startTime: releaseTimeRange[0],
          endTime: releaseTimeRange[1],
          ...this.query,
        };
        values.releaseTimeRange = null;
      }
      this.loading = true;
      getList(page.currentPage, page.pageSize, values).then((res) => {
      getListPage(page.currentPage, page.pageSize, values).then((res) => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;

 src/views/resource/attach.vue

@@ -1,6 +1,7 @@
<template>
  <basic-container>
    <avue-crud :option="option"
    <avue-crud
      :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="page"
@@ -15,41 +16,54 @@
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      @on-load="onLoad"
    >
      <template slot="menuLeft">
        <el-button type="primary"
        <el-button
          type="primary"
                   size="small"
                   plain
                   v-if="permission.attach_upload"
                   icon="el-icon-upload2"
                   @click="handleUpload">上 传
          @click="handleUpload"
          >上 传
        </el-button>
        <el-button type="danger"
        <el-button
          type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.attach_delete"
                   @click="handleDelete">删 除
          @click="handleDelete"
          >删 除
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button type="text"
        <el-button
          type="text"
                   icon="el-icon-download"
                   size="small"
                   v-if="permission.attach_download"
                   @click="handleDownload(scope.row)">下载
          @click="handleDownload(scope.row)"
          >下载
        </el-button>
      </template>
      <template slot-scope="{row}"
                slot="attachSize">
      <template slot-scope="{ row }" slot="attachSize">
        <el-tag>{{`${row.attachSize} KB`}}</el-tag>
      </template>
    </avue-crud>
    <el-dialog title="附件管理"
    <el-dialog
      title="附件管理"
               append-to-body
               :visible.sync="attachBox"
               width="555px">
      <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter">
      width="555px"
    >
      <avue-form
        ref="form"
        :option="attachOption"
        v-model="attachForm"
        :upload-after="uploadAfter"
      >
      </avue-form>
    </el-dialog>
  </basic-container>
@@ -61,25 +75,29 @@

  export default {
    data() {
    var type = 4;
    var deptid = this.$route.query.deptId;
      return {
        form: {},
        query: {},
      putParam: "",
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        attachBox: false,
        selectionList: [],
        option: {
          height: 'auto',
        height: "auto",
          calcHeight: 30,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
        border: false,
          index: true,
        stripe: true,
          viewBtn: true,
          selection: true,
          dialogClickModal: false,
@@ -87,62 +105,74 @@
            {
              label: "附件地址",
              prop: "link",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入附件地址",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "附件域名",
              prop: "domain",
              search: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入附件域名",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "附件名称",
              prop: "name",
              search: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入附件名称",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "附件原名",
              prop: "originalName",
              search: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入附件原名",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "附件拓展名",
              prop: "extension",
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入附件拓展名",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "附件大小",
              prop: "attachSize",
              slot: true,
              rules: [{
            rules: [
              {
                required: true,
                message: "请输入附件大小",
                trigger: "blur"
              }]
                trigger: "blur",
            },
          ]
            ],
          },
        ],
        },
        data: [],
        attachForm: {},
@@ -151,19 +181,23 @@
          emptyBtn: false,
          column: [
            {
              label: '附件上传',
              prop: 'attachFile',
              type: 'upload',
            label: "附件上传",
            prop: "attachFile",
            type: "upload",
              drag: true,
              loadText: '模板上传中，请稍等',
            loadText: "模板上传中，请稍等",
              span: 24,
              propsHttp: {
                res: 'data'
              res: "data",
              },
              action: "/api/blade-resource/oss/endpoint/put-file-attach"
            }
          ]
        }
            action:
              "/api/blade-resource/oss/endpoint/put-file-attach?type=" +
              type +
              "&deptid=" +
              deptid,
          },
        ],
      },
      };
    },
    computed: {
@@ -173,15 +207,32 @@
          addBtn: false,
          editBtn: false,
          viewBtn: false,
          delBtn: this.vaildData(this.permission.attach_delete, false)
        delBtn: this.vaildData(this.permission.attach_delete, false),
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
    },
  },
  mounted() {
    var flag = false,
      i = 0,
      ind = null;
    this.$store.state.tags.tagList.forEach((item, index) => {
      if (item.label == "附件上传") {
        if (flag == false) {
          ind = index;
          flag = true;
        }
        i++;
      }
    });
    if (i > 1) {
      this.$store.state.tags.tagList.splice(ind, 1);
      }
    },
    methods: {
@@ -201,7 +252,7 @@
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(row.id);
@@ -210,7 +261,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
          });
      },
@@ -222,7 +273,7 @@
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(this.ids);
@@ -231,14 +282,14 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getDetail(this.form.id).then(res => {
        getDetail(this.form.id).then((res) => {
            this.form = res.data.data;
          });
        }
@@ -271,16 +322,22 @@
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
      params.type = 4;
      params.deptid = this.$route.query.deptId;
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query)
      ).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }
    }
    },
  },
  };
</script>


 src/views/securityGuard/securityGuard.vue

@@ -15,7 +15,8 @@
      </el-col>
      <el-col :span="24">
      <basic-container>
        <avue-crud :option="option"
        <avue-crud
          :option="option"
                   :search.sync="search"
                   :table-loading="loading"
                   :data="data"
@@ -34,7 +35,8 @@
                   @current-change="currentChange"
                   @size-change="sizeChange"
                   @refresh-change="refreshChange"
                   @on-load="onLoad">
          @on-load="onLoad"
        >
          <template slot="menuLeft">
              <el-button
                type="danger"
@@ -116,49 +118,58 @@
              </el-button>
            </template>
            
          <template slot-scope="{row}"
                    slot="tenantName">
          <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>
          <template slot-scope="{row}"
                    slot="roleName">
          <template slot-scope="{ row }" slot="roleName">
            <el-tag>{{row.roleName}}</el-tag>
          </template>
          <template slot-scope="{row}"
                    slot="deptName">
          <template slot-scope="{ row }" slot="deptName">
            <el-tag>{{row.deptName}}</el-tag>
          </template>
          <template slot-scope="{row}"
                    slot="userTypeName">
          <template slot-scope="{ row }" slot="userTypeName">
            <el-tag>{{row.userTypeName}}</el-tag>
          </template>
        </avue-crud>
        <el-dialog title="用户角色配置"
        <el-dialog
          title="用户角色配置"
                   append-to-body
                   :visible.sync="roleBox"
                   width="345px">

          <el-tree :data="roleGrantList"
          width="345px"
        >
          <el-tree
            :data="roleGrantList"
                   show-checkbox
                   check-strictly
                   default-expand-all
                   node-key="id"
                   ref="treeRole"
                   :default-checked-keys="roleTreeObj"
                   :props="props">
            :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>
            <el-button type="primary" @click="submitRole">确 定</el-button>
          </span>
        </el-dialog>
        <el-dialog title="用户数据导入"
        <el-dialog
          title="用户数据导入"
                   append-to-body
                   :visible.sync="excelBox"
                   width="555px">
          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
          width="555px"
        >
          <avue-form
            :option="excelOption"
            v-model="excelForm"
            :upload-after="uploadAfter"
          >
            <template slot="excelTemplate">
              <el-button type="primary" @click="handleTemplate">
                点击下载<i class="el-icon-download el-icon--right"></i>
@@ -166,10 +177,13 @@
            </template>
          </avue-form>
        </el-dialog>
        <el-dialog title="用户平台配置"
        <el-dialog
          title="用户平台配置"
                   append-to-body
                   :visible.sync="platformBox">
          <avue-crud :option="platformOption"
          :visible.sync="platformBox"
        >
          <avue-crud
            :option="platformOption"
                     :table-loading="platformLoading"
                     :data="platformData"
                     ref="platformCrud"
@@ -184,13 +198,12 @@
                     @current-change="platformCurrentChange"
                     @size-change="platformSizeChange"
                     @refresh-change="platformRefreshChange"
                     @on-load="platformOnLoad">
            <template slot-scope="{row}"
                      slot="tenantName">
            @on-load="platformOnLoad"
          >
            <template slot-scope="{ row }" slot="tenantName">
              <el-tag>{{row.tenantName}}</el-tag>
            </template>
            <template slot-scope="{row}"
                      slot="userTypeName">
            <template slot-scope="{ row }" slot="userTypeName">
              <el-tag>{{row.userTypeName}}</el-tag>
            </template>
          </avue-crud>
@@ -202,7 +215,6 @@

<script>
  import {
    getList,
    getUser,
    getUserPlatform,
    remove,
@@ -212,30 +224,31 @@
    grant,
    resetPassword,
    getUserPractitionersInfo,
    saveOrUpdateUserPractitionersInfo
  saveOrUpdateUserPractitionersInfo,
  } from "@/api/system/user";
import { getList } from "@/api/securityGuard/securityGuard";
  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
  import {getRoleTree} from "@/api/system/role";
  import {getPostList} from "@/api/system/post";
  import {mapGetters} from "vuex";
  import website from '@/config/website';
  import {getToken} from '@/util/auth';
  import { securityFormPageColumn, securityBaseInfoColumns } from "./data";
import website from "@/config/website";
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";

  export default {
    data() {
      const validatePass = (rule, value, callback) => {
        if (value === '') {
          callback(new Error('请输入密码'));
      if (value === "") {
        callback(new Error("请输入密码"));
        } else {
          callback();
        }
      };
      const validatePass2 = (rule, value, callback) => {
        if (value === '') {
          callback(new Error('请再次输入密码'));
      if (value === "") {
        callback(new Error("请再次输入密码"));
        } else if (value !== this.form.password) {
          callback(new Error('两次输入密码不一致!'));
        callback(new Error("两次输入密码不一致!"));
        } else {
          callback();
        }
@@ -254,12 +267,12 @@
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        platformPage: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        init: {
          roleTree: [],
@@ -267,38 +280,40 @@
        },
        props: {
          label: "title",
          value: "key"
        value: "key",
        },
        roleGrantList: [],
        roleTreeObj: [],
        treeDeptId: '',
      treeDeptId: "",
        treeData: [],
        treeOption: {
          nodeKey: 'id',
        nodeKey: "id",
          lazy: true,
          treeLoad: function (node, resolve) {
            const parentId = (node.level === 0) ? 0 : node.data.id;
            getDeptLazyTree(parentId).then(res => {
              resolve(res.data.data.map(item => {
          const parentId = node.level === 0 ? 0 : node.data.id;
          getDeptLazyTree(parentId).then((res) => {
            resolve(
              res.data.data.map((item) => {
                return {
                  ...item,
                  leaf: !item.hasChildren
                }
              }))
                  leaf: !item.hasChildren,
                };
              })
            );
            });
          },
          addBtn: false,
          menu: false,
          size: 'small',
        size: "small",
          props: {
            labelText: '标题',
            label: 'title',
            value: 'value',
            children: 'children'
          }
          labelText: "标题",
          label: "title",
          value: "value",
          children: "children",
        },
        },
        option: {
          height: 'auto',
        height: "auto",
          calcHeight: 80,
          tip: false,
          searchShow: true,
@@ -336,7 +351,7 @@
                    required: true,
                    message: "请选择组织机构",
                    trigger: "blur",
                  }
                  },
                ],
              },
              {
@@ -347,24 +362,29 @@
                    required: true,
                    message: "请输入登录账号",
                    trigger: "blur",
                  }
                  },
                ],
                // disabled: true,
              },{
                  label: '密码',
                  prop: 'password',
                  hide: true,
                  editDisplay: false,
                  viewDisplay: false,
                  rules: [{required: true, validator: validatePass, trigger: 'blur'}]
                },
                {
                  label: '确认密码',
                  prop: 'password2',
                label: "密码",
                prop: "password",
                  hide: true,
                  editDisplay: false,
                  viewDisplay: false,
                  rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
              },
              {
                label: "确认密码",
                prop: "password2",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [
                  { required: true, validator: validatePass2, trigger: "blur" },
                ],
                },
              {
                label: "用户姓名",
@@ -389,7 +409,8 @@
              {
                label: "用户昵称",
                prop: "name",
              }, {
              },
              {
                label: "所属行政区",
                prop: "jurisdiction",
                // multiple: true,
@@ -408,7 +429,8 @@
                    trigger: "click",
                  },
                ],
              },{
              },
              {
                label: "所属角色",
                prop: "roleId",
                multiple: true,
@@ -421,12 +443,13 @@
                slot: true,
                rules: [
                  {
                    required: false,
                    required: true,
                    message: "请选择所属角色",
                    trigger: "click",
                  },
                ],
              },{
              },
              {
                label: "所属岗位",
                prop: "postId",
                type: "tree",
@@ -492,7 +515,7 @@
                  value: "dictKey",
                },
                dataType: "number",
                slot: true
                slot: true,
              },
              {
                label: "政治面貌",
@@ -521,6 +544,7 @@
                label: "用户性别",
                prop: "sex",
                type: "select",
                slot: true,
                dicData: [
                  {
                    label: "男",
@@ -530,10 +554,10 @@
                    label: "女",
                    value: 2,
                  },
                  {
                    label: "未知",
                    value: 3,
                  },
                  // {
                  //   label: "未知",
                  //   value: 3,
                  // },
                ],
              },
              {
@@ -638,31 +662,31 @@
          viewBtn: true,
          dialogClickModal: false,
          menuWidth: 120,
          editBtnText: '配置',
        editBtnText: "配置",
          column: [
            {
              label: "登录账号",
              prop: "account",
              search: true,
              display: false
            display: false,
            },
            {
              label: "所属保安单位",
              prop: "tenantName",
              slot: true,
              display: false
            display: false,
            },
            {
              label: "用户姓名",
              prop: "realName",
              search: true,
              display: false
            display: false,
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            display: false,
            },
            {
              label: "用户平台",
@@ -670,18 +694,20 @@
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              value: "dictKey",
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
            rules: [
              {
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "用户拓展",
@@ -701,17 +727,17 @@
          emptyBtn: false,
          column: [
            {
              label: '模板上传',
              prop: 'excelFile',
              type: 'upload',
            label: "模板上传",
            prop: "excelFile",
            type: "upload",
              drag: true,
              loadText: '模板上传中，请稍等',
            loadText: "模板上传中，请稍等",
              span: 24,
              propsHttp: {
                res: 'data'
              res: "data",
              },
              tip: '请上传 .xls,.xlsx 标准格式文件',
              action: "/api/blade-user/import-user"
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/blade-user/import-user",
            },
            {
              label: "数据覆盖",
@@ -722,12 +748,12 @@
              dicData: [
                {
                  label: "否",
                  value: 0
                value: 0,
                },
                {
                  label: "是",
                  value: 1
                }
                value: 1,
              },
              ],
              value: 0,
              slot: true,
@@ -735,32 +761,35 @@
                {
                  required: true,
                  message: "请选择是否覆盖",
                  trigger: "blur"
                }
              ]
                trigger: "blur",
              },
            ],
            },
            {
              label: '模板下载',
              prop: 'excelTemplate',
            label: "模板下载",
            prop: "excelTemplate",
              formslot: true,
              span: 24,
            }
          ]
        }
          },
        ],
      },
      };
    },
    watch: {
      'form.tenantId'() {
        if (this.form.tenantId !== '' && this.initFlag) {
    "form.tenantId"() {
      if (this.form.tenantId !== "" && this.initFlag) {
          this.initData(this.form.tenantId);
        }
      },
      'excelForm.isCovered'() {
        if (this.excelForm.isCovered !== '') {
    "form.deptId"() {
      this.initData(this.form.tenantId);
    },
    "excelForm.isCovered"() {
      if (this.excelForm.isCovered !== "") {
          const column = this.findObject(this.excelOption.column, "excelFile");
          column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
        }
      }
    },
    },
    computed: {
      ...mapGetters(["userInfo", "permission"]),
@@ -777,12 +806,12 @@
          addBtn: false,
          viewBtn: false,
          delBtn: false,
          editBtn: this.vaildData(this.permission.user_edit, false)
        editBtn: this.vaildData(this.permission.user_edit, false),
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
@@ -798,8 +827,8 @@
      //行点击事件
      rowClick(row) {
        this.$router.push({
          path: "/securityGuard/securityGuardDetail",
          query: { row: row },
        path: "/securityGuardDetail",
        query: { row: JSON.stringify(row) },
        });
      },
      nodeClick(data) {
@@ -808,15 +837,15 @@
        this.onLoad(this.page);
      },
      initData(tenantId) {
        getRoleTree(tenantId).then(res => {
      getRoleTree(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "roleId");
          column.dicData = res.data.data;
        });
        getDeptTree(tenantId).then(res => {
      getDeptTree(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "deptId");
          column.dicData = res.data.data;
        });
        getPostList(tenantId).then(res => {
      getPostList(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "postId");
          column.dicData = res.data.data;
        });
@@ -827,13 +856,12 @@
          this.roleBox = false;
          this.$message({
            type: "success",
            message: "操作成功!"
          message: "操作成功!",
          });
          this.onLoad(this.page);
        });
      },
      rowSave(row, done, loading) {
        debugger;
        if(row.deptId){
            row.deptId = row.deptId;
        }
@@ -912,6 +940,8 @@
          });
        }
        var IdCardNo = row.cardid;
      //值替换，education 放在页面会卡死
      row.education = row.education1;
        update(row).then(
          () => {
            const experience = {
@@ -959,7 +989,7 @@
      },
      searchReset() {
        this.query = {};
        this.treeDeptId = '';
      this.treeDeptId = "";
        this.onLoad(this.page);
      },
      searchChange(params, done) {
@@ -983,7 +1013,7 @@
        this.$confirm("确定将选择用户注销?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(this.ids);
@@ -992,7 +1022,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
@@ -1005,7 +1035,7 @@
        this.$confirm("确定将选择账号密码重置为123456?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return resetPassword(this.ids);
@@ -1013,7 +1043,7 @@
          .then(() => {
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
@@ -1027,7 +1057,7 @@
        if (this.selectionList.length === 1) {
          this.roleTreeObj = this.selectionList[0].roleId.split(",");
        }
        getRoleTree().then(res => {
      getRoleTree().then((res) => {
          this.roleGrantList = res.data.data;
          this.roleBox = true;
        });
@@ -1048,19 +1078,37 @@
        this.$confirm("是否导出用户数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        }).then(() => {
          window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
        window.open(
          `/api/blade-user/export-user?${
            this.website.tokenHeader
          }=${getToken()}&account=${this.search.account}&realName=${
            this.search.realName
          }`
        );
        });
      },
      handleTemplate() {
        window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
      window.open(
        `/api/blade-user/export-template?${
          this.website.tokenHeader
        }=${getToken()}`
      );
      },
      beforeOpen(done, type) {
        var that = this;
        if (["edit", "view"].includes(type)) {
          getUser(this.form.id).then(res => {
        getUser(this.form.id).then((res) => {
            this.form = res.data.data;
          var d = {
            education1: res.data.data.education,
          };
          this.form = {
            ...this.form,
            ...d,
          };
          // this.from["education1"] = res.data.data.education;
            if(this.form.hasOwnProperty("deptId")){
              this.form.deptId = this.form.deptId;
            }
@@ -1090,31 +1138,43 @@
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
      let values = {
        ...params,
      };
      values = {
        ...params,
        ...this.query,
      };
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
      getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(
        (res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
        }
      );
      },
      platformRowUpdate(row, index, done, loading) {
        updatePlatform(row.id, row.userType, row.userExt).then(() => {
      updatePlatform(row.id, row.userType, row.userExt).then(
        () => {
          this.platformOnLoad(this.platformPage);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      platformBeforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getUserPlatform(this.platformForm.id).then(res => {
        getUserPlatform(this.platformForm.id).then((res) => {
            this.platformForm = res.data.data;
          });
        }
@@ -1148,15 +1208,20 @@
      },
      platformOnLoad(page, params = {}) {
        this.platformLoading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query),
        this.treeDeptId
      ).then((res) => {
          const data = res.data.data;
          this.platformPage.total = data.total;
          this.platformData = data.records;
          this.platformLoading = false;
          this.selectionClear();
        });
      }
    }
    },
  },
  };
</script>


 src/views/securityGuard/securityGuardDetail.vue

@@ -2,8 +2,7 @@
  <div class="dispatch">
    <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
    <span v-if="typeTABS.prop === 'tab1'">
      <avue-form ref="form" v-model="obj0" :option="option0">
      </avue-form>
      <avue-form ref="form" v-model="obj0" :option="option0"> </avue-form>
    </span>
    <span v-else-if="typeTABS.prop === 'tab2'">
      <avue-crud
@@ -32,9 +31,13 @@
</template> 

<script>
import { securityBaseInfoColumn, practitionersColumn,trackRecordColumn } from "./data";
import {
  securityBaseInfoColumn,
  practitionersColumn,
  trackRecordColumn,
} from "./data";
import {getUserPractitionersInfo} from "@/api/system/user";
import {add,update,page,remove,getPerformanceInfo} from "@/api/performance/performance";
import { add, update, page, remove } from "@/api/performance/performance";
export default {
  data() {
    return {
@@ -91,10 +94,10 @@
      data1: [],
      data2: [],
      option1: {
        card: false,
        card: true,
        menu:false,
        addBtn:false,
        height:'auto',
        height: "auto",
        widtd:"auto",
        calcHeight: 54,
        border: false,
@@ -102,14 +105,14 @@
        tip: false,
        index: true,
        dialogClickModal: false,
        headerAlign: 'center',
        align: 'center',
        headerAlign: "center",
        align: "center",
        column: practitionersColumn,
      },
      option2: {
        card: true,
        menu:true,
        height:'auto',
        height: "auto",
        widtd:"auto",
        calcHeight: 54,
        border: false,
@@ -117,8 +120,8 @@
        tip: false,
        index: true,
        dialogClickModal: false,
        headerAlign: 'center',
        align: 'center',
        headerAlign: "center",
        align: "center",
        column: trackRecordColumn,
      },
    };
@@ -151,27 +154,28 @@
    getPractitionersPageInfo(){
        var that = this;
        //获取用户从业信息
        getUserPractitionersInfo(this.cardid).then(res1 =>{
      getUserPractitionersInfo(this.cardid).then((res1) => {
            that.data1 = res1.data.data;
        })
      });
    },
    //查询当前保安员的现实表现记录信息
    getPerformancePageInfo(){
        //获取现实表现信息
        var param = {
          cardid:this.cardid
        }
        page(this.current,this.size,param).then(res2 =>{
        cardid: this.cardid,
      };
      page(this.current, this.size, param).then((res2) => {
            const data = res2.data.data;
            this.page2.total = data.total;
            this.data2 = data.records;
            console.log(this.data2, 1);
            this.loading2 = false;
        })
      });
    },
    rowSave2(form, done, loading) {
      form.cardid = this.cardid;
      add(form).then((res) => {
      add(form).then(
        (res) => {
          this.getPerformancePageInfo(this.page2);
          this.$message({
            type: "success",
@@ -223,8 +227,10 @@
  },
  mounted() {
    this.typeTABS = this.optionTABS.column[0];
    if (this.$route.query.row) {
      var row = this.$route.query.row;
    var data = JSON.parse(this.$route.query.row);
    if (data) {
      var row = data;
      // var row = this.$route.query.row;
      for (var k in row) {
        this.obj0[k] = row[k];
      }
@@ -234,6 +240,22 @@
      this.dispatcherCompany = row.dispatcherCompany;
      this.id = row.id;
    }

    var flag = false,
      i = 0,
      ind = null;
    this.$store.state.tags.tagList.forEach((item, index) => {
      if (item.label == "保安员详情") {
        if (flag == false) {
          ind = index;
          flag = true;
        }
        i++;
      }
    });
    if (i > 1) {
      this.$store.state.tags.tagList.splice(ind, 1);
    }
  },
};
</script>