From 9d5fc70530330177bd2a67e568d67b8883694685 Mon Sep 17 00:00:00 2001 From: surprise <15810472099@163.com> Date: 星期一, 11 十二月 2023 11:16:08 +0800 Subject: [PATCH] bug修改 --- src/views/datamanage/uploadmanage.vue | 1 src/components/preview_map.vue | 439 ++++--------------- src/components/mapsdk.vue | 2 src/views/userManage/roleManage.vue | 823 ++++++++++++++---------------------- 4 files changed, 427 insertions(+), 838 deletions(-) diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue index ec54a0d..5556a29 100644 --- a/src/components/mapsdk.vue +++ b/src/components/mapsdk.vue @@ -1017,7 +1017,7 @@ // requestVertexNormals: true, // }; // window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, ""); - + window.terrainLayer = new Cesium.CesiumTerrainProvider({ // url: LFData + '/3d/terrain/dem20230321' url: demLayer diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue index 0f9b5bd..ad224cc 100644 --- a/src/components/preview_map.vue +++ b/src/components/preview_map.vue @@ -1,160 +1,71 @@ <template> - <div - id="mapdiv" - class="previewBox" - > - <div - v-if="modelLayer" - class="modelLayer box_divm" - > + <div id="mapdiv" class="previewBox"> + <div v-if="modelLayer" class="modelLayer box_divm"> <div class="modelBox"> - <div - style="float:right" - :title="$t('synthesis.undergroundMode')" - @click="setUndergroundMode" - > + <div style="float:right" :title="$t('synthesis.undergroundMode')" @click="setUndergroundMode"> <i class="el-icon-sunrise "></i> </div> </div> <div class="modelBox"> - <el-tree - :data="treeData" - show-checkbox - node-key="id" - ref="tree" - :default-expanded-keys="[1]" - :props="defaultProps" - @node-click="handleNodeClick" - @check="handleCheckChange" - @node-contextmenu="rightClick" - > + <el-tree :data="treeData" show-checkbox node-key="id" ref="tree" :default-expanded-keys="[1]" + :props="defaultProps" @node-click="handleNodeClick" @check="handleCheckChange" @node-contextmenu="rightClick"> </el-tree> </div> </div> - <div - v-if="editModelFlag" - class="modelLayer box_divm" - > - <el-form - ref="form" - :model="modelForm" - label-width="80px" - > + <div v-if="editModelFlag" class="modelLayer box_divm"> + <el-form ref="form" :model="modelForm" label-width="80px"> <el-form-item> - <el-button - size="small" - @click="dialogLayerVisible = true" - >鍥惧眰</el-button> - <el-button - size="small" - v-if="$store.state.previewLayer.type == 'mpt'" - @click="setcropping" - >瑁佸壀</el-button> - <el-button - size="small" - v-if="$store.state.previewLayer.type != 'mpt'" - @click="locateTo" - >瀹氫綅</el-button> - <el-button - size="small" - v-if="$store.state.previewLayer.type != 'mpt'" - @click="showTileset" - >鏄鹃殣</el-button> + <el-button size="small" v-if="$store.state.previewLayer.stype != 'yl'" + @click="dialogLayerVisible = true">鍥惧眰</el-button> + <el-button size="small" v-if="$store.state.previewLayer.type == 'mpt'" @click="setcropping">瑁佸壀</el-button> + <el-button size="small" v-if="$store.state.previewLayer.type != 'mpt'" @click="locateTo">瀹氫綅</el-button> + <el-button size="small" v-if="$store.state.previewLayer.type != 'mpt'" @click="showTileset">鏄鹃殣</el-button> - <el-button - size="small" - v-if="$store.state.previewLayer.type != 'mpt'" - @click="setUndergroundMode" - >鍦颁笅</el-button> + <el-button size="small" v-if="$store.state.previewLayer.type != 'mpt'" + @click="setUndergroundMode">鍦颁笅</el-button> <br /> - <el-button - v-if="$store.state.previewLayer.type != '3dml' && + <el-button v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - size="small" - @click="pickupCoords" - >鎷惧彇</el-button> - <el-button - v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'mpt'" size="small" @click="pickupCoords">鎷惧彇</el-button> + <el-button v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - size="small" - @click="reload" - > + $store.state.previewLayer.type != 'mpt'" size="small" @click="reload"> 閲嶈浇 </el-button> - <el-button - v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml' && + <el-button v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - size="small" - @click="getModeKeyId" - >妯″瀷涓婚敭</el-button> - <el-button - v-if="$store.state.previewLayer.type != '3dml' && + $store.state.previewLayer.type != 'mpt'" size="small" @click="getModeKeyId">妯″瀷涓婚敭</el-button> + <el-button v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' - " - size="small" - @click="resave" - >淇濆瓨</el-button> + " size="small" @click="resave">淇濆瓨</el-button> </el-form-item> - <el-form-item - label="缁忓害:" - v-if="$store.state.previewLayer.type != '3dml' && + <el-form-item label="缁忓害:" v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - > - <el-input - size="small" - v-model="modelForm.lon" - ></el-input> + $store.state.previewLayer.type != 'mpt'"> + <el-input size="small" v-model="modelForm.lon"></el-input> </el-form-item> - <el-form-item - label="绾害:" - v-if="$store.state.previewLayer.type != '3dml' && + <el-form-item label="绾害:" v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - > - <el-input - size="small" - v-model="modelForm.lat" - ></el-input> + $store.state.previewLayer.type != 'mpt'"> + <el-input size="small" v-model="modelForm.lat"></el-input> </el-form-item> - <el-form-item - label="楂樺害:" - v-if="$store.state.previewLayer.type != '3dml' && + <el-form-item label="楂樺害:" v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - > - <el-input - size="small" - v-model="modelForm.height" - ></el-input> + $store.state.previewLayer.type != 'mpt'"> + <el-input size="small" v-model="modelForm.height"></el-input> </el-form-item> - <el-form-item - label="瑙掑害:" - v-if="$store.state.previewLayer.type != '3dml' && + <el-form-item label="瑙掑害:" v-if="$store.state.previewLayer.type != '3dml' && $store.state.previewLayer.type != 'cpt' && - $store.state.previewLayer.type != 'mpt'" - > - <el-input - size="small" - v-model="modelForm.yaw" - ></el-input> + $store.state.previewLayer.type != 'mpt'"> + <el-input size="small" v-model="modelForm.yaw"></el-input> </el-form-item> - <el-form-item - label="姣斾緥:" - v-if="$store.state.previewLayer.type == 'las'" - > - <el-input - size="small" - v-model="modelForm.scale" - ></el-input> + <el-form-item label="姣斾緥:" v-if="$store.state.previewLayer.type == 'las'"> + <el-input size="small" v-model="modelForm.scale"></el-input> </el-form-item> <!-- <el-form-item label="閫忔槑搴�:"> @@ -167,46 +78,20 @@ </el-form> </div> - <el-dialog - :title="formInline.title" - :visible.sync="dialogVisible" - :modal="false" - :modal-append-to-body="false" - :close-on-click-modal="false" - :before-close="handleClose" - width="30%" - > + <el-dialog :title="formInline.title" :visible.sync="dialogVisible" :modal="false" :modal-append-to-body="false" + :close-on-click-modal="false" :before-close="handleClose" width="30%"> <div style="height:63vh"> - <el-tabs - v-model="activeName" - @tab-click="handleClick" - > - <el-tab-pane - label="灞炴��" - name="first" - v-if="serveType" - > - <el-form - ref="form" - :model="formInline" - label-width="80px" - > + <el-tabs v-model="activeName" @tab-click="handleClick"> + <el-tab-pane label="灞炴��" name="first" v-if="serveType"> + <el-form ref="form" :model="formInline" label-width="80px"> <el-form-item :label="$t('common.name')"> <el-input v-model="formInline.name"></el-input> </el-form-item> <el-form-item :label="$t('common.type')"> - <el-select - v-model="formInline.type" - style="width:100%" - > - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-select v-model="formInline.type" style="width:100%"> + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> @@ -217,113 +102,47 @@ </el-form-item> <el-form-item> - <el-button - v-show="isShowModel" - type="success" - plain - size="small" - @click="InsertData" - >{{ + <el-button v-show="isShowModel" type="success" plain size="small" @click="InsertData">{{ $t('common.increase') }}</el-button> - <el-button - v-show="!isShowModel" - type="info" - plain - size="small" - @click="EditData" - >{{ $t('common.update') + <el-button v-show="!isShowModel" type="info" plain size="small" @click="EditData">{{ $t('common.update') }}</el-button> </el-form-item> </el-form> </el-tab-pane> - <el-tab-pane - label="闄勪欢" - name="second" - > - <el-form - :model="fromfile" - class="demo-form-inline" - > + <el-tab-pane label="闄勪欢" name="second"> + <el-form :model="fromfile" class="demo-form-inline"> <el-form-item> - <el-input - v-model="fromfile.file" - style="width: 300px; margin-right: 20px" - :placeholder="$t('common.choose')" - disabled - ></el-input> - <input - name="file1" - type="file" - id="insertFile" - multiple="multiple" - style="display: none" - @change="insertFile()" - /> - <el-link - @click="getInsertFile()" - :underline="false" - ><i class="el-icon-folder-opened"></i></el-link> + <el-input v-model="fromfile.file" style="width: 300px; margin-right: 20px" + :placeholder="$t('common.choose')" disabled></el-input> + <input name="file1" type="file" id="insertFile" multiple="multiple" style="display: none" + @change="insertFile()" /> + <el-link @click="getInsertFile()" :underline="false"><i class="el-icon-folder-opened"></i></el-link> </el-form-item> <el-form-item> <el-row> <el-col :span="3"> - <el-link - class="elLink" - :underline="false" - @click="setAttachInsert" - >{{ $t('common.append') + <el-link class="elLink" :underline="false" @click="setAttachInsert">{{ $t('common.append') }}</el-link> </el-col> <el-col :span="3"> - <el-link - class="elLink" - :underline="false" - @click="setAttachDel" - >{{ $t('common.delete') }}</el-link> + <el-link class="elLink" :underline="false" @click="setAttachDel">{{ $t('common.delete') }}</el-link> </el-col> </el-row> </el-form-item> </el-form> - <el-table - :data="tableData" - ref="filterTable" - height="calc(100% - 130px)" - border - style="width: 100%" - @selection-change="handleAttatchChange" - > - <el-table-column - type="selection" - width="70" - /> - <el-table-column - width="60" - type="index" - :label="$t('common.index')" - /> - <el-table-column - prop="name" - :label="$t('common.name')" - /> + <el-table :data="tableData" ref="filterTable" height="calc(100% - 130px)" border style="width: 100%" + @selection-change="handleAttatchChange"> + <el-table-column type="selection" width="70" /> + <el-table-column width="60" type="index" :label="$t('common.index')" /> + <el-table-column prop="name" :label="$t('common.name')" /> - <el-table-column - prop="sizes" - :label="$t('common.size')" - :formatter="statSizeChange" - /> - <el-table-column - align="center" - :label="$t('common.operate')" - min-width="100" - > + <el-table-column prop="sizes" :label="$t('common.size')" :formatter="statSizeChange" /> + <el-table-column align="center" :label="$t('common.operate')" min-width="100"> <template slot-scope="scope"> - <el-link - v-if="matchState(scope, /[]/)" - @click="setAttatchDetail(scope.$index, scope.row)" - class="elLink" - >{{ $t('common.see') }}</el-link> + <el-link v-if="matchState(scope, /[]/)" @click="setAttatchDetail(scope.$index, scope.row)" + class="elLink">{{ $t('common.see') }}</el-link> </template> </el-table-column> @@ -346,44 +165,21 @@ <map-sdk v-if='showMapVisible'></map-sdk> </div> </el-dialog> --> - <el-dialog - title="棰勮" - :append-to-body="false" - :visible.sync="dialog.dialogVisible" - width="70%" - :close-on-click-modal="false" - > - <div - v-if="dialog.isPdf" - class="pdfClass" - > - <iframe - :src="dialog.src" - type="application/x-google-chrome-pdf" - width="100%" - height="100%" - > + <el-dialog title="棰勮" :append-to-body="false" :visible.sync="dialog.dialogVisible" width="70%" + :close-on-click-modal="false"> + <div v-if="dialog.isPdf" class="pdfClass"> + <iframe :src="dialog.src" type="application/x-google-chrome-pdf" width="100%" height="100%"> </iframe> </div> - <div - v-if="dialog.isJpg" - class="pdfClass" - > + <div v-if="dialog.isJpg" class="pdfClass"> - <el-image - style="width:100%; height:100%" - :src="dialog.src" - :preview-src-list="[dialog.src]" - > + <el-image style="width:100%; height:100%" :src="dialog.src" :preview-src-list="[dialog.src]"> </el-image> </div> </el-dialog> - <div - v-show="dialogLayerVisible" - class="levelLayer box_divm" - > + <div v-show="dialogLayerVisible" class="levelLayer box_divm"> <div class="levelTitle"> <div> 鍥惧眰鍒楄〃 @@ -393,67 +189,33 @@ </div> </div> <div class="layerContent"> - <div - v-for="(item,index) in layerTree" - class="contLayer" - > - <div> <el-checkbox - v-model="item.checked" - @change="setLayerTreeChange(item)" - >{{item.cnName}}</el-checkbox></div> + <div v-for="(item, index) in layerTree" class="contLayer"> + <div> <el-checkbox v-model="item.checked" @change="setLayerTreeChange(item)">{{ item.cnName }}</el-checkbox> + </div> <div> - <el-button - icon="el-icon-map-location" - size="mini" - @click="setLayerTreeLocation(item)" - ></el-button> + <el-button icon="el-icon-map-location" size="mini" @click="setLayerTreeLocation(item)"></el-button> </div> </div> </div> </div> - <div - v-show="modelKeyFlag" - class="modelLayer box_divm" - v-drag - > - <el-form - ref="form" - :model="modelForm" - label-width="80px" - > + <div v-show="modelKeyFlag" class="modelLayer box_divm" v-drag> + <el-form ref="form" :model="modelForm" label-width="80px"> <el-form-item label="涓婚敭ID"> <el-select v-model="modelLayerId"> - <el-option - v-for="item in optionKey" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-option v-for="item in optionKey" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-form-item> <el-form-item> - <el-button - type="primary" - size="small" - @click="setSureKeyModelKey" - >{{ $t('common.confirm') }}</el-button> + <el-button type="primary" size="small" @click="setSureKeyModelKey">{{ $t('common.confirm') }}</el-button> </el-form-item> </el-form> </div> <undergroundModel ref="undergroundModel" /> - <el-card - class="box-card" - ref="card" - :style="{ ...rightClickMenuStyle }" - v-show="menuVisible" - > - <div - class="edit" - @click="setShowFile" - > + <el-card class="box-card" ref="card" :style="{ ...rightClickMenuStyle }" v-show="menuVisible"> + <div class="edit" @click="setShowFile"> <i class="el-icon-tickets"></i> 闄勪欢 </div> </el-card> @@ -1254,27 +1016,26 @@ Viewer.scene.globe.depthTestAgainstTerrain = true; // window.elevationTool = new SmartEarth.ElevationTool(window.sg); // elevationTool.setContourColor("#F1D487"); - var option = { - url: window.sceneConfig.SGUrl, - layerName: window.sceneConfig.mptName, - requestVertexNormals: true, - }; - window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, ""); - window.terrainFlag = '2' + window.terrainLayer = new Cesium.CesiumTerrainProvider({ + // url: LFData + '/3d/terrain/dem20230321' + url: demLayer + }); + Viewer.terrainProvider = window.terrainLayer + + window.terrainFlag = '1' // window.terrainLayer = new Cesium.CesiumTerrainProvider({ - // url: demLayer + // url: demLayer // }); // Viewer.terrainProvider = window.terrainLayer - if (this.$store.state.previewLayer) { var res = this.$store.state.previewLayer; var type = res.type; console.log(type) res.ulr = res.url.replace("{host}", iisHost); if (type == 'DEM') { - window.terrainLayer.deleteObject(); - // Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider(); + // window.terrainLayer.deleteObject(); + Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider(); // window.terrainLayer = null; window.terrainLayer = null; window.terrainLayer = new Cesium.CesiumTerrainProvider({ @@ -1289,12 +1050,15 @@ roll: 0.0 } });*/ + + if (res.geom) { + var wkt = this.$wkt.parse(res.geom); + var height = this.getHeight(wkt.coordinates[2]); + Viewer.camera.flyTo({ + destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], height), + }); + } - var wkt = this.$wkt.parse(res.geom); - var height = this.getHeight(wkt.coordinates[2]); - Viewer.camera.flyTo({ - destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], height), - }); } else if (type == 'DOM') { var wkt = this.$wkt.parse(res.geom); var height = this.getHeight(wkt.coordinates[2]) @@ -1734,6 +1498,7 @@ top: 20%; left: 50%; transform: translate(-50%, 0%); + .levelTitle { width: 100%; display: flex; @@ -1741,6 +1506,7 @@ font-size: 16px; font-family: Source Han Sans CN; } + .contLayer { margin: 10px 0px; font-size: 14px; @@ -1749,6 +1515,7 @@ justify-content: space-between; } } + .pdfClass { height: 70vh; width: 100%; @@ -1756,8 +1523,7 @@ } .el-icon-sunrise { - background: url("../assets/img/synthesis/images/3鐧藉簳_157.png") center - center no-repeat; + background: url("../assets/img/synthesis/images/3鐧藉簳_157.png") center center no-repeat; background-size: 24px; } @@ -1765,6 +1531,7 @@ content: "11"; visibility: hidden; } + .box-card { position: fixed; display: block; diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue index 91b2b50..0b88751 100644 --- a/src/views/datamanage/uploadmanage.vue +++ b/src/views/datamanage/uploadmanage.vue @@ -1469,6 +1469,7 @@ }, //棰勮寮圭獥鎵撳紑 setPreviewLayer(res) { + res.stype= 'yl' this.$store.state.previewLayer = res; this.dialogVisible = true; this.showMapView = true; diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue index a4c5585..49cd7e0 100644 --- a/src/views/userManage/roleManage.vue +++ b/src/views/userManage/roleManage.vue @@ -1,40 +1,19 @@ <template> <div class="logLog_box"> - <My-bread - :list="[ - `${$t('operatManage.operatManage')}`, - `${$t('userManage.roleManage')}`, - ]" - ></My-bread> + <My-bread :list="[ + `${$t('operatManage.operatManage')}`, + `${$t('userManage.roleManage')}`, + ]"></My-bread> <el-divider /> <div class="inquire subpage_Div" ref="container"> <el-form ref="ruleForm" :model="roleForm" :inline="true"> <div class="flex_box"> <div style="margin-right: auto"> - <el-form-item - :label="$t('userManage.RM.ownedSystem')" - prop="ownedSystem" - > - <el-select - :popper-append-to-body="false" - size="small" - v-model="roleForm.depValue" - :placeholder="$t('userManage.RM.ownedSystemHolder')" - style="width: 200px" - ref="treeSelect" - > - <el-option - :value="roleForm.depid" - :label="roleForm.depValue" - style="height: auto" - > - <el-tree - ref="tree" - :data="depList" - node-key="id" - :props="props" - @node-click="handleRouleDepList" - /> + <el-form-item :label="$t('userManage.RM.ownedSystem')" prop="ownedSystem"> + <el-select :popper-append-to-body="false" size="small" v-model="roleForm.depValue" + :placeholder="$t('userManage.RM.ownedSystemHolder')" style="width: 200px" ref="treeSelect"> + <el-option :value="roleForm.depid" :label="roleForm.depValue" style="height: auto"> + <el-tree ref="tree" :data="depList" node-key="id" :props="props" @node-click="handleRouleDepList" /> </el-option> </el-select> <!-- <el-input @@ -44,12 +23,8 @@ /> --> </el-form-item> <el-form-item :label="$t('userManage.RM.roleName')" prop="username"> - <el-input - v-model="roleForm.username" - :placeholder="$t('userManage.RM.roleNameHolder')" - size="small" - style="width: 200px" - > + <el-input v-model="roleForm.username" :placeholder="$t('userManage.RM.roleNameHolder')" size="small" + style="width: 200px"> <i slot="suffix" class="el-icon-search" @click="onSubmit"></i> </el-input> </el-form-item> @@ -65,33 +40,21 @@ <!-- }}</el-button>--> <!-- </el-form-item>--> <el-form-item> - <el-button - type="success" - size="small" - @click="setInsertFormdialog" - v-if="menuStatus.insert" - ><i class="el-icon-circle-plus-outline"></i> {{ - $t("userManage.RM.add") - }}</el-button - > + <el-button type="success" size="small" @click="setInsertFormdialog" v-if="menuStatus.insert"><i + class="el-icon-circle-plus-outline"></i> {{ + $t("userManage.RM.add") + }}</el-button> </el-form-item> <el-form-item> - <el-button - type="danger" - size="small" - @click="handleDelete()" - v-if="menuStatus.delete" - ><i class="el-icon-delete"></i> {{ - $t("common.delete") - }}</el-button - > + <el-button type="danger" size="small" @click="handleDelete()" v-if="menuStatus.delete"><i + class="el-icon-delete"></i> {{ + $t("common.delete") + }}</el-button> </el-form-item> <el-form-item> - <el-button type="info" size="small" @click="resetForm('ruleForm')" - ><i class="el-icon-delete"></i> {{ - $t("userManage.RM.reset") - }}</el-button - > + <el-button type="info" size="small" @click="resetForm('ruleForm')"><i class="el-icon-delete"></i> {{ + $t("userManage.RM.reset") + }}</el-button> </el-form-item> </div> </div> @@ -145,48 +108,22 @@ </div> <div class="dividing-line"></div> <div class="table_box subpage_Div" :style="styleVar"> - <el-table - :data="tableData" - style="width: 100%" - border - height="calc(100% - 45px)" - @selection-change="handleSelectionChange" - > + <el-table :data="tableData" style="width: 100%" border height="calc(100% - 45px)" + @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" /> - <el-table-column - align="center" - type="index" - :label="$t('userManage.RM.index')" - width="70px" - /> + <el-table-column align="center" type="index" :label="$t('userManage.RM.index')" width="70px" /> <el-table-column align="center" prop="id" v-if="false" /> - <el-table-column - align="center" - prop="name" - :label="$t('userManage.RM.roleName')" - /> + <el-table-column align="center" prop="name" :label="$t('userManage.RM.roleName')" /> - <el-table-column - align="center" - prop="depName" - :label="$t('userManage.RM.ownedSystem')" - /> + <el-table-column align="center" prop="depName" :label="$t('userManage.RM.ownedSystem')" /> - <el-table-column - align="center" - prop="isAdmin" - :label="$t('userManage.RM.isAdmin')" - > - <template slot-scope="scope"> + <el-table-column align="center" prop="isAdmin" :label="$t('userManage.RM.isAdmin')" :formatter="formateIsAdmin"> + <!-- <template slot-scope="scope"> <span v-if="scope.row.isAdmin == 1">鏄� </span> <span v-else>鍚�</span> - </template> + </template> --> </el-table-column> - <el-table-column - align="center" - prop="descr" - :label="$t('userManage.RM.describe')" - /> + <el-table-column align="center" prop="descr" :label="$t('userManage.RM.describe')" /> <!-- <el-table-column align="center" @@ -215,93 +152,39 @@ prop="bak" :label="$t('userManage.RM.remarks')" /> --> - <el-table-column - fixed="right" - :label="$t('common.operate')" - width="200" - > + <el-table-column fixed="right" :label="$t('common.operate')" width="200"> <template slot-scope="scope"> - <el-button - type="primary" - @click="showDetail(scope.$index, scope.row)" - size="small" - plain - >{{ $t("common.see") }}</el-button - > - <el-button - v-if="menuStatus.update" - type="warning" - @click="handleEdit(scope.$index, scope.row)" - size="small" - plain - >{{ $t("common.update") }}</el-button - > + <el-button type="primary" @click="showDetail(scope.$index, scope.row)" size="small" plain>{{ $t("common.see") + }}</el-button> + <el-button v-if="menuStatus.update" type="warning" @click="handleEdit(scope.$index, scope.row)" size="small" + plain>{{ $t("common.update") }}</el-button> </template> </el-table-column> </el-table> <div style="margin-top: 10px" class="pagination_box"> - <el-pagination - @size-change="handleSizeChange" - @current-change="handleCurrentChange" - :current-page="listData.pageIndex" - :page-sizes="[10, 20, 50, 100]" - :page-size="listData.pageSize" - layout="total, sizes, prev, pager, next, jumper" - :total="count" - > + <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" + :current-page="listData.pageIndex" :page-sizes="[10, 20, 50, 100]" :page-size="listData.pageSize" + layout="total, sizes, prev, pager, next, jumper" :total="count"> </el-pagination> </div> </div> - <el-dialog - :title="$t('userManage.RM.insertRole')" - :before-close="handleClose" - style="overflow: hidden" - :visible.sync="InsertFormdialog" - > + <el-dialog :title="$t('userManage.RM.insertRole')" :before-close="handleClose" style="overflow: hidden" + :visible.sync="InsertFormdialog"> <div style="height: 500px; overflow: auto"> <el-form :model="insertform" label-position="top"> - <el-form-item - :label="$t('userManage.RM.roleName')" - :label-width="formLabelWidth" - > - <el-input - style="width: 85%" - v-model="insertform.name" - autocomplete="off" - :placeholder=" - $t('shuJuGuanLi.shuJuJianSuo.valuetwo') + - $t('userManage.RM.roleName') - " - ></el-input> + <el-form-item :label="$t('userManage.RM.roleName')" :label-width="formLabelWidth"> + <el-input style="width: 85%" v-model="insertform.name" autocomplete="off" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') + + $t('userManage.RM.roleName') + "></el-input> </el-form-item> - <el-form-item - :label="$t('userManage.RM.ownedSystem')" - :label-width="formLabelWidth" - :prop="insertform.depValue" - :rules="[{ required: true, message: '涓嶈兘涓虹┖' }]" - > - <el-select - :popper-append-to-body="false" - v-model="insertform.depValue" - :placeholder=" - $t('shuJuGuanLi.shuJuJianSuo.valuetree') + - $t('userManage.RM.ownedSystem') - " - style="width: 85%" - > - <el-option - :value="insertform.depid" - :label="insertform.depValue" - style="height: auto" - > - <el-tree - ref="tree" - :data="depList" - node-key="id" - :props="props" - @node-click="handleDepList" - /> + <el-form-item :label="$t('userManage.RM.ownedSystem')" :label-width="formLabelWidth" :prop="insertform.depValue" + :rules="[{ required: true, message: '涓嶈兘涓虹┖' }]"> + <el-select :popper-append-to-body="false" v-model="insertform.depValue" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree') + + $t('userManage.RM.ownedSystem') + " style="width: 85%"> + <el-option :value="insertform.depid" :label="insertform.depValue" style="height: auto"> + <el-tree ref="tree" :data="depList" node-key="id" :props="props" @node-click="handleDepList" /> </el-option> </el-select> <!-- <el-input @@ -316,24 +199,12 @@ @click="showDepTree(2)" >{{ $t('common.choose') }}</el-button> --> </el-form-item> - <el-form-item - :label="$t('userManage.RM.describe')" - :label-width="formLabelWidth" - > - <el-input - style="width: 85%" - v-model="insertform.descr" - autocomplete="off" - :placeholder=" - $t('shuJuGuanLi.shuJuJianSuo.valuetwo') + - $t('userManage.RM.describe') - " - ></el-input> + <el-form-item :label="$t('userManage.RM.describe')" :label-width="formLabelWidth"> + <el-input style="width: 85%" v-model="insertform.descr" autocomplete="off" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') + + $t('userManage.RM.describe') + "></el-input> </el-form-item> - <el-form-item - :label="$t('userManage.RM.isAdmin')" - :label-width="formLabelWidth" - > + <el-form-item :label="$t('userManage.RM.isAdmin')" :label-width="formLabelWidth"> <!-- <el-radio label="1" @@ -342,35 +213,16 @@ v-model="insertform.isAdmin" label="0" >鍚�</el-radio> --> - <el-select - style="width: 85%" - v-model="insertform.isAdmin" - :placeholder=" - $t('shuJuGuanLi.shuJuJianSuo.valuetree') + - $t('userManage.RM.isAdmin') - " - > - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - ></el-option> + <el-select style="width: 85%" v-model="insertform.isAdmin" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree') + + $t('userManage.RM.isAdmin') + "> + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option> </el-select> </el-form-item> - <el-form-item - :label="$t('userManage.RM.remarks')" - :label-width="formLabelWidth" - > - <el-input - style="width: 85%" - v-model="insertform.bak" - autocomplete="off" - :placeholder=" - $t('shuJuGuanLi.shuJuJianSuo.valuetwo') + - $t('userManage.RM.remarks') - " - ></el-input> + <el-form-item :label="$t('userManage.RM.remarks')" :label-width="formLabelWidth"> + <el-input style="width: 85%" v-model="insertform.bak" autocomplete="off" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') + + $t('userManage.RM.remarks') + "></el-input> </el-form-item> </el-form> </div> @@ -383,47 +235,18 @@ }}</el-button> </div> </el-dialog> - <el-dialog - :title="$t('userManage.RM.updateRole')" - :visible.sync="UpdateFormdialog" - :before-close="handleCloseEdit" - > + <el-dialog :title="$t('userManage.RM.updateRole')" :visible.sync="UpdateFormdialog" :before-close="handleCloseEdit"> <div style="height: 500px; overflow: auto"> <el-form :model="updateform" label-position="top"> - <el-form-item - :label="$t('userManage.RM.roleName')" - :label-width="formLabelWidth" - > - <el-input - v-model="updateform.name" - autocomplete="off" - style="width: 85%" - ></el-input> + <el-form-item :label="$t('userManage.RM.roleName')" :label-width="formLabelWidth"> + <el-input v-model="updateform.name" autocomplete="off" style="width: 85%"></el-input> </el-form-item> - <el-form-item - :label="$t('userManage.RM.ownedSystem')" - :label-width="formLabelWidth" - :prop="updateform.depValue" - > - <el-select - :popper-append-to-body="false" - v-model="updateform.depValue" - placeholder="璇烽�夋嫨" - style="width: 85%" - > - <el-option - :value="updateform.depid" - :label="updateform.depValue" - style="height: auto" - > - <el-tree - ref="tree" - :data="depList" - node-key="id" - :props="props" - @node-click="handleUpdataDepList" - /> + <el-form-item :label="$t('userManage.RM.ownedSystem')" :label-width="formLabelWidth" + :prop="updateform.depValue"> + <el-select :popper-append-to-body="false" v-model="updateform.depValue" placeholder="璇烽�夋嫨" style="width: 85%"> + <el-option :value="updateform.depid" :label="updateform.depValue" style="height: auto"> + <el-tree ref="tree" :data="depList" node-key="id" :props="props" @node-click="handleUpdataDepList" /> </el-option> </el-select> @@ -439,10 +262,7 @@ @click="showDepTree(3)" >{{ $t('common.choose') }}</el-button> --> </el-form-item> - <el-form-item - :label="$t('userManage.RM.isAdmin')" - :label-width="formLabelWidth" - > + <el-form-item :label="$t('userManage.RM.isAdmin')" :label-width="formLabelWidth"> <!-- <el-radio v-model="updateform.isAdmin" label="1" @@ -452,33 +272,14 @@ label="0" >鍚�</el-radio> --> <el-select style="width: 85%" v-model="updateform.isAdmin"> - <el-option - v-for="item in options" - :key="item.value" - :label="item.label" - :value="item.value" - ></el-option> + <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option> </el-select> </el-form-item> - <el-form-item - :label="$t('userManage.RM.describe')" - :label-width="formLabelWidth" - > - <el-input - v-model="updateform.descr" - autocomplete="off" - style="width: 85%" - ></el-input> + <el-form-item :label="$t('userManage.RM.describe')" :label-width="formLabelWidth"> + <el-input v-model="updateform.descr" autocomplete="off" style="width: 85%"></el-input> </el-form-item> - <el-form-item - :label="$t('userManage.RM.remarks')" - :label-width="formLabelWidth" - > - <el-input - v-model="updateform.bak" - autocomplete="off" - style="width: 85%" - ></el-input> + <el-form-item :label="$t('userManage.RM.remarks')" :label-width="formLabelWidth"> + <el-input v-model="updateform.bak" autocomplete="off" style="width: 85%"></el-input> </el-form-item> </el-form> </div> @@ -496,12 +297,8 @@ <role-dep-tree></role-dep-tree> </div> <div class="btnBox"> - <el-button type="primary" size="small" @click="selectCataName" - >纭畾</el-button - > - <el-button type="info" size="small" @click="showCata = false" - >鍙栨秷</el-button - > + <el-button type="primary" size="small" @click="selectCataName">纭畾</el-button> + <el-button type="info" size="small" @click="showCata = false">鍙栨秷</el-button> </div> </div> <div class="infoBox_box" v-show="showinfoBox"> @@ -725,8 +522,8 @@ this.itemdetail.createUser = this.itemdetail.createName; this.itemdetail.updateUser = this.itemdetail.updateName; - this.itemdetail.admin = - parseInt(this.itemdetail.isAdmin) === 0 ? "鍚�" : "鏄�"; + this.itemdetail.admin =this.formateIsAdmin(this.itemdetail) + }, handleSelectionChange(val) { this.multipleSelection = val; @@ -735,249 +532,270 @@ let date = row[column.property]; return this.formomentTime(date); }, - formomentTime(date) { - if (date === undefined || date === null) { - return; - } - return moment(parseInt(date)).format("YYYY-MM-DD HH:mm:ss"); - }, - showDepTree(res) { - this.showCata = true; - this.elTreeFlag = res; - }, - selectCataName() { - this.cataName = this.$store.state.catalogueName; - this.path_id = this.$store.state.cataNode.id; - var value; - if (this.cataName.indexOf(">") != -1) { - var data = this.$store.state.catalogueName.split(">"); - value = data[data.length - 1]; - } else { - value = this.$store.state.catalogueName; - } - this.$store.commit("changeCata", ""); //娓呯┖state鐨勯潰鍖呭睉 - this.$store.commit("changeNode", ""); //娓呯┖state鐨勮妭鐐瑰璞� - this.showCata = false; - switch (this.elTreeFlag) { + + formateIsAdmin(row, column) { + switch (row.isAdmin) { + case 0: + return "鏅�氱敤鎴�"; + break; case 1: - this.roleForm.value = value; - this.roleForm.depid = this.path_id; + return "瓒呯骇绠$悊鍛�"; break; case 2: - this.insertform.depid = this.path_id; - this.insertform.depValue = value; + return "鏁版嵁绠$悊鍛�"; break; case 3: - this.updateform.depid = this.path_id; - this.updateform.depValue = value; + return "棰嗗"; break; + } + }, - async getRoleTabelData() { - if (this.listData.tab == "") { - delete this.listData.tab; - } - this.listData.name = this.roleForm.username; - this.listData.depid = this.roleForm.depid; - const data = await select_Role_ByPageAndCount(this.listData); - if (data.code != 200) { - this.$message.error("鍒楄〃璋冪敤澶辫触"); - } - this.tableData = data.result; - this.count = data.count; - }, + +formomentTime(date) { + if (date === undefined || date === null) { + return; + } + return moment(parseInt(date)).format("YYYY-MM-DD HH:mm:ss"); +}, +showDepTree(res) { + this.showCata = true; + this.elTreeFlag = res; +}, +selectCataName() { + this.cataName = this.$store.state.catalogueName; + this.path_id = this.$store.state.cataNode.id; + var value; + if (this.cataName.indexOf(">") != -1) { + var data = this.$store.state.catalogueName.split(">"); + value = data[data.length - 1]; + } else { + value = this.$store.state.catalogueName; + } + this.$store.commit("changeCata", ""); //娓呯┖state鐨勯潰鍖呭睉 + this.$store.commit("changeNode", ""); //娓呯┖state鐨勮妭鐐瑰璞� + this.showCata = false; + switch (this.elTreeFlag) { + case 1: + this.roleForm.value = value; + this.roleForm.depid = this.path_id; + break; + case 2: + this.insertform.depid = this.path_id; + this.insertform.depValue = value; + break; + case 3: + this.updateform.depid = this.path_id; + this.updateform.depValue = value; + break; + } +}, + async getRoleTabelData() { + if (this.listData.tab == "") { + delete this.listData.tab; + } + this.listData.name = this.roleForm.username; + this.listData.depid = this.roleForm.depid; + const data = await select_Role_ByPageAndCount(this.listData); + if (data.code != 200) { + this.$message.error("鍒楄〃璋冪敤澶辫触"); + } + + this.tableData = data.result; + this.count = data.count; +}, async getSelectDepTab() { - this.selectData = []; - const data = await selectdepTab(); - if (data.code != 200) { - this.$message.error("涓嬫媺璋冪敤澶辫触"); - } - data.result.forEach((e) => { - if (e) { - this.selData.push({ - label: e.name, - value: e.id, - }); - } + this.selectData = []; + const data = await selectdepTab(); + if (data.code != 200) { + this.$message.error("涓嬫媺璋冪敤澶辫触"); + } + data.result.forEach((e) => { + if (e) { + this.selData.push({ + label: e.name, + value: e.id, }); - }, - insertFromClose() { - this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") - .then((_) => { - this.InsertFormdialog = false; - this.insertform = {}; - }) - .catch((_) => {}); - }, + } + }); +}, +insertFromClose() { + this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") + .then((_) => { + this.InsertFormdialog = false; + this.insertform = {}; + }) + .catch((_) => { }); +}, async insertFromData() { - if (this.insertform.depValue == null) { - this.$message({ - message: "璇烽�夋嫨瑙掕壊鎵�灞炲崟浣�", - type: "warning", - }); - return; - } - const data = await insertRole(this.insertform); + if (this.insertform.depValue == null) { + this.$message({ + message: "璇烽�夋嫨瑙掕壊鎵�灞炲崟浣�", + type: "warning", + }); + return; + } + const data = await insertRole(this.insertform); + if (data.code == 200) { + this.InsertFormdialog = false; + this.insertform = {}; + this.$message({ + message: "娣诲姞鎴愬姛锛�", + type: "success", + }); + this.getRoleTabelData(); + } else { + this.$message({ + message: "娣诲姞澶辫触锛�", + type: "warning", + }); + } +}, +updateFromClose() { + this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") + .then((_) => { + this.UpdateFormdialog = false; + this.updateform = {}; + this.getRoleTabelData(); + }) + .catch((_) => { }); +}, + async updateFromData() { + if (this.updateform.depValue == null) { + this.$message({ + message: "璇烽�夋嫨瑙掕壊鎵�灞炲崟浣�", + type: "warning", + }); + return; + } + console.log(this.updateform); + const data = await updateRole(this.updateform); + if (data.code == 200) { + this.UpdateFormdialog = false; + this.updateform = {}; + this.$message({ + message: "淇敼鎴愬姛锛�", + type: "success", + }); + this.getRoleTabelData(); + } else { + this.$message({ + message: "淇敼澶辫触锛�", + type: "warning", + }); + } +}, +handleDelete() { + var std = []; + for (var i in this.multipleSelection) { + std.push(this.multipleSelection[i].id); + } + this.$confirm("姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", + }) + .then(async () => { + const data = await deleteRoles({ ids: std.toString() }); + if (data.code == 200) { this.InsertFormdialog = false; - this.insertform = {}; this.$message({ - message: "娣诲姞鎴愬姛锛�", + message: "鍒犻櫎鎴愬姛锛�", type: "success", }); this.getRoleTabelData(); } else { this.$message({ - message: "娣诲姞澶辫触锛�", + message: "鍒犻櫎澶辫触锛�", type: "warning", }); } - }, - updateFromClose() { - this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") - .then((_) => { - this.UpdateFormdialog = false; - this.updateform = {}; - this.getRoleTabelData(); - }) - .catch((_) => {}); - }, - async updateFromData() { - if (this.updateform.depValue == null) { - this.$message({ - message: "璇烽�夋嫨瑙掕壊鎵�灞炲崟浣�", - type: "warning", - }); - return; - } - console.log(this.updateform); - const data = await updateRole(this.updateform); - if (data.code == 200) { - this.UpdateFormdialog = false; - this.updateform = {}; - this.$message({ - message: "淇敼鎴愬姛锛�", - type: "success", - }); - this.getRoleTabelData(); - } else { - this.$message({ - message: "淇敼澶辫触锛�", - type: "warning", - }); - } - }, - handleDelete() { - var std = []; - for (var i in this.multipleSelection) { - std.push(this.multipleSelection[i].id); - } - this.$confirm("姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ヨ鑹�, 鏄惁缁х画?", "鎻愮ず", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning", - }) - .then(async () => { - const data = await deleteRoles({ ids: std.toString() }); - - if (data.code == 200) { - this.InsertFormdialog = false; - this.$message({ - message: "鍒犻櫎鎴愬姛锛�", - type: "success", - }); - this.getRoleTabelData(); - } else { - this.$message({ - message: "鍒犻櫎澶辫触锛�", - type: "warning", - }); - } - }) - .catch(() => { - this.$message({ - type: "info", - message: "宸插彇娑堝垹闄�", - }); - }); - }, - handleSizeChange(val) { - this.listData.pageSize = val; - this.getRoleTabelData(); - }, - handleCurrentChange(val) { - this.listData.pageIndex = val; - this.getRoleTabelData(); - }, + }) + .catch(() => { + this.$message({ + type: "info", + message: "宸插彇娑堝垹闄�", + }); + }); +}, +handleSizeChange(val) { + this.listData.pageSize = val; + this.getRoleTabelData(); +}, +handleCurrentChange(val) { + this.listData.pageIndex = val; + this.getRoleTabelData(); +}, async handleEdit(index, row) { - this.updateform = row; - // this.updateform.isAdmin = row.isAdmin.toString(); - const data = await selectDep({ id: row.depid }); - if (data.result == null) { - this.updateform.depValue = null; - } else { - this.updateform.depValue = data.result.name; - } + this.updateform = row; + // this.updateform.isAdmin = row.isAdmin.toString(); + const data = await selectDep({ id: row.depid }); + if (data.result == null) { + this.updateform.depValue = null; + } else { + this.updateform.depValue = data.result.name; + } - this.UpdateFormdialog = true; - }, - onSubmit() { + this.UpdateFormdialog = true; +}, +onSubmit() { + this.getRoleTabelData(); +}, +resetForm(formName) { + this.$refs[formName].resetFields(); + this.roleForm = {}; + this.getRoleTabelData(); +}, +showPermsMenu(res) { + switch (res.tag) { + case "/delete": + this.menuStatus.delete = true; + break; + case "/insert": + this.menuStatus.insert = true; + break; + case "/update": + this.menuStatus.update = true; + break; + } +}, +handleClose() { + this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") + .then((_) => { + this.InsertFormdialog = false; + }) + .catch((_) => { }); +}, +handleCloseEdit() { + this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") + .then((_) => { + this.UpdateFormdialog = false; this.getRoleTabelData(); - }, - resetForm(formName) { - this.$refs[formName].resetFields(); - this.roleForm = {}; - this.getRoleTabelData(); - }, - showPermsMenu(res) { - switch (res.tag) { - case "/delete": - this.menuStatus.delete = true; - break; - case "/insert": - this.menuStatus.insert = true; - break; - case "/update": - this.menuStatus.update = true; - break; - } - }, - handleClose() { - this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") - .then((_) => { - this.InsertFormdialog = false; - }) - .catch((_) => {}); - }, - handleCloseEdit() { - this.$confirm("鍏抽棴鍚庢棤娉曚繚瀛橈紝鏄惁鍏抽棴?") - .then((_) => { - this.UpdateFormdialog = false; - this.getRoleTabelData(); - }) - .catch((_) => {}); - }, + }) + .catch((_) => { }); +}, }, - beforeDestroy() { - this.timer && clearTimeout(this.timer); - window.removeEventListener("resize", this.onResize); - }, - mounted() { - window.addEventListener("resize", this.onResize); - this.calHeight(); - }, - created() { - var val = this.$store.state.currentPerms; - var permsEntity = this.$store.state.permsEntity; - for (var i = 0; i < permsEntity.length; i++) { - if (permsEntity[i].perms == val) { - this.showPermsMenu(permsEntity[i]); - } +beforeDestroy() { + this.timer && clearTimeout(this.timer); + window.removeEventListener("resize", this.onResize); +}, +mounted() { + window.addEventListener("resize", this.onResize); + this.calHeight(); +}, +created() { + var val = this.$store.state.currentPerms; + var permsEntity = this.$store.state.permsEntity; + for (var i = 0; i < permsEntity.length; i++) { + if (permsEntity[i].perms == val) { + this.showPermsMenu(permsEntity[i]); } - this.getRoleTabelData(); - this.getDepList(); - }, + } + this.getRoleTabelData(); + this.getDepList(); +}, }; </script> <style lang="less" scoped> @@ -990,6 +808,7 @@ .el-input { width: 300px; } + .leftTree { position: absolute; z-index: 9999; @@ -1002,12 +821,14 @@ height: 550px; overflow: auto; } + .btnBox { width: 123px; margin: 10px auto 0; // background-color: red; } } + .inquire { height: auto; -- Gitblit v1.9.3