sasp-admin 0.2.62 → 0.2.64

package/src/views/threeinone/safeSpvEconView.vue

@@ -21,7 +21,7 @@
         <el-container class="econ-container">
             <safe-spv-main
                     ref="safeSpvEconMain"
-                    :safe-spv-info="safeSpvInfo"
+                    :safe-spv-info="safeSpvInfoObj"
                     :currentClickSpv="currentClickSpv"
                     :econDataArr="econDataArr"
                     :checkedEconObj="checkedEconObj"
@@ -95,6 +95,8 @@
         },
         data(){
             return {
+                regionId:"",
+                safeSpvInfoObj:{},
                 roleFlag:true,//访问权限
                 message:"",//无访问权限时的描述文字
                 spvTitle:"",//左侧树标题
@@ -129,10 +131,24 @@
             this.safeSpvInfo.isOpen = "0";
             this.safeSpvInfo.openStatus = "0";
             this.safeSpvInfo.econOneToMany = "N";*/
+            if(!this.defaultRegionId){
+              this.regionId = this.USER_GLOBAL.getLoginDept().regionId;
+              this.axios.post(this.api.safeRegion.getById,{id:this.regionId}).then(res => {
+                if(res&&res.data){
+                  this.safeSpvInfoObj = res.data;
+                }
+                this.getSafeSpvData();
+                this.initSpv();
+                this.isView();
+              })
+            }else{
+              this.regionId = this.defaultRegionId;
+              this.safeSpvInfoObj = this.safeSpvInfo;
+              this.getSafeSpvData();
+              this.initSpv();
+              this.isView();
+            }
 
-            this.getSafeSpvData();
-            this.initSpv();
-            this.isView();
         },
 
         watch:{
@@ -158,12 +174,12 @@
 
             initSpv(){
                 //无权限
-                if(this.safeSpvInfo.regionTier == "4"){
+                if(this.safeSpvInfoObj.regionTier == "4"){
                     this.roleFlag = false;
                     this.message = "街道用户无地区监管配置的权限，已沿用区县监管配置！";
                     return;
                 }
-                if(this.source != "1" && (!this.safeSpvInfo || !this.safeSpvInfo.id)){
+                if(this.source != "1" && (!this.safeSpvInfoObj || !this.safeSpvInfoObj.id)){
                     this.roleFlag = false;
                     this.message = "未找到当前账号所属的监管地区！！";
                     return;
@@ -177,10 +193,10 @@
                 if(this.source == "1"){
                     this.spvTitle = "“默认”";
                     this.$set(this.showBtn,"save",true);
-                }else if(this.safeSpvInfo.isOpen == "1" && this.safeSpvInfo.openStatus == '1'){//开启个性化按钮
+                }else if(this.safeSpvInfoObj.isOpen == "1" && this.safeSpvInfoObj.openStatus == '1'){//开启个性化按钮
                     this.spvTitle = "“使用默认配置”";
                     this.$set(this.showBtn,"personalize",true);
-                }else if(this.safeSpvInfo.isOpen == "1" && this.safeSpvInfo.openStatus == '9'){//开启默认配置、修改按钮
+                }else if(this.safeSpvInfoObj.isOpen == "1" && this.safeSpvInfoObj.openStatus == '9'){//开启默认配置、修改按钮
                     this.spvTitle = "“使用个性化配置”";
                     if(this.isEdit){
                         this.$set(this.showBtn,"return",true);
@@ -189,7 +205,7 @@
                         this.$set(this.showBtn,"reduction",true);
                         this.$set(this.showBtn,"edit",true);
                     }
-                }else if(this.safeSpvInfo.isOpen == "0"){//默认配置
+                }else if(this.safeSpvInfoObj.isOpen == "0"){//默认配置
                     this.spvTitle = "“使用默认配置”";
                 }
 
@@ -202,11 +218,15 @@
              * */
             async getSafeSpvData(){
                 this.showTree = false;
-                let regionId = this.defaultRegionId;
-                if(this.safeSpvInfo.openStatus == "9"){
-                    regionId = this.safeSpvInfo.id;
+                if(this.safeSpvInfoObj.openStatus == "9"){
+                    this.regionId = this.safeSpvInfoObj.id;
+                }else if(this.safeSpvInfoObj.openStatus === "1"){
+                  let defaultSpvList = await this.axios.post(this.api.safeRegion.find,{openStatus:"0"});
+                  if(defaultSpvList&&defaultSpvList.data){
+                    this.regionId = defaultSpvList.data[0].id;
+                  }
                 }
-                let treeRes = await this.axios.post(this.api.safeSpv.findAndCount,{order:"TB.SPV_ORDER ASC",regionId:regionId,countSql:"1"});
+                let treeRes = await this.axios.post(this.api.safeSpv.findAndCount,{order:"TB.SPV_ORDER ASC",regionId:this.regionId,countSql:"1"});
                 if(treeRes && treeRes.data && (treeRes.data || []).length > 0){
                     let treeData = treeRes.data;
                     //整理树数据
@@ -251,7 +271,7 @@
 
                 //置灰被其他监管行业选择的所属行业
                 if((this.source == "1" || this.isEdit) && !this.econSwitch){
-                    this.axios.post(this.api.safeSpvEcon.getEconSelected,{regionId:this.defaultRegionId}).then(otherSelectedRes => {
+                    this.axios.post(this.api.safeSpvEcon.getEconSelected,{regionId:this.regionId}).then(otherSelectedRes => {
                         if(otherSelectedRes && otherSelectedRes.data){
                             this.econSelected = otherSelectedRes.data || [];
                         }
@@ -269,9 +289,9 @@
                     result = true;
                 }
                 (this.econDataObj[econId] || []).forEach(econData => {
-                    if(this.currentNodeOwnEconId.indexOf(econData.id) == -1){
+                    // if(this.currentNodeOwnEconId.indexOf(econData.id) == -1){
                         this.$set(this.checkedEconObj,econData.id,result);
-                    }
+                    // }
                 });
             },
 
@@ -310,7 +330,7 @@
              */
             openSafeSpvDialog(command){
                 this.$set(this.safeSpvForm,"spvOrder",1);
-                this.$set(this.safeSpvForm,"regionId",this.safeSpvInfo.id || this.defaultRegionId);
+                this.$set(this.safeSpvForm,"regionId",this.safeSpvInfoObj.id || this.regionId);
                 if(command == "1"){
                     this.$set(this.safeSpvForm,"name","");
                     this.$set(this.safeSpvForm,"parentId",this.currentClickSpv.parentId);

package/src/views/uploadManage/uploadManage.vue

@@ -0,0 +1,133 @@
+<template>
+    <el-container style="height: 100%">
+        <el-header style="height: auto">
+            <div class="search-form-parent el-card" style="padding-left:10px;padding-right:10px">
+                <el-form size="small" :inline="true"
+                         @keyup.enter.native="crud.doSearch()" onSubmit="return false;">
+                    <el-form-item label="上传文件名" label-width="100px">
+                        <el-input placeholder="请输入" v-model="crud.searchForm.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="生成文件名" label-width="120px">
+                        <el-input placeholder="请输入" v-model="crud.searchForm.realName" ></el-input>
+                    </el-form-item>
+                    <el-form-item label="文件扩展名" label-width="120px">
+                        <el-input placeholder="请输入" v-model="crud.searchForm.extension" ></el-input>
+                    </el-form-item>
+                    <el-button type="primary" icon="el-icon-search" size="small" style="margin-top: 5px" @click="crud.doSearch()">查询</el-button>
+                    <el-button icon="el-icon-close" size="small" style="margin-top: 5px" @click="crud.resetSearch()">清空</el-button>
+                </el-form>
+            </div>
+        </el-header>
+        <el-main id="tableMain" style="height: 100%">
+            <el-container style="height:100%" class="table-list-container">
+                <el-header style="height: auto;" size="small">
+                    <el-button type="danger" round size="small" icon="el-icon-delete"  @click="remove()">删除</el-button>
+                </el-header>
+                <el-main style="height:100%">
+                    <el-table  :data="crud.dataStore.records" :ref="crud.tableRef" stripe border height="100%" style="width: 100%;"
+                              header-row-class-name="list-default-row" :row-style="{'height':'60px'}">
+                        <el-table-column type="selection" width="40" align="center"></el-table-column>
+                        <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
+                        <el-table-column label="上传文件名" prop="name" min-width="350"></el-table-column>
+                        <el-table-column label="生成文件名" prop="realName" width="320"></el-table-column>
+                        <el-table-column label="文件大小" prop="fileSize" width="100"></el-table-column>
+                        <el-table-column label="文件扩展名" prop="extension" width="100" align="center"></el-table-column>
+                        <el-table-column label="文件目录" prop="directory" show-overflow-tooltip width="150"></el-table-column>
+                        <el-table-column label="文件上传时间" prop="createTime" width="180"></el-table-column>
+                        <!--<el-table-column label="操作" align="center" width="120">
+                            <template slot-scope="scope">
+                                <el-button size="small" type="primary"  @click="clickQuery(scope.row)">查看</el-button>
+                            </template>
+                        </el-table-column>-->
+                    </el-table>
+                </el-main>
+            </el-container>
+        </el-main>
+        <el-footer>
+            <el-pagination
+                    :ref="crud.pageRef"
+                    :page-sizes="crud.pageSizes"
+                    :page-size="crud.pageSize"
+                    :current-page="crud.page"
+                    :total="crud.dataStore.total"
+                    @size-change="crud.sizeChange()"
+                    @current-change="crud.currentPage()"
+                    layout="total, sizes, prev, pager, next, jumper">
+            </el-pagination>
+        </el-footer>
+    </el-container>
+</template>
+<script>
+    export default {
+        name:'upload-manage',
+        data() {
+            return {
+                crud: new this.CrudUtil({
+                    vue: this,
+                    entityName: "uploadFileInfo",
+                    url: this.api.upload.url,
+                    searchForm: {
+                        order: 'CREATE_TIME DESC',
+                    },
+                    noClearSearchColumns: ["order"],
+                }),
+                extensionArr:["avi","mp4","mp3"],
+                initStatus:false,
+            }
+        },
+        watch :{
+            "crud.dataStore.records"(){
+                if(this.initStatus){
+                    let arr=[];
+                    this.crud.dataStore.records.forEach(val=>{
+                        arr.push(val.extension);
+                    });
+                    this.extensionArr=new Set(arr);
+                    this.initStatus=false;
+                }
+            }
+        },
+        created() {
+            this.initStatus=true;
+        },
+        methods:{
+            //删除附件
+            remove(){
+                let selection = this.$refs[this.crud.setting.tableRef].selection;
+                if ((selection || []).length === 0) {
+                    this.$message({
+                        duration: 1500,
+                        type: 'info',
+                        message: '请至少选择一条需要删除的数据！'
+                    });
+                    return;
+                }
+                // 如果当前删除的数据与dataStore中的数据条目相同，那么将页码置为第一页重新查询
+                if (selection.length == (this.crud.dataStore.rows || this.crud.dataStore.records).length) {
+                    this.crud.searchForm.page = '1';
+                    this.$refs[this.crud.setting.pageRef]["internalCurrentPage"] = 1;
+                }
+                this.$confirm('是否确定删除选择的“' + selection.length + '”条数据?', '警告', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                }).then(res => {
+                    let arrIds = [];
+                    selection.forEach(data => {
+                        arrIds.push(data.id);
+                    });
+                    this.axios.post(this.api.upload.deleteFilesById, {"ids": arrIds.join(",")}).then(res => {
+                        this.$message({
+                            type: 'success',
+                            message: res.data.operateMessage || '删除成功！'
+                        });
+                        this.crud.search();
+                    });
+                })
+            },
+            //查看附件
+            clickQuery(row){
+                console.log("查看")
+            },
+        }
+    }
+</script>

package/src/views/user/empowerUser/empowerUserListViewMenuTree.vue

@@ -95,8 +95,12 @@
                         vm.isLoadTree = true;
                         return;
                     }
-                    url = vm.api.menu.findNormalUserByUserId;
-                    dataObj = {"userId":vm.userId};
+                    url = vm.api.auth.getOwnMenu;//menu.findNormalUserByUserId
+                    let userTypeMenu = vm.userType;
+                    if(!vm.userType){
+                        userTypeMenu = 'ent';
+                    }
+                    dataObj = {userId:vm.userId,userType:userTypeMenu};
                 }
 
                 vm.axios.post(url,dataObj).then(function (res) {

package/src/views/user/stationUserManage.vue

@@ -828,11 +828,9 @@
                 let orgId = '';
                 let principalUser = {};
                 (selection || []).forEach(item =>{
-                    if(item.principal && item.principal.indexOf("1") > -1){
-                        if(item.orgId){
-                            orgId = item.orgId;
-                            principalUser = item;
-                        }
+                    if(item.principal && item.principal.indexOf("1") > -1 && item.orgId){
+                        orgId = item.orgId;
+                        principalUser = item;
                     }
                 });
                 if(orgId){

package/src/views/user/userManage.vue

@@ -52,7 +52,7 @@
                                 </el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作" align="center" width="350">
+                        <el-table-column label="操作" align="center" width="460">
                             <template slot-scope="scope">
                                 <!--v-if="queryUserType != 'ent' && (scope.row.created == loginUser.id || mayOperate)"-->
                                 <el-button size="small" icon="el-icon-edit" type="primary"
@@ -67,6 +67,10 @@
                                            @click="resetPwd(scope.row)">
                                     重置密码
                                 </el-button>
+                                <el-button size="small" icon="el-icon-s-custom" type="success"
+                                           @click="viewRoles(scope.row)">
+                                    查看角色
+                                </el-button>
                                 <el-button size="small" icon="el-icon-zoom-in" type="warning"
                                            v-if="queryUserType != 'dev'"
                                            @click="viewMenu(scope.row)">
@@ -174,6 +178,30 @@
                 </el-button>
             </div>
         </el-dialog>
+
+        <el-dialog :close-on-click-modal=false :title="roleUserName+' 的角色'" top="10vh" width="700px"
+                   :visible.sync="viewRolesDialog" class="userViewRolesClass">
+            <div v-loading="viewRolesLoading" style="min-height: 120px;">
+                <div class="role-summary">
+                    共 <b>{{roleList.length}}</b> 个角色
+                </div>
+                <div v-if="roleList.length === 0 && !viewRolesLoading" class="role-empty">
+                    该用户当前没有角色
+                </div>
+                <div v-else class="role-tags">
+                    <el-tag v-for="item in roleList" :key="item.id"
+                            :type="item.locked ? 'info' : ''"
+                            :effect="item.locked ? 'plain' : 'light'"
+                            class="role-tag">
+                        {{item.roleName}}<span v-if="item.locked" class="role-locked">（已锁定）</span>
+                    </el-tag>
+                </div>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="viewRolesDialog = false" size="small" icon="el-icon-error">关闭
+                </el-button>
+            </div>
+        </el-dialog>
     </el-container>
 </template>
 
@@ -209,8 +237,9 @@
                     entityName: "sysUser",
                     url:this.api.sysUser.url,
                     searchUrl: this.api.sysUser.findPageParam,
-                    searchForm: {"orderSql": "TB.CREATE_TIME DESC,TB.USER_STATUS DESC", "getOrgName": "true","parentOrg": "true"}, // 加上排序
-                    noClearSearchColumns: ["userType", "unsup", "ids", "order", "sort", "showCreated", "getOrgName","parentOrg","empowerUser","empowerOrgId"],
+                    // searchForm: {"orderSql": "TB.CREATE_TIME DESC,TB.USER_STATUS DESC", "getOrgName": "true","parentOrg": "true"}, // 加上排序
+                    searchForm: {"orderSql": "max(TB.CREATE_TIME) DESC,max(TB.USER_STATUS) DESC", "getOrgName": "true","parentOrg": "true"}, // 加上排序(达梦)
+                    noClearSearchColumns: ["userType", "unsup", "ids", "orderSql", "sort", "showCreated", "getOrgName","parentOrg","empowerUser","empowerOrgId"],
                     addDefaultData: {"userStatus": "10"},
                     initNoSearch: true,
                     uploadArr:['zd1']
@@ -228,6 +257,10 @@
                 menuUserId: '', // 查看菜单时的userId
                 menuUserName: '', // 查看菜单时的用户名
                 viewMenuDialog: false, // 查看菜单的对话框
+                viewRolesDialog: false, // 查看角色的对话框
+                viewRolesLoading: false, // 查看角色的加载中
+                roleUserName: '', // 查看角色时的用户名
+                roleList: [], // 查看角色时的角色列表
                 formDataDialog: false, // 用户信息对话框
                 loading: true, // 加载条
                 formData: {
@@ -469,6 +502,34 @@
                 vm.menuUserName = row.userName;
                 vm.viewMenuDialog = true;
             },
+
+            viewRoles(row) { // 查看用户拥有的角色（含直接授权与部门/岗位授权）
+                let vm = this;
+                if (!row.id) { // 行数据id不存在
+                    vm.$message("数据异常，请重新加载页面！");
+                    return;
+                }
+                vm.roleUserName = row.userName;
+                vm.roleList = [];
+                vm.viewRolesDialog = true;
+                vm.viewRolesLoading = true;
+                vm.axios.post(vm.api.auth.getUserRoles, {userId: row.id}).then(res => {
+                    // 接口返回 OperateInfo：operateObj = roleId 串，operateMap = {roleId: roleObj}
+                    let roleMap = (res.data && res.data.operateMap) || {};
+                    vm.roleList = Object.keys(roleMap).map(roleId => {
+                        let r = roleMap[roleId] || {};
+                        return {
+                            id: roleId,
+                            roleName: r.roleName || '(角色名缺失)',
+                            locked: r.roleStatus == '20'
+                        };
+                    });
+                }).catch(() => {
+                    vm.$message.error("获取角色失败，请稍后重试！");
+                }).finally(() => {
+                    vm.viewRolesLoading = false;
+                });
+            },
             updateData(row) { // 修改用户的基本信息(新增系统参数，是否允许修改用户详情)
                 let vm = this;
                 if (!row.id) {
@@ -734,4 +795,39 @@
     .viewMenuDialog /deep/ .el-dialog__body {
         height: calc(100% - 60px);
     }
+
+    .role-summary {
+        font-size: 13px;
+        color: #5a6b85;
+        margin-bottom: 12px;
+    }
+
+    .role-summary b {
+        color: #409eff;
+        font-size: 15px;
+        padding: 0 2px;
+    }
+
+    .role-tags {
+        max-height: 46vh;
+        overflow-y: auto;
+        line-height: 1.2;
+    }
+
+    .role-tag {
+        margin: 0 8px 8px 0;
+        max-width: 100%;
+    }
+
+    .role-locked {
+        color: #909399;
+        font-size: 12px;
+    }
+
+    .role-empty {
+        font-size: 13px;
+        color: #909399;
+        text-align: center;
+        padding: 30px 0;
+    }
 </style>

package/src/views/user/userMangement.vue

@@ -883,11 +883,9 @@
                         operateArr.push(data);
                     }
                 }else{
-                    if(vm.openLowLevelCheckbox){
-                        if(!vm.stopChange){
-                            vm.isChecked[data.id] = false;
-                            vm.dChange(data,false);
-                        }
+                    if(vm.openLowLevelCheckbox&&!vm.stopChange){
+                        vm.isChecked[data.id] = false;
+                        vm.dChange(data,false);
                     }
                     vm[tempObj[data["nodeType"]]] = operateArr.filter(item => {
                         return item["id"] != data["id"];
@@ -911,7 +909,7 @@
             saveSetting(){
                 let vm = this;
                 let checkedNodes = vm.$refs.orgTreeRef.getTreeCheckedNodes();
-                let checkedSet = new Array(); // 已选择组织
+                let checkedSet = []; // 已选择组织
                 checkedNodes.forEach(function (data) {
                     checkedSet.push(data.id);
                     /*if(data.menuPath){