Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -398,7 +398,7 @@
       display: flex;
       display: flex;
       position: relative;
       position: relative;
       font-size: 24px;
       font-size: 24px;
-      top: -11px;
+      top: -8px;
       width: 38%;
       width: 38%;
       height: 40px;
       height: 40px;
       margin-left: 28px;
       margin-left: 28px;

@@ -115,7 +115,7 @@
         .el-form-item__label {
         .el-form-item__label {
           color: #ffffff;
           color: #ffffff;
         }
         }
-        ::v-deep .el-input .el-input__inner {
+        .el-input .el-input__inner {
           padding: 0 8px;
           padding: 0 8px;
           height: 40px;
           height: 40px;
           line-height: 40px;
           line-height: 40px;

@@ -38,7 +38,6 @@
   import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
   import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
   import { getUserRoles } from "@/api/personnelManage";
   import { getUserRoles } from "@/api/personnelManage";
   import data from "./data";
   import data from "./data";
-  import sjsbTask from "@/api/sjsbTask.js";
   import { api, getAction, deleteAction } from "@/api/manageApi";
   import { api, getAction, deleteAction } from "@/api/manageApi";
   import tableMixin from "@/mixins/tableMixin.js";
   import tableMixin from "@/mixins/tableMixin.js";
   import EditDialog from "./edit-dialog.vue";
   import EditDialog from "./edit-dialog.vue";

@@ -44,7 +44,6 @@
   import { api, deleteAction } from '@/api/manageApi'
   import { api, deleteAction } from '@/api/manageApi'
   import data from "./data";
   import data from "./data";
   import { deleteDomStr } from '@/utils/proDomStr'
   import { deleteDomStr } from '@/utils/proDomStr'
-  import sjsbTask from "@/api/sjsbTask.js";
   import tableMixin from "@/mixins/tableMixin.js";
   import tableMixin from "@/mixins/tableMixin.js";
   import EditDialog from "./edit-dialog.vue";
   import EditDialog from "./edit-dialog.vue";
   export default {
   export default {