Merge remote-tracking branch 'origin/feature/v2.3.0-liugh-zktManage' into feature/v2.3.0-linqian-zktManage

src/pages/data-auth-module/property-management/DataConfig.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Liugh
  * @Date: 2021-05-17 15:38:23
- * @LastEditTime: 2021-05-17 17:17:51
+ * @LastEditTime: 2021-05-18 14:43:49
  * @LastEditors: Do not edit
  * @Description:
  */
@@ -37,6 +37,33 @@ const UserTableData = [
         prop: ""
     }
 ];
+const ApplicationTableData = [
+    {
+        label: "应用系统名称",
+        prop: ""
+    },
+    {
+        label: "应用系统编号",
+        prop: ""
+    },
+    {
+        label: "应用英文名称",
+        prop: ""
+    },
+    {
+        label: "应用在用标识",
+        prop: ""
+    },
+    {
+        label: "上线日期",
+        prop: ""
+    },
+    {
+        label: "应用系统运维单位名称",
+        width: "180px",
+        prop: ""
+    }
+];
 const typeData = {
     jy: [
         { label: "姓名", value: "name" },
@@ -69,5 +96,28 @@ const typeData = {
         { label: "人员类型", value: "typePersonnel" }
     ]
 };
+const institutionField = [
+    { label: "上级行政机构", value: "upGovName" },
+    { label: "机构类型", value: "orgType" },
+    { label: "机构名称", value: "fullName" },
+    { label: "行政区划", value: "areaCode" },
+    { label: "机构代码", value: "upGovCode" },
+    { label: "机构类别", value: "unitClass" },
+    { label: "单位层级", value: "orgLevel" },
+    { label: "单位级别", value: "orgCode" },
+    { label: "单位类别", value: "orgKind" }
+];
+const applicationField = [
+    { label: "应用系统名称", value: "applyName" },
+    { label: "应用系统编号", value: "applyCode" },
+    { label: "应用英文名称", value: "appEnglishName" },
+    { label: "应用在用标识", value: "applyStatus" },
+    { label: "上线日期", value: "lineTime" },
+    { label: "应用系统事权单位代码", value: "managerOrgCode" },
+    { label: "应用负责人", value: "fzr" },
+    { label: "应用系统运维单位名称", value: "appOpsDepName" },
+    { label: "应用系统管理单位名称", value: "managerOrgName" },
+    { label: "应用系统说明", value: "managerDescribe" }
+];
 
-export { UserTableData, typeData };
+export { UserTableData, typeData, institutionField, ApplicationTableData, applicationField };

src/pages/data-auth-module/property-management/application-management/application-properties.vue

@@ -0,0 +1,168 @@
+<!--
+ * @Author: Liugh
+ * @Date: 2021-05-18 11:34:15
+ * @LastEditTime: 2021-05-18 14:24:33
+ * @LastEditors: Do not edit
+ * @FilePath: \auth-web\src\pages\data-auth-module\property-management\application-management\application-properties.vue
+ * @Description: 
+-->
+<template>
+    <main class="application-properties">
+        <el-form ref="ruleForm" inline :rules="rules" :model="form">
+            <el-form-item label="应用系统名称">
+                <el-input v-model="form.name" placeholder="请输入应用系统名称"></el-input>
+            </el-form-item>
+            <el-form-item label="应用在用标识">
+                <el-select v-model="form.userType" placeholder="请选择应用在用标识" style="width:13rem">
+                    <el-option label="全部" value="all"></el-option>
+                    <el-option label="启用" value="1"></el-option>
+                    <el-option label="停用" value="0"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="应用系统事权单位代码">
+                <el-input v-model="form.name" placeholder="请输入应用系统事权单位代码"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
+            </el-form-item>
+            <el-form-item label="最近同步时间：" style="float:right">
+                <span>2021-04-08 12:00:00</span>
+            </el-form-item>
+        </el-form>
+        <div class="buttonGroup">
+            <dg-button type="primary" @click="handleLeading" icon="el-icon-upload2">导入</dg-button>
+            <dg-button type="primary" @click="handleSynchro" icon="el-icon-refresh">同步</dg-button>
+            <dg-button type="text" @click="handleInfo">详情</dg-button>
+        </div>
+
+        <Table ref="myTable" :url="tableUrl" :headerData="ApplicationTableData" :condition="reportForm">
+            <dg-table-column fixed="right" label="操作" align="center">
+                <template>
+                    <dg-button type="text" @click="handleInfo">详情</dg-button>
+                </template>
+            </dg-table-column>
+        </Table>
+    </main>
+</template>
+
+<script>
+import Table from "@/pages/common/table";
+import { ApplicationTableData } from "../DataConfig";
+import * as dynamicManageApi from "@/api/dynamic-manage";
+import detail from "./detail";
+const editorArea = ["900px", "660px"];
+export default {
+    name: "application-properties", // 组件名称
+    props: {
+        // 接收父组件的数据
+    },
+    data() {
+        // 组件内部参数
+        return {
+            // 参数名称及默认值
+            form: {},
+            rules: {},
+            options: [
+                {
+                    id: "fruits",
+                    label: "Fruits",
+                    children: [
+                        {
+                            id: "apple",
+                            label: "Apple",
+                            isNew: true
+                        },
+                        {
+                            id: "grapes",
+                            label: "Grapes",
+                            disabled: true
+                        },
+                        {
+                            id: "pear",
+                            label: "Pear"
+                        },
+                        {
+                            id: "strawberry",
+                            label: "Strawberry 🍓"
+                        },
+                        {
+                            id: "watermelon",
+                            label: "Watermelon 🍉"
+                        }
+                    ]
+                },
+                {
+                    id: "vegetables",
+                    label: "Vegetables",
+                    children: [
+                        {
+                            id: "corn",
+                            label: "Corn 🌽"
+                        },
+                        {
+                            id: "carrot",
+                            label: "Carrot 🥕"
+                        },
+                        {
+                            id: "eggplant",
+                            label: "Eggplant 🍆"
+                        },
+                        {
+                            id: "tomato",
+                            label: "Tomato 🍅"
+                        }
+                    ]
+                }
+            ],
+            ApplicationTableData,
+            tableUrl: dynamicManageApi.tableUrl,
+            reportForm: {}
+        };
+    },
+    computed: {}, // 计算属性
+    watch: {}, // 侦听器（扩展的计算属性）
+    components: { Table }, // 注册局部组件
+    methods: {
+        /**
+         * @description:表单查询方法
+         */
+        handleSearch() {},
+        /**
+         * @description:导入方法
+         */
+        handleLeading() {},
+        /**
+         * @description:同步方法
+         */
+        handleSynchro() {},
+        /**
+         * @description:详情
+         */
+        handleInfo() {
+            const layer = this.$dgLayer({
+                title: "详情",
+                shade: [0.4, "#FFF"],
+                content: detail,
+                props: {},
+                on: {
+                    success() {
+                        layer.close(layer.dialogIndex);
+                    }
+                },
+                area: editorArea
+            });
+        }
+    }, // 内部方法
+    beforeCreate() {}, // 组件创建前
+    created() {}, // 组件创建完成后
+    beforeMount() {}, // 组件挂载前
+    mounted() {}, // 组件挂载完成后
+    beforeUpdate() {}, // 组件更新前
+    updated() {}, // 组件挂载完成后
+    beforeDestroy() {}, // 组件销毁前
+    destroyed() {} // 组件销毁完成后
+};
+</script>
+<style lang="scss" scoped>
+@import "../index.scss";
+</style>

src/pages/data-auth-module/property-management/application-management/detail.vue

@@ -0,0 +1,71 @@
+<!--
+ * @Author: Liugh
+ * @Date: 2021-05-17 16:22:06
+ * @LastEditTime: 2021-05-18 14:47:03
+ * @LastEditors: Do not edit
+ * @Description: 
+-->
+<template>
+    <main class="user-attributes-detail">
+        <el-form ref="ruleForm" :model="data" label-width="160px">
+            <el-row>
+                <!-- TODO 如果需要多个占一行，请使用计算属性，或者方法 -->
+                <el-col
+                    :span="item.value == 'managerDescribe' ? 24 : 12"
+                    v-for="(item, index) in applicationField"
+                    :key="index"
+                >
+                    <el-form-item :label="item.label">
+                        <span>{{ data[item.value] }}</span>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+    </main>
+</template>
+
+<script>
+import { applicationField } from "../DataConfig";
+export default {
+    name: "user-attributes-detail", // 组件名称
+    props: {
+        data: {
+            type: Object,
+            default() {
+                return {
+                    applyName: "测试数据中",
+                    applyCode: "测试数据中",
+                    appEnglishName: "测试数据中",
+                    applyStatus: "测试数据中",
+                    lineTime: "测试数据中",
+                    managerOrgCode: "测试数据中",
+                    fzr: "测试数据中",
+                    appOpsDepName: "测试数据中",
+                    managerOrgName: "测试数据中",
+                    managerDescribe: "测试数据中"
+                };
+            }
+        }
+    },
+    data() {
+        // 组件内部参数
+        return {
+            // 参数名称及默认值
+            applicationField
+        };
+    },
+    computed: {}, // 计算属性
+    watch: {}, // 侦听器（扩展的计算属性）
+    components: {}, // 注册局部组件
+    methods: {}, // 内部方法
+    beforeCreate() {}, // 组件创建前
+    created() {}, // 组件创建完成后
+    beforeMount() {}, // 组件挂载前
+    mounted() {}, // 组件挂载完成后
+    beforeUpdate() {}, // 组件更新前
+    updated() {}, // 组件挂载完成后
+    beforeDestroy() {}, // 组件销毁前
+    destroyed() {} // 组件销毁完成后
+};
+</script>
+<style lang="scss" scoped></style>

src/pages/data-auth-module/property-management/application-properties.vue

@@ -1,7 +0,0 @@
-<!--
- * @Author: Liugh
- * @Date: 2021-05-17 14:53:49
- * @LastEditTime: 2021-05-17 14:53:49
- * @LastEditors: Do not edit
- * @Description: 
--->

src/pages/data-auth-module/property-management/index.scss

@@ -1,12 +1,28 @@
 /*
  * @Author: Liugh
  * @Date: 2021-05-17 15:18:43
- * @LastEditTime: 2021-05-17 15:43:21
+ * @LastEditTime: 2021-05-18 11:40:29
  * @LastEditors: Do not edit
  * @Description: 
  */
-.user-attributes {
+.user-attributes,
+.institutional-attributes,
+.application-properties {
     .buttonGroup {
         margin-bottom: 20px;
     }
 }
+.institutional-attributes {
+    h4 {
+        font-size: 14px;
+        height: 48px;
+        line-height: 48px;
+        padding: 0 15px;
+        border: 0 none;
+        background-color: #eef2fa;
+        text-align: left;
+    }
+    .institutional-info {
+        margin-top: 2.5rem;
+    }
+}

src/pages/data-auth-module/property-management/institutional-attributes.vue

@@ -1,7 +1,138 @@
 <!--
  * @Author: Liugh
  * @Date: 2021-05-17 14:53:19
- * @LastEditTime: 2021-05-17 14:53:19
+ * @LastEditTime: 2021-05-18 11:24:49
  * @LastEditors: Do not edit
+ * @FilePath: \auth-web\src\pages\data-auth-module\property-management\institutional-attributes.vue
  * @Description: 
 -->
+<template>
+    <main class="institutional-attributes">
+        <el-form ref="ruleForm" inline :rules="rules" :model="form">
+            <el-form-item label="机构名称">
+                <el-input v-model="form.name" placeholder="请输入机构名称"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
+            </el-form-item>
+
+            <el-form-item label="最近同步时间：" style="float:right">
+                <span>2021-04-08 12:00:00</span>
+            </el-form-item>
+        </el-form>
+
+        <div class="buttonGroup">
+            <dg-button type="primary" @click="handleLeading" icon="el-icon-upload2">导入</dg-button>
+            <dg-button type="primary" @click="handleSynchro" icon="el-icon-refresh">同步</dg-button>
+        </div>
+
+        <dg-row :gutter="20">
+            <dg-col :span="5">
+                <tree
+                    ref="tree"
+                    class="u-pm__left"
+                    title="机构列表"
+                    @handleGetNode="handleGetNode"
+                    @submitRootNode="submitRootNode"
+                />
+            </dg-col>
+            <dg-col :span="19">
+                <h4 class="dg-words-title-second">机构管理</h4>
+                <el-form class="institutional-info" ref="form" :model="formInfo" label-suffix=":" label-width="120px">
+                    <el-row>
+                        <el-col :span="12" v-for="(item, index) in institutionField" :key="index">
+                            <el-form-item :label="item.label">
+                                <span>{{ formInfo[item.value] }}</span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </dg-col>
+        </dg-row>
+    </main>
+</template>
+
+<script>
+import Tree from "@/pages/common/tree";
+import { institutionField } from "./DataConfig";
+import * as empowMegApi from "@/api/empower-manage";
+export default {
+    name: "institutional-attributes", // 组件名称
+    props: {
+        // 接收父组件的数据
+    },
+    data() {
+        // 组件内部参数
+        return {
+            // 参数名称及默认值
+            institutionField,
+            form: {},
+            formInfo: {
+                upGovName: "测试",
+                orgType: "测试",
+                fullName: "测试",
+                areaCode: "测试",
+                upGovCode: "测试",
+                unitClass: "测试",
+                orgLevel: "测试",
+                orgCode: "测试",
+                orgKind: "测试"
+            },
+            rules: {},
+            tableUrl: empowMegApi.tableUrl,
+            reportPersionForm: {
+                applyName: { value: "", op: "like" },
+                orgId: { value: "", op: "=" }
+            }
+        };
+    },
+    computed: {}, // 计算属性
+    watch: {}, // 侦听器（扩展的计算属性）
+    components: { Tree }, // 注册局部组件
+    methods: {
+        /**
+         * @description:导入方法
+         */
+        handleLeading() {},
+        /**
+         * @description:同步方法
+         */
+        handleSynchro() {},
+        /**
+         * @description:树方法
+         */
+        handleGetNode({ id }) {
+            const that = this;
+            const oldVal = that.reportPersionForm.orgId.value;
+            if (oldVal != id) {
+                that.reportPersionForm.orgId.value = id;
+                that.handleSearch();
+            }
+        },
+        /**
+         * @description: 默认查询跟节点
+         */
+        submitRootNode({ id, name }) {
+            const that = this;
+            this.$nextTick(() => {
+                that.handleGetNode({ id, name });
+            });
+        },
+        /**
+         * @description: 表单查询
+         */
+        handleSearch() {}
+    }, // 内部方法
+    beforeCreate() {}, // 组件创建前
+    created() {}, // 组件创建完成后
+    beforeMount() {}, // 组件挂载前
+    mounted() {}, // 组件挂载完成后
+    beforeUpdate() {}, // 组件更新前
+    updated() {}, // 组件挂载完成后
+    beforeDestroy() {}, // 组件销毁前
+    destroyed() {} // 组件销毁完成后
+};
+</script>
+<style lang="scss" scoped>
+@import "./index.scss";
+</style>

src/pages/data-auth-module/property-management/user-management/user-attributes.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Liugh
  * @Date: 2021-05-17 14:52:53
- * @LastEditTime: 2021-05-18 09:45:46
+ * @LastEditTime: 2021-05-18 14:41:23
  * @LastEditors: Do not edit
  * @Description: 
 -->
@@ -36,6 +36,10 @@
             <el-form-item>
                 <dg-button type="primary" @click="handleSearch" icon="el-icon-search">查询</dg-button>
             </el-form-item>
+            
+            <el-form-item label="最近同步时间：" style="float:right">
+                <span>2021-04-08 12:00:00</span>
+            </el-form-item>
         </el-form>
         <div class="buttonGroup">
             <dg-button type="primary" @click="handleLeading" icon="el-icon-upload2">导入</dg-button>

src/router/modules/data-auth-module.js

@@ -28,7 +28,7 @@ const componentsRouter = [
             },
             {
                 path: "application-properties",
-                component: () => import("@/pages/data-auth-module/property-management/application-properties"),
+                component: () => import("@/pages/data-auth-module/property-management/application-management/application-properties"),
                 name: "application-properties",
                 meta: { title: "应用属性管理", noCache: false, permission: ["QXGL_SQKTGL_SJFJFLBM"] }
             },