Browse Source

修改细节

林倩 3 years ago
parent
commit
ba5e1ce1ec

+ 2 - 2
src/components/data-auth/table-column-auth.vue

@@ -19,8 +19,8 @@
             </div>
             <el-row class="property-wapper__right-btn">
                 <!-- <el-button @click="handleViewAuthList" v-if="showCheckListBtn">清单</el-button> -->
-                <el-button @click="handleReset">重置</el-button>
-                <el-button type="primary" @click="handleSave">保存</el-button>
+                <dg-button @click="handleReset" :icon="'重置' | optIcon">重置</dg-button>
+                <dg-button type="primary" @click="handleSave" :icon="'保存' | optIcon">保存</dg-button>
             </el-row>
         </div>
         <div v-else>

+ 0 - 302
src/pages/authorization-manage/author-source-manage.vue

@@ -1,302 +0,0 @@
-/** * 组件名称;权限配置-资源管理 * @author:laiyh * @Date:2020-07-27 */
-
-<template>
-    <dg-row :gutter="10" class="edit-source-box">
-        <dg-col :span="10">
-            <dg-card shadow="never" header="应用资源信息">
-                <div style="text-align: left;margin-bottom: 10px;">
-                    <dg-button type="primary" @click="handleAddSource">新增根资源</dg-button>
-                </div>
-
-                <menu-tree
-                    :isNeedRightMenu="true"
-                    apiName="menuTree"
-                    :reportForm="{ appId: appId }"
-                    @handleGetNode="handleGetNode"
-                    @selectOperaOptions="selectOperaOptions"
-                    :key="timer"
-                    ref="myMenuTree"
-                ></menu-tree>
-            </dg-card>
-        </dg-col>
-        <dg-col :span="14">
-            <dg-card shadow="never" header="资源详细信息">
-                <div v-show="isShowForm">
-                    <el-form
-                        ref="sizeForm"
-                        label-suffix=":"
-                        label-position="right"
-                        :model="sizeForm"
-                        label-width="90px"
-                        :rules="rules"
-                    >
-                        <el-form-item label="资源名称" prop="name">
-                            <el-input v-model="sizeForm.name" clearable maxlength="40"></el-input>
-                        </el-form-item>
-                        <el-form-item label="资源代码" prop="code">
-                            <el-input v-model="sizeForm.code" clearable maxlength="40"></el-input>
-                        </el-form-item>
-                        <el-form-item label="上级资源" prop="parentId">
-                            <dg-tree-drop
-                                ref="tree"
-                                icon-class="el-icon-folder-opened"
-                                icon-leaf="el-icon-document"
-                                v-model="sizeForm.parentId"
-                                placeholder="请选择"
-                                :props="parentTreeProps"
-                                :data="parentTreeOptions"
-                                clearable
-                                filterable
-                                style="width:100%"
-                            >
-                            </dg-tree-drop
-                        ></el-form-item>
-                        <el-form-item label="资源URL" prop="url">
-                            <el-input v-model="sizeForm.url" clearable maxlength="120"></el-input>
-                        </el-form-item>
-                        <el-form-item label="资源排序号" prop="seq">
-                            <el-input v-model.number="sizeForm.seq" clearable></el-input>
-                        </el-form-item>
-                    </el-form>
-                    <div class="warning-text">
-                        <p>*资源新增、删除:右键资源节点</p>
-                        <p>*资源代码:请填写上下级资源关联的字段信息</p>
-                    </div>
-                    <div class="form-footer-btn">
-                        <dg-button type="primary" @click="handleSave">保存</dg-button>
-                    </div>
-                </div>
-            </dg-card>
-        </dg-col>
-    </dg-row>
-</template>
-
-<script>
-import MenuTree from "@/pages/common/menu-tree";
-import * as commonApi from "@/api/common";
-import * as funeventApi from "@/api/funevent";
-import * as regular from "@/utils/regular";
-export default {
-    name: "",
-    components: { MenuTree },
-    // 接收父节点的参数
-    props: {
-        appId: {
-            type: String,
-            default: ""
-        }
-    },
-    watch: {
-        parentTreeOptions(newV, OldV) {
-            if (newV && newV.length > 0) {
-                this.isShowForm = true;
-            } else {
-                this.isShowForm = false;
-            }
-        }
-    },
-    // computed: {
-    //     isShowForm() {
-    //         return this.parentTreeOptions.length > 0 ? true : false;
-    //     }
-    // },
-    data() {
-        const that = this;
-        var checkSeq = (rule, value, callback) => {
-            if (value && !Number.isInteger(parseInt(value))) {
-                callback(new Error("无效的数字类型"));
-            } else {
-                callback();
-            }
-        };
-        var chechCode = (rule, value, callback) => {
-            if (!value) {
-                callback(new Error("请输入资源代码"));
-            }
-            if (!regular.checkNumLetter(value)) {
-                callback(new Error("请输入数字、字母、下划线、中划线、/组合!"));
-            }
-            callback();
-        };
-        var checkUrl = (rule, value, callback) => {
-            if (value && regular.checkChinese(value)) {
-                callback(new Error("不能包含中文或中文特殊符号!"));
-            }
-            callback();
-        };
-        return {
-            isShowForm: false,
-            parentTreeOptions: [],
-            parentTreeProps: {
-                value: "code",
-                label: "name",
-                children: "children"
-            },
-            sizeForm: {
-                appId: "",
-                menuId: "",
-                newMenuPid: "",
-                name: "",
-                code: "",
-                parentId: "",
-                url: "",
-                seq: ""
-            },
-            rules: {
-                name: [{ required: true, message: "请输入资源名称", trigger: "blur" }],
-                code: [
-                    { required: true, message: "请输入资源代码", trigger: "blur" },
-                    { validator: chechCode, trigger: "blur" }
-                ],
-                seq: [{ validator: checkSeq, trigger: "blur" }],
-                url: [{ validator: checkUrl, trigger: "blur" }]
-            },
-            timer: null,
-            type: null
-        };
-    },
-    // 方法
-    methods: {
-        handleGetNode(data) {
-            this.sizeForm = {
-                ...data,
-                parentId: data.pid ? data.pid : ""
-                // newMenuPid: data.pid ? data.pid : ""
-            };
-        },
-        selectOperaOptions({ type, nodedata, node }) {
-            // console.log(type, nodedata, node);
-            this.type = type;
-            for (var key in this.sizeForm) {
-                this.sizeForm[key] = "";
-            }
-            if (type === "add") {
-                // this.sizeForm.newMenuPid = nodedata.code || "";
-                this.sizeForm.parentId = nodedata.code || "";
-            } else if (type === "addRootSource") {
-            } else if (type === "delete") {
-                this.handleDel(nodedata.id);
-            }
-        },
-        // 新增
-        handleAddSource() {
-            this.isShowForm = true;
-            this.sizeForm = {
-                appId: "",
-                menuId: "",
-                newMenuPid: "",
-                name: "",
-                code: "",
-                parentId: "",
-                url: "",
-                seq: ""
-            };
-        },
-        // 获取上级资源
-        getParentTree() {
-            const that = this;
-            const { appId } = that;
-            commonApi.menuTree({ appId }).then(res => {
-                that.parentTreeOptions = res;
-            });
-        },
-        // 刪除节点
-        handleDel(id) {
-            const that = this;
-            let params = {
-                deletedId: id,
-                appId: that.appId
-            };
-            that.$confirm("删除资源将会删除该资源及其下级资源,确认删除?", "提示", {
-                distinguishCancelAndClose: true,
-                confirmButtonText: "确定",
-                cancelButtonText: "取消"
-            }).then(_ => {
-                funeventApi
-                    .delSource(params)
-                    .then(res => {
-                        that.$refs.myMenuTree.remove();
-                        that.timer = new Date().getTime(); // 刷新树组件
-                        that.getParentTree();
-                        this.$message.success("删除成功!");
-                    })
-                    .catch(err => {
-                        that.$message.error("删除失败!");
-                    });
-            });
-        },
-        handleSave() {
-            const that = this;
-            const { sizeForm } = that;
-            sizeForm.appId = that.appId;
-            const { type } = that;
-            // console.log(sizeForm);
-            // type=null 修改   type=add 新增  type=addRootSource新增根资源
-            if (type) {
-                sizeForm.newMenuPid = "";
-            } else {
-                if (sizeForm.code && sizeForm.code == sizeForm.parentId) {
-                    that.$message.error("上级资源不能是自己!");
-                    return;
-                }
-
-                sizeForm.newMenuPid = sizeForm.parentId;
-            }
-            that.$refs.sizeForm.validate(valid => {
-                if (!valid) {
-                    return false;
-                }
-                funeventApi
-                    .editSource(sizeForm)
-                    .then(res => {
-                        that.$message.success("保存成功");
-                        that.timer = new Date().getTime(); // 刷新树组件
-                        that.getParentTree();
-                        that.$refs.sizeForm.resetFields();
-                    })
-                    .catch(err => {
-                        that.$message.error("保存失败", err);
-                    });
-            });
-        }
-    },
-    // 页面创建完成$data可访问 $el不可以访问
-    created() {
-        this.getParentTree();
-    }
-};
-</script>
-
-<style lang="scss" scope>
-.edit-source-box {
-    /*.tree-operation-box {*/
-    /*border: 1px solid darkcyan;*/
-    /*background-color: #00adff;*/
-    /*width: 90px;*/
-    /*position: absolute;*/
-    /*z-index: 999;*/
-    /*.tree-operation-ul {*/
-    /*list-style: none;*/
-    /*li {*/
-    /*width: 100%;*/
-    /*cursor: pointer;*/
-    /*height: 25px;*/
-    /*color: #fff;*/
-    /*text-align: center;*/
-    /*font-size: 14px;*/
-    /*border-bottom: 1px solid #fff;*/
-    /*&:last-child {*/
-    /*border-bottom: none;*/
-    /*}*/
-    /*}*/
-    /*}*/
-    /*}*/
-    .warning-text {
-        margin-top: 60px;
-        color: #3598dc;
-    }
-    .form-footer-btn {
-        text-align: right;
-    }
-}
-</style>

+ 0 - 5
src/pages/authorization-manage/edit.vue

@@ -6,21 +6,16 @@
             <el-tab-pane label="角色管理" name="roleManage">
                 <author-role-manage :appId="sizeForm.id || ''" v-if="tabFirst" />
             </el-tab-pane>
-            <el-tab-pane label="资源管理" name="sourceManage">
-                <author-source-manage :appId="sizeForm.id || ''" v-if="tabSecond" />
-            </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
 <script>
 import AuthorRoleManage from "./author-role-manage";
-import AuthorSourceManage from "./author-source-manage";
 export default {
     name: "",
     components: {
         AuthorRoleManage,
-        AuthorSourceManage
     },
     // 接收父节点的参数
     props: {

+ 1 - 1
src/pages/common/menu-tree/index.vue

@@ -253,7 +253,7 @@ export default {
 }
 
 .u-tree__bar {
-    height: calc(100vh - 28rem);
+    height: 550px;
     .el-tree-node__edit {
         display: flex;
         justify-content: space-between;

+ 232 - 232
src/pages/data-auth-module/auth-object-manage/appfun-resource-manage/add-func-form.vue

@@ -5,254 +5,254 @@
 @Date: 2021-05-20 13:33
 -->
 <template>
-    <dg-row :gutter="10" class="func-wapper">
-        <dg-col :span="10">
-            <dg-card shadow="never" is-more>
-                <template slot="header">
-                    <div class="func-wapper__title">
-                        <span>功能资源信息</span>
-                        <dg-button type="primary" icon="el-icon-circle-plus-outline" @click="handleAddSource"
-                            >新增根功能</dg-button
-                        >
-                    </div>
-                </template>
-                <menu-tree
-                    :isNeedRightMenu="true"
-                    apiName="menuTree"
-                    :reportForm="{ appId: app.id }"
-                    @handleGetNode="handleGetNode"
-                    @selectOperaOptions="selectOperaOptions"
-                    :key="timer"
-                    ref="myMenuTree"
-                ></menu-tree>
-            </dg-card>
-        </dg-col>
-        <dg-col :span="14">
-            <dg-card shadow="never" header="功能详细信息">
-                <div v-show="isShowForm">
-                    <el-form ref="form" label-position="right" :model="form" label-width="150px" :rules="rules">
-                        <el-form-item label="功能编号:" prop="code">
-                            <el-input v-model="form.code" placeholder=""></el-input>
-                        </el-form-item>
-                        <el-form-item label="功能名称:" prop="name">
-                            <el-input v-model="form.name" placeholder=""></el-input>
-                        </el-form-item>
-                        <el-form-item label="上级功能:" prop="parentId">
-                            <dg-tree-drop
-                                ref="tree"
-                                icon-class="el-icon-folder-opened"
-                                icon-leaf="el-icon-document"
-                                v-model="form.parentId"
-                                :props="parentTreeProps"
-                                :data="treeData"
-                                :placeholder="form.isRoot?'':'请选择'"
-                                :disabled="form.isRoot"
-                                clearable
-                                filterable
-                                style="width: 100%"
-                            >
-                            </dg-tree-drop
-                        ></el-form-item>
-                        <el-form-item label="所属应用:" prop="appName">
-                            <el-input v-model="form.appName" placeholder="" disabled></el-input>
-                        </el-form-item>
-                        <el-form-item label="设计安全隐私类别:" prop="designSecureType">
-                            <dg-select
-                                v-model="form.designSecureType"
-                                placeholder=""
-                                enum="SecurityPrivacyEnum"
-                            ></dg-select>
-                        </el-form-item>
-                        <el-form-item label="在用状态:" prop="isActive">
-                            <dg-select enum="AppFunStatusEnum" v-model="form.isActive"></dg-select>
-                        </el-form-item>
-                        <el-form-item label="功能使用场景代码:" prop="functionUsageScenarios">
-                            <el-input v-model="form.functionUsageScenarios" placeholder=""></el-input>
-                        </el-form-item>
-                        <el-form-item label="功能说明:" prop="remark">
-                            <el-input v-model="form.remark" placeholder="" type="textarea" :rows="3"></el-input>
-                        </el-form-item>
-                    </el-form>
-                    <div class="func-wapper__btn-save">
-                        <dg-button type="primary" @click="handleSave">保存</dg-button>
-                    </div>
-                </div>
-            </dg-card>
-        </dg-col>
-    </dg-row>
+  <dg-row :gutter="10" class="func-wapper">
+    <dg-col :span="10">
+      <dg-card shadow="never" is-more>
+        <template slot="header">
+          <div class="func-wapper__title">
+            <span>功能资源信息</span>
+            <dg-button type="primary"  @click="handleAddSource">新增根功能</dg-button>
+          </div>
+        </template>
+        <menu-tree
+          :isNeedRightMenu="true"
+          apiName="menuTree"
+          :reportForm="{ appId: app.id }"
+          @handleGetNode="handleGetNode"
+          @selectOperaOptions="selectOperaOptions"
+          :key="timer"
+          ref="myMenuTree"
+        ></menu-tree>
+      </dg-card>
+    </dg-col>
+    <dg-col :span="14">
+      <dg-card shadow="never" header="功能详细信息">
+        <div style="height: 550px">
+          <div v-show="isShowForm">
+            <el-form ref="form" label-position="right" :model="form" label-width="150px" :rules="rules">
+              <el-form-item label="功能编号:" prop="code">
+                <el-input v-model="form.code" placeholder=""></el-input>
+              </el-form-item>
+              <el-form-item label="功能名称:" prop="name">
+                <el-input v-model="form.name" placeholder=""></el-input>
+              </el-form-item>
+              <el-form-item label="上级功能:" prop="parentId">
+                <dg-tree-drop
+                  ref="tree"
+                  icon-class="el-icon-folder-opened"
+                  icon-leaf="el-icon-document"
+                  v-model="form.parentId"
+                  :props="parentTreeProps"
+                  :data="treeData"
+                  :placeholder="form.isRoot ? '' : '请选择'"
+                  :disabled="form.isRoot"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                </dg-tree-drop
+              ></el-form-item>
+              <el-form-item label="所属应用:" prop="appName">
+                <el-input v-model="form.appName" placeholder="" disabled></el-input>
+              </el-form-item>
+              <el-form-item label="设计安全隐私类别:" prop="designSecureType">
+                <dg-select v-model="form.designSecureType" placeholder="" enum="SecurityPrivacyEnum"></dg-select>
+              </el-form-item>
+              <el-form-item label="在用状态:" prop="isActive">
+                <dg-select enum="AppFunStatusEnum" v-model="form.isActive"></dg-select>
+              </el-form-item>
+              <el-form-item label="功能使用场景代码:" prop="functionUsageScenarios">
+                <el-input v-model="form.functionUsageScenarios" placeholder=""></el-input>
+              </el-form-item>
+              <el-form-item label="功能说明:" prop="remark">
+                <el-input v-model="form.remark" placeholder="" type="textarea" :rows="3"></el-input>
+              </el-form-item>
+            </el-form>
+            <div class="func-wapper__btn-save">
+              <dg-button type="primary" @click="handleSave">保存</dg-button>
+            </div>
+          </div>
+        </div>
+      </dg-card>
+    </dg-col>
+    <!-- <dg-button v-footer @click="handleClose">取消</dg-button> -->
+  </dg-row>
 </template>
 
 <script>
-import MenuTree from "@/pages/common/menu-tree";
-import * as commonApi from "@/api/common";
-import * as Api from "@/api/func-resource";
+import MenuTree from '@/pages/common/menu-tree';
+import * as commonApi from '@/api/common';
+import * as Api from '@/api/func-resource';
 export default {
-    name: "",
-    components: { MenuTree },
-    // 接收父节点的参数
-    props: {
-        app: Object
+  name: '',
+  components: { MenuTree },
+  // 接收父节点的参数
+  props: {
+    app: Object
+  },
+  watch: {
+    treeData(newV, OldV) {
+      if (newV && newV.length > 0) {
+        this.isShowForm = true;
+      } else {
+        this.isShowForm = false;
+      }
+    }
+  },
+  data() {
+    return {
+      isShowForm: false,
+      treeData: [],
+      parentTreeProps: {
+        value: 'code',
+        label: 'name',
+        children: 'children'
+      },
+      form: {
+        appId: this.app.id,
+        appName: this.app.applyName,
+        code: '',
+        designSecureType: '',
+        functionUsageScenarios: '',
+        isActive: '',
+        name: '',
+        parentId: '',
+        remark: ''
+      },
+      rules: {
+        code: [{ required: true, message: '请输入功能编号', trigger: 'change' }],
+        name: [{ required: true, message: '请输入功能名称', trigger: 'change' }],
+        isActive: [{ required: true, message: '请选择在用状态', trigger: 'change' }],
+        appName: [{ required: true, message: '请选择应用', trigger: 'change' }]
+      },
+      timer: null,
+      type: null
+    };
+  },
+  // 方法
+  methods: {
+    handleClose() {
+      this.$emit("close");
     },
-    watch: {
-        treeData(newV, OldV) {
-            if (newV && newV.length > 0) {
-                this.isShowForm = true;
-            } else {
-                this.isShowForm = false;
-            }
-        }
+    changeRuleTrigger(type) {
+      for (const key in this.rules) {
+        this.rules[key][0].trigger = type;
+      }
+    },
+    handleGetNode(data) {
+      Api.detail(data.id).then((res) => {
+        this.form = res.data.content;
+      });
     },
-    data() {
-        return {
-            isShowForm: false,
-            treeData: [],
-            parentTreeProps: {
-                value: "code",
-                label: "name",
-                children: "children"
-            },
-            form: {
-                appId: this.app.id,
-                appName: this.app.applyName,
-                code: "",
-                designSecureType: "",
-                functionUsageScenarios: "",
-                isActive: "",
-                name: "",
-                parentId: "",
-                remark: ""
-            },
-            rules: {
-                code: [{ required: true, message: "请输入功能编号", trigger: "change" }],
-                name: [{ required: true, message: "请输入功能名称", trigger: "change" }],
-                isActive: [{ required: true, message: "请选择在用状态", trigger: "change" }],
-                appName: [{ required: true, message: "请选择应用", trigger: "change" }]
-            },
-            timer: null,
-            type: null
+    selectOperaOptions({ type, nodedata, node }) {
+      this.type = type;
+      if (type === 'add') {
+        this.changeRuleTrigger('blur');
+        this.form = {
+          appId: this.app.id,
+          appName: this.app.applyName,
+          code: '',
+          designSecureType: '',
+          functionUsageScenarios: '',
+          isActive: '',
+          name: '',
+          parentId: nodedata.code || '',
+          remark: ''
         };
+      } else if (type === 'delete') {
+        this.handleDel(nodedata.id);
+      }
     },
-    // 方法
-    methods: {
-        changeRuleTrigger(type) {
-            for (const key in this.rules) {
-                this.rules[key][0].trigger = type;
-            }
-        },
-        handleGetNode(data) {
-            Api.detail(data.id).then((res) => {
-                this.form = res.data.content;
-            });
-        },
-        selectOperaOptions({ type, nodedata, node }) {
-            this.type = type;
-            if (type === "add") {
-                this.changeRuleTrigger("blur");
-                this.form = {
-                    appId: this.app.id,
-                    appName: this.app.applyName,
-                    code: "",
-                    designSecureType: "",
-                    functionUsageScenarios: "",
-                    isActive: "",
-                    name: "",
-                    parentId: nodedata.code || "",
-                    remark: ""
-                };
-            } else if (type === "delete") {
-                this.handleDel(nodedata.id);
+    // 新增
+    handleAddSource() {
+      this.isShowForm = true;
+      this.changeRuleTrigger('blur');
+      this.form = {
+        isRoot: true,
+        appId: this.app.id,
+        appName: this.app.applyName,
+        code: '',
+        designSecureType: '',
+        functionUsageScenarios: '',
+        isActive: '',
+        name: '',
+        parentId: '',
+        remark: ''
+      };
+    },
+    /**
+     * 获取功能树
+     */
+    getFuncTree() {
+      commonApi.menuTree({ appId: this.app.id }).then((res) => {
+        this.treeData = res;
+      });
+    },
+    // 刪除节点
+    handleDel(id) {
+      this.$confirm('删除功能将会删除该功能及其下级资源,确认删除?', '提示', {}).then(() => {
+        Api.del(id)
+          .then((res) => {
+            this.$refs.myMenuTree.remove();
+            this.timer = new Date().getTime(); // 刷新树组件
+            this.getFuncTree();
+          })
+          .catch((err) => {
+            this.$message.error('删除失败!');
+          });
+      });
+    },
+    handleSave() {
+      // type=null 修改   type=add 新增  type=addRootSource新增根资源
+      this.changeRuleTrigger('change');
+      return new Promise((resolve) => {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            const { code, parentId } = this.form;
+            if (code == parentId) {
+              this.$message.error('上级资源不能是自己!');
+              return;
             }
-        },
-        // 新增
-        handleAddSource() {
-            this.isShowForm = true;
-            this.changeRuleTrigger("blur");
-            this.form = {
-                isRoot: true,
-                appId: this.app.id,
-                appName: this.app.applyName,
-                code: "",
-                designSecureType: "",
-                functionUsageScenarios: "",
-                isActive: "",
-                name: "",
-                parentId: "",
-                remark: ""
-            };
-        },
-        /**
-         * 获取功能树
-         */
-        getFuncTree() {
-            commonApi.menuTree({ appId: this.app.id }).then((res) => {
-                this.treeData = res;
-            });
-        },
-        // 刪除节点
-        handleDel(id) {
-            this.$confirm("删除功能将会删除该功能及其下级资源,确认删除?", "提示", {}).then(() => {
-                Api.del(id)
-                    .then((res) => {
-                        this.$refs.myMenuTree.remove();
-                        this.timer = new Date().getTime(); // 刷新树组件
-                        this.getFuncTree();
-                    })
-                    .catch((err) => {
-                        this.$message.error("删除失败!");
-                    });
-            });
-        },
-        handleSave() {
-            // type=null 修改   type=add 新增  type=addRootSource新增根资源
-            this.changeRuleTrigger("change");
-            return new Promise((resolve) => {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        const { code, parentId } = this.form;
-                        if (code == parentId) {
-                            this.$message.error("上级资源不能是自己!");
-                            return;
-                        }
 
-                        const data= {...this.form} ;
-                        delete data.isRoot;
+            const data = { ...this.form };
+            delete data.isRoot;
 
-                        const api = this.form.id ? "update" : "save";
-                        Api[api](data)
-                            .then((res) => {
-                                this.$message.success("保存成功!");
-                                this.timer = new Date().getTime(); // 刷新树组件
-                                this.getFuncTree();
-                                this.$refs.form.resetFields();
-                                resolve("成功");
-                            })
-                            .catch((error) => {
-                                this.$message.error(error);
-                            });
-                    }
-                });
-            });
-        }
-    },
-    created() {
-        this.getFuncTree();
+            const api = this.form.id ? 'update' : 'save';
+            Api[api](data)
+              .then((res) => {
+                this.$message.success('保存成功!');
+                this.timer = new Date().getTime(); // 刷新树组件
+                this.getFuncTree();
+                this.$refs.form.resetFields();
+                resolve('成功');
+              })
+              .catch((error) => {
+                this.$message.error(error);
+              });
+          }
+        });
+      });
     }
+  },
+  created() {
+    this.getFuncTree();
+  }
 };
 </script>
 
 <style lang="scss" scope>
 .func-wapper {
-    .warning-text {
-        margin-top: 60px;
-        color: #3598dc;
-    }
-    &__title {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-    }
-    &__btn-save {
-        text-align: right;
-    }
+  .warning-text {
+    margin-top: 60px;
+    color: #3598dc;
+  }
+  &__title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  &__btn-save {
+    text-align: right;
+  }
 }
 </style>

+ 7 - 3
src/pages/data-auth-module/auth-subject-manage/DataConfig.js

@@ -5,6 +5,7 @@
  * @LastEditors: Do not edit
  * @Description:
  */
+import { appRestApi } from '@/api/application';
 const pageOptList = ['导入', '同步']
 
 const userPropConditionForm =  [
@@ -83,10 +84,13 @@ const UserTableData = [
 const appConditionForm = [
   {
     label: '应用系统名称',
-    name: 'applyName',
-    op: 'like',
+    name: 'appName',
+    op: '=',
     value: '',
-    component: 'ElInput'
+    component: 'SelectApp',
+    apiUrl: appRestApi.table,
+    valueName: 'applyName',
+    labelName: 'applyName'
   },
   {
     label: '应用系统在用标识',

+ 2 - 2
src/pages/log-manage/err-auth-earlywarning-manage/auth-earlywarning-plan.vue

@@ -80,7 +80,7 @@ export default {
     handleViewEdit(row) {
       const vm = this;
       const layer = this.$dgLayer({
-        title: `异常鉴权预警方案修改`,
+        title: `修改`,
         shade: [0.4, '#FFF'],
         content: edit,
         skin: 'auth-earlywarning-plan-edit-layer',
@@ -101,7 +101,7 @@ export default {
      */
     handleViewDetail(row) {
       const layer = this.$dgLayer({
-        title: `异常鉴权预警方案详情`,
+        title: `详情`,
         shade: [0.4, '#FFF'],
         content: detail,
         props: {

+ 1 - 1
src/pages/service-delegate/index.vue

@@ -163,7 +163,7 @@ export default {
     },
     handleDelete({ id }) {
       const that = this;
-      that.$confirm(`是否确定删除这条数据`, '确认', {}).then(() => {
+      that.$confirm(`是否确定删除这条数据`, '确认', {}).then(() => {
         api.del(id).then(() => {
           that.handleSearch();
           that.$message.success('删除成功!');