From aa82e3631a7571ce14f44ab5cb57401abd89692e Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期五, 21 七月 2023 16:24:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane
---
src/api/api.js | 39 ++
src/assets/lang/zh.js | 16
public/config/config.js | 6
src/views/AuthorizationManagement/roleResAuthorization.vue | 417 +++++++++----------------
src/views/datamanage/js/layerManage.js | 45 ++
src/assets/lang/en.js | 16
src/views/datamanage/layerManagement.vue | 402 +++++++++++++++---------
src/views/maintenance/empowerController.vue | 4
8 files changed, 519 insertions(+), 426 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index b07ada4..1a40295 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -8,9 +8,9 @@
var fmeHost = isWeb ? "103.85.165.99" + ":8051" : '192.168.20.83' + ":88";
var iisHost = isWeb ? "103.85.165.99" + ":8050" : '192.168.20.83' + ":80";
-const webUrl = isWeb ? "/web" : "";
- //SDK璁稿彲
-var StaticFileBaseUrl= webUrl + "/CIMSDK/";
+const webUrl = true ? "/middle" : "";
+//SDK璁稿彲
+var StaticFileBaseUrl = webUrl + "/CIMSDK/";
var menuStartName = "SmartEarth涓夌淮鍦扮悊淇℃伅绯荤粺骞冲彴V7.0";
var LFData = "http://" + iisHost + "/LFData";
diff --git a/src/api/api.js b/src/api/api.js
index e19b059..ec23592 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -203,6 +203,45 @@
export function deleteRess(params) {
return request.get('/res/deleteRess', { params: params });
}
+//璧勬簮琛ㄦ煡璇㈡墍鏈�
+
+export function res_selectAll(params) {
+ return request.get('/res/selectAll', { params: params });
+}
+//璧勬簮鍒楄〃-鎻掑叆涓�鏉�
+export function res_insert(params) {
+ return request.post('/res/insert', params);
+}
+
+//璧勬簮鍒楄〃-鎻掑叆涓�鏉�
+export function res_delete(params) {
+ return request.get('/res/delete', { params: params });
+}
+//璧勬簮鍒楄〃-鏇存柊澶氭潯
+export function res_updates(params) {
+ return request.post('/res/updates', params);
+}
+
+
+
+
+//瑙掕壊璧勬簮-鏍规嵁ID鏌ヨ
+export function roleRes_selectResByRole(params) {
+ return request.get('/roleRes/selectResByRole', { params: params });
+}
+
+
+
+//瑙掕壊璧勬簮-鎵归噺鏂板
+export function roleRes_inserts(params) {
+ return request.post('/roleRes/inserts', params);
+}
+//瑙掕壊璧勬簮-鍒犻櫎澶氭潯
+export function roleRes_deletes(params) {
+ return request.get('/roleRes/deletes', { params: params });
+}
+
+
//璧勬簮涓婁紶
export function upload_res(params) {
return request.post('/res/upload', params);
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 356a689..b251746 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -80,6 +80,7 @@
menuName: 'menu name',
menuType: 'Menu Type',
layerName: 'Layer Name',
+ englishName: 'English name',
layerType: 'Layer Type',
serviceName: 'service name',
serviceType: 'service type',
@@ -89,15 +90,28 @@
dataType: 'data type',
istrue: 'true',
isfalse: 'false',
+ isEnable: 'Enable',
+ isDisuse: 'Disuse',
+ isStop: 'Stop',
+ testAddress: 'Test Address',
+ firm: 'firm',
+ descr: 'descr',
+ status: 'status',
+ proxyAddress: 'Proxy Address',
enTableName: 'English Table Name',
prompt1: 'Please enter a layer name',
prompt2: 'Please select a layer type',
prompt3: 'Please select a service type',
prompt4: 'Please enter the service address',
- prompt6: 'Please enter the name of the English table (eg: m_geocontrollpoint)',
+ prompt6: 'Please enter an English name',
prompt7: 'Please enter note information',
prompt8: 'Please select a data type',
+ prompt9: 'Please enter the testing address',
+ prompt10: 'Please enter descriptive information',
+ prompt11: 'Please enter the proxy address',
+ prompt12: 'Please enter a table name',
+ tableName: 'Table Name'
},
dataStaticObj: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 8f6b505..781d989 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -80,6 +80,7 @@
menuName: '鑿滃崟鍚嶇О',
menuType: '鑿滃崟绫诲瀷',
layerName: '鍥惧眰鍚嶇О',
+ englishName: '鑻辨枃鍚嶇О',
layerType: '鍥惧眰绫诲瀷',
serviceName: '鏈嶅姟鍚嶇О',
serviceType: '鏈嶅姟绫诲瀷',
@@ -89,14 +90,27 @@
dataType: '鏁版嵁绫诲瀷',
istrue: '鏄�',
isfalse: '鍚�',
+ isEnable: '鍚敤',
+ isDisuse: '搴熷純',
+ isStop: '鍋滄',
+ testAddress: '娴嬭瘯鍦板潃',
+ firm: '鍘傚晢',
+ descr: '鎻忚堪',
+ status: '鐘舵��',
+ proxyAddress: '浠ｇ悊鍦板潃',
enTableName: '鑻辨枃琛ㄥ悕绉�',
prompt1: '璇疯緭鍏ュ浘灞傚悕绉�',
prompt2: '璇烽�夋嫨鍥惧眰绫诲瀷',
prompt3: '璇烽�夋嫨鏈嶅姟绫诲瀷',
prompt4: '璇疯緭鍏ユ湇鍔″湴鍧�',
- prompt6: '璇疯緭鍏ヨ嫳鏂囪〃鍚嶇О(濡�:m_geocontrolpoint)',
+ prompt6: '璇疯緭鍏ヨ嫳鏂囧悕绉�',
prompt7: '璇疯緭鍏ュ娉ㄤ俊鎭�',
prompt8: '璇烽�夋嫨鏁版嵁绫诲瀷',
+ prompt9: '璇疯緭鍏ユ祴璇曞湴鍧�',
+ prompt10: '璇疯緭鍏ユ弿杩颁俊鎭�',
+ prompt11: '璇疯緭鍏ヤ唬鐞嗗湴鍧�',
+ prompt12: '璇疯緭鍏ヨ〃鍚嶇О',
+ tableName: '琛ㄥ悕绉�'
},
dataStaticObj: {
type1: '鏈嶅姟鍚嶇О',
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 26b9547..447ceb2 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -41,7 +41,7 @@
border
@row-click="singleElection"
highlight-current-row
- height="calc(100% - 80px)"
+ height="calc(100% - 80px)"
>
<el-table-column
align="center"
@@ -123,221 +123,18 @@
</div>
</div>
<el-divider class="divider" />
-
- <el-table
- :data="usertableData"
- border
- style="width: 100%"
- height="calc(100% - 80px)"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
- type="selection"
- width="55"
- > </el-table-column>
- <el-table-column
- align="center"
- type="index"
- :label="$t('dataManage.styleObj.index')"
- />
- <el-table-column
- prop="resName"
- :label="$t('operatManage.UserRoleAuthorizationObj.name')"
- >
- </el-table-column>
- <el-table-column
- prop="server"
- :label="$t('operatManage.UserRoleAuthorizationObj.server')"
- >
- </el-table-column>
- </el-table>
-
- <div
- style="margin-top: 10px; text-align: center"
- class="pagination_box"
- >
- <el-pagination
- @size-change="userhandleSizeChange"
- @current-change="userhandleCurrentChange"
- :current-page="userlistData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="userlistData.pageSize"
- layout="prev, pager, next"
- :total="usercount"
- >
- </el-pagination>
- </div>
- </div>
- </div>
-
- <!-- <div class="menuSettings_tree">
- <My-bread
- :list="[
- `${$t('operatManage.operatManage')}`,
- `${$t('operatManage.RoleResAuthorization')}`,
- ]"
- ></My-bread>
-
- <el-divider />
- <div class="menuTreeBox">
<el-tree
- :data="depList"
- :props="defaultProps"
- :show-checkbox="true"
- :check-on-click-node="true"
- :check-strictly="true"
- node-key="id"
- @check="treeCheck"
- ref="treeForm"
+ ref="tree"
+ :props="defaultLayerrops"
+ node-key="resid"
+ :data="layerData"
+ show-checkbox
:default-expanded-keys="[1]"
>
</el-tree>
</div>
</div>
- <div
- class="menuSettings_tree"
- style="margin-left: 10px; width: calc(50% - 172px)"
- >
- <div
- style="
- font-size: 14px;
- color: #606266;
- line-height: 1;
- cursor: text;
- position: relative;
- top: 10px;
- margin-left: 10px;
- "
- >
- {{ $t('operatManage.UserRoleAuthorizationObj.RoleTable') }}
- </div>
- <el-divider />
- <el-table
- :data="tableData"
- style="width: 100%"
- @row-click="singleElection"
- highlight-current-row
- height="85%"
- :header-cell-style="{
- background: 'transparent',
- }"
- >
- <el-table-column align="center" width="55">
- <template slot-scope="scope">
- <el-radio
- class="radio"
- v-model="templateSelection"
- :label="scope.row.id"
- > </el-radio
- >
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- type="index"
- :label="$t('dataManage.styleObj.index')"
- />
- <el-table-column
- prop="name"
- :label="$t('operatManage.UserRoleAuthorizationObj.name')"
- >
- </el-table-column>
- </el-table>
- <div style="text-align: center; margin-top: 20px">
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="userlistData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
- >
- </el-pagination>
- </div>
- </div>
- <div class="menuSettings">
- <div
- style="
- font-size: 14px;
- color: #606266;
- line-height: 1;
- cursor: text;
- position: relative;
- top: 5px;
- margin-left: 10px;
- display: flex;
- align-items: center;
- "
- >
- <span>
- {{ $t('operatManage.UserRoleAuthorizationObj.userTable') }}</span
- >
- <div class="btn" style="margin-left: auto">
- <el-button
- v-if="menuStatus.insert"
- type="primary"
- icon="el-icon-circle-plus-outline"
- size="small"
- :disabled="roleid == null ? true : false"
- @click="adduser"
- >{{ $t('operatManage.UserRoleAuthorizationObj.Added') }}</el-button
- >
- <el-button
- v-if="menuStatus.delete"
- type="danger"
- icon="el-icon-delete"
- size="small"
- @click="deletesUser"
- :disabled="roleid == null ? true : false"
- >{{ $t('operatManage.UserRoleAuthorizationObj.delete') }}</el-button
- >
- </div>
- </div>
- <el-divider class="divider" />
-
- <el-table
- :data="usertableData"
- stripe
- style="width: 100%"
- height="85%"
- @selection-change="handleSelectionChange"
- :header-cell-style="{
- background: 'transparent',
- }"
- >
- <el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column
- align="center"
- type="index"
- :label="$t('dataManage.styleObj.index')"
- />
- <el-table-column
- prop="resName"
- :label="$t('operatManage.UserRoleAuthorizationObj.name')"
- >
- </el-table-column>
- <el-table-column
- prop="server"
- :label="$t('operatManage.UserRoleAuthorizationObj.server')"
- >
- </el-table-column>
- </el-table>
-
- <div style="margin-top: 20px; text-align: center" class="pagination_box">
- <el-pagination
- @size-change="userhandleSizeChange"
- @current-change="userhandleCurrentChange"
- :current-page="userlistData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="userlistData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="usercount"
- >
- </el-pagination>
- </div>
- </div> -->
<el-dialog
:title="$t('operatManage.UserRoleAuthorizationObj.Added')"
:visible.sync="dialogTableVisible"
@@ -411,6 +208,10 @@
roleResDeletes,
resSelectCountForRole,
roleResInserts,
+ res_selectAll,
+ roleRes_selectResByRole,
+ roleRes_inserts,
+ roleRes_deletes
} from '../../api/api';
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -443,7 +244,10 @@
templateSelection: '',
// 褰撳墠閫夋嫨鐨勮鐨勬暟鎹�
checkList: [],
-
+ defaultLayerrops: {
+ children: "children",
+ label: "cnName",
+ },
defaultProps: {
children: 'children',
label: 'name',
@@ -461,6 +265,9 @@
debid: null,
roleid: null,
addmultipleSelection: [],
+ layerData: [],
+ layeroption: []
+
};
},
methods: {
@@ -489,50 +296,91 @@
})
.catch(() => { });
},
- adduser() {
- this.dialogTableVisible = true;
- this.getadduserList();
+ async adduser() {
+ var val = this.$refs.tree.getCheckedNodes(false, true); // 鍒╃敤杩欎釜鏂规硶灏卞彲浠ヨ幏鍙栧埌瀛愯妭鐐�+鐖惰妭鐐�)
+
+ var std = [];
+ for (var i in val) {
+ if (val[i].id == 0) {
+ val[i].roleid = this.roleid
+ std.push(val[i])
+ }
+ }
+ if (std.length == 0) {
+ return
+ }
+ const data = await roleRes_inserts(std)
+ if (data.code != 200) {
+ this.$message.error('鎺堟潈澶辫触');
+ } else {
+ this.$message({
+ type: 'success',
+ message: '鎺堟潈鎴愬姛!',
+ });
+ }
+ this.getuserList();
+ // this.dialogTableVisible = true;
+ // this.getadduserList();
},
//鐢ㄦ埛鍒犻櫎
async deletesUser() {
- let arr = [];
- this.usermultipleSelection.forEach((e) => {
- arr.push(e.id);
- });
- this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ潈闄�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(async () => {
- const data = await roleResDeletes({ ids: arr.toString() });
- if (data.code == 200) {
- this.InsertFormdialog = false;
- this.$message({
- message: '鍒犻櫎鎴愬姛锛�',
- type: 'success',
- });
- this.getuserList();
- } else {
- this.$message({
- message: '鍒犻櫎澶辫触锛�',
- type: 'warning',
- });
+ var val = this.$refs.tree.getCheckedNodes(false, true); // 鍒╃敤杩欎釜鏂规硶灏卞彲浠ヨ幏鍙栧埌瀛愯妭鐐�+鐖惰妭鐐�)
+ var std = [];
+ for (var i in val) {
+ if (val[i].id > 0) {
+ std.push(val[i].id)
}
- }).catch(() => {
+ }
+ var res = this.layeroption;
+ var arr = [];
+ for (var i in res) {
+ if (res[i].id > 0 && std.indexOf(res[i].id) == -1) {
+ arr.push(res[i].id)
+ }
+ }
+ if (arr.length == 0) {
+ return
+ }
+ const data = await roleRes_deletes({ ids: arr.toString() });
+ if (data.code != 200) {
+ this.$message.error('鎺堟潈澶辫触');
+ } else {
this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
+ type: 'success',
+ message: '鎺堟潈鎴愬姛!',
});
- });
- // const data = await roleResDeletes({ ids: arr.toString() });
- // if (data.code !== 200) {
- // return this.$message.error('鍒犻櫎澶辫触');
- // }
- // this.$message({
- // message: '鍒犻櫎鎴愬姛',
- // type: 'success',
+ }
+ this.getuserList()
+ // let arr = [];
+ // this.usermultipleSelection.forEach((e) => {
+ // arr.push(e.id);
// });
- // this.getuserList();
+ // this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ潈闄�, 鏄惁缁х画?', '鎻愮ず', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // type: 'warning'
+ // }).then(async () => {
+ // const data = await roleResDeletes({ ids: arr.toString() });
+ // if (data.code == 200) {
+ // this.InsertFormdialog = false;
+ // this.$message({
+ // message: '鍒犻櫎鎴愬姛锛�',
+ // type: 'success',
+ // });
+ // this.getuserList();
+ // } else {
+ // this.$message({
+ // message: '鍒犻櫎澶辫触锛�',
+ // type: 'warning',
+ // });
+ // }
+ // }).catch(() => {
+ // this.$message({
+ // type: 'info',
+ // message: '宸插彇娑堝垹闄�'
+ // });
+ // });
+
},
//鐢ㄦ埛琛ㄥ閫�
handleSelectionChange(val) {
@@ -571,6 +419,35 @@
handleCurrentChange(val) {
this.listData.pageIndex = val;
this.getRole();
+ },
+ //鑾峰彇璧勬簮鍒楄〃
+ async getlayerTree() {
+ this.layerData = []
+ const data = await res_selectAll();
+ if (data.code != 200) {
+ return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
+ }
+ var val = this.setTreeData(data.result);
+ val.sort(function (a, b) {
+ return a.sort - b.sort
+ })
+ this.layerData = val
+ },
+ setTreeData(source) {
+ let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
+ return cloneData.filter((father) => {
+ // 寰幆鎵�鏈夐」
+ let branchArr = cloneData.filter((child) => father.resid == child.pid);
+ if (branchArr.length > 0) {
+ branchArr.sort(function (a, b) {
+ return a.sort - b.sort
+ })
+ }
+ branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+ // 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭ｄ箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭ｄ箞 a.c.d 涔熸槸=2锛�
+ // 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋�
+ return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
+ });
},
// 瑙掕壊鍗曢��
singleElection(row) {
@@ -620,25 +497,41 @@
}
},
async getadduserList() {
- this.addlistData.roleid = this.roleid;
+ // this.addlistData.roleid = this.roleid;
- // this.addlistData.debid = this.debid;
- const data = await resSelectCountForRole(this.addlistData);
- if (data.code !== 200) {
- return this.$message.error('鏂板璧勬簮鍒楄〃璇锋眰閿欒');
- }
+ // // this.addlistData.debid = this.debid;
+ // const data = await resSelectCountForRole(this.addlistData);
+ // if (data.code !== 200) {
+ // return this.$message.error('鏂板璧勬簮鍒楄〃璇锋眰閿欒');
+ // }
- this.gridData = data.result;
- this.addcount = data.count;
+ // this.gridData = data.result;
+ // this.addcount = data.count;
+
+
},
// 鐢ㄦ埛琛ㄨ姹�
async getuserList() {
- const data = await roleReselectByPageAndCount(this.userlistData);
+ this.layerData = [];
+ this.layeroption = [];
+
+ const data = await roleRes_selectResByRole({ roleid: this.userlistData.roleid });
if (data.code !== 200) {
- return this.$message.error('鐢ㄦ埛璧勬簮鍒楄〃璇锋眰閿欒');
+ return this.$message.error('鏍规嵁ID鏌ヨ璧勬簮澶辫触');
}
- this.usertableData = data.result;
- this.usercount = data.count;
+ var std = [];
+ this.layeroption = data.result;
+ for (var i in data.result) {
+ if (data.result[i].id > 0 && data.result[i].type != 1) {
+ std.push(data.result[i].resid)
+ }
+ }
+ var val = this.setTreeData(data.result);
+ val.sort(function (a, b) {
+ return a.sort - b.sort
+ })
+ this.layerData = val
+ this.$refs.tree.setCheckedKeys(std);
},
// 瑙掕壊琛ㄨ姹�
async getRole() {
@@ -676,6 +569,7 @@
}
}
this.getMenuTree();
+ // this.getlayerTree();
},
};
</script>
@@ -685,14 +579,14 @@
height: calc(100% - 20px);
//height: 98%;
width: 98%;
- padding:10px 1%;
+ padding: 10px 1%;
.menuSettings_tree {
width: 100%;
height: 100%;
display: flex;
justify-content: space-around;
- .content_left_box{
+ .content_left_box {
padding: 10px;
width: 20%;
height: calc(100% - 20px);
@@ -717,5 +611,4 @@
.el-table /deep/ tr {
background-color: transparent !important;
}
-
</style>
diff --git a/src/views/datamanage/js/layerManage.js b/src/views/datamanage/js/layerManage.js
index 8c821a1..4b1ddd9 100644
--- a/src/views/datamanage/js/layerManage.js
+++ b/src/views/datamanage/js/layerManage.js
@@ -1,8 +1,43 @@
export const serve_type = [
- 'Mpt', 'Tileset', 'WMS', 'TMS'
-];
-export const data_type = [
- '鍩虹鍕樺療', '鍩虹鍦扮伨', '鍩虹娴嬬粯', '宸ョ▼绾胯矾', '宸ョ▼娴嬬粯', '宸ョ▼娲炲簱',
- '鑷姩鍙戝竷妯″瀷', '宸ョ▼鍕樺療', '宸ョ▼鍦扮伨', '鑷姩鍙戝竷褰卞儚', '鑷姩鍙戝竷鍦板舰鍦烘櫙', '鍏朵粬'
+ {
+ name: 'URL',
+ value: 0
+ }, {
+ name: 'TMS',
+ value: 1
+
+ }, {
+ name: 'WMTS',
+ value: 2
+
+ }, {
+ name: 'WFS',
+ value: 3
+
+ }, {
+ name: 'Tileset',
+ value: 4
+
+ },
+]
+export const data_type = [
+
+ {
+ name: 'GisServer',
+ value: 1
+
+ }, {
+ name: 'GeoServer',
+ value: 2
+
+ }, {
+ name: '鏁扮畝',
+ value: 3
+
+ }, {
+ name: '鍏朵粬',
+ value: 0
+
+ }
]
\ No newline at end of file
diff --git a/src/views/datamanage/layerManagement.vue b/src/views/datamanage/layerManagement.vue
index 9caeb2c..ee9c5ee 100644
--- a/src/views/datamanage/layerManagement.vue
+++ b/src/views/datamanage/layerManagement.vue
@@ -58,7 +58,7 @@
>{{ $t("shuJuGuanLi.butten.NewPeer") }}</el-button>
</el-form-item>
<!-- 瀛愮骇鑺傜偣娣诲姞 -->
- <el-form-item v-show="menuStatus.insert">
+ <el-form-item v-show="menuStatus.insert && formInline.type == 1">
<el-button
type="success"
size="small"
@@ -108,40 +108,70 @@
<!-- 鑿滃崟鍚嶇О -->
<el-form-item :label="$t('dataManage.layerObj.layerName')">
<el-input
- :placeholder="$t('dataManage.layerObj.prompt1')"
- style="width: 60%;"
+ style="width: 80%;"
v-model="formInline.cnName"
-
+ :placeholder="$t('dataManage.layerObj.prompt1')"
+ ></el-input>
+ </el-form-item>
+ <!-- 鑻辨枃鍚嶇О -->
+ <el-form-item :label="$t('dataManage.layerObj.englishName')">
+ <el-input
+ style="width: 80%;"
+ v-model="formInline.enName"
+ :placeholder="$t('dataManage.layerObj.prompt6')"
></el-input>
</el-form-item>
<!-- 鑿滃崟绫诲瀷 -->
<el-form-item :label="$t('dataManage.layerObj.layerType')">
<el-select
- :placeholder="$t('dataManage.layerObj.prompt2')"
clearable
- style="width: 60%;"
+ style="width: 80%;"
v-model="formInline.type"
-
+ :placeholder="$t('dataManage.layerObj.prompt2')"
>
<el-option
- label="鐩綍"
- value='1'
+ label="鍥惧眰缁�"
+ :value='1'
></el-option>
<el-option
- label="鍥惧眰"
- value='2'
+ label="鏅�氬浘灞�"
+ :value='2'
></el-option>
+ <el-option
+ label="浠ｇ悊鍥惧眰"
+ :value='3'
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鏁版嵁绫诲瀷 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.firm')"
+ >
+ <el-select
+ clearable
+ style="width: 80%;"
+ v-model="formInline.firm"
+ :placeholder="$t('dataManage.layerObj.prompt8')"
+ >
+ <el-option
+ v-for="item in dataType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟绫诲瀷 -->
<el-form-item
- v-show="formInline.type == 2"
+ v-show="formInline.type === 2 || formInline.type === 3 "
:label="$t('dataManage.layerObj.serviceType')"
>
<el-select
clearable
- style="width: 60%;"
- v-model="formInline.serveType"
+ style="width: 80%;"
+ v-model="formInline.category"
:placeholder="$t('dataManage.layerObj.prompt3')"
>
<el-option
@@ -155,77 +185,86 @@
</el-form-item>
<!-- 鏈嶅姟鍦板潃 -->
<el-form-item
- v-show="formInline.type == 2"
+ v-show="formInline.type === 2 || formInline.type === 3 "
:label="$t('dataManage.layerObj.serviceAddress')"
>
<el-input
:placeholder="$t('dataManage.layerObj.prompt4')"
- style="width: 60%;"
+ style="width: 80%;"
v-model="formInline.url"
+ ></el-input>
+ </el-form-item>
+ <!-- 娴嬭瘯鍦板潃 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.testAddress')"
+ >
+ <el-input
+ :placeholder="$t('dataManage.layerObj.prompt9')"
+ style="width: 80%;"
+ v-model="formInline.test"
+ ></el-input>
+ </el-form-item>
+ <!-- 浠ｇ悊鍦板潃 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.proxyAddress')"
+ >
+ <el-input
+ :disabled="!formInline.proxy"
+ :placeholder="$t('dataManage.layerObj.prompt11')"
+ style="width: 80%;"
+ :value="formInline.proxy"
></el-input>
</el-form-item>
<!-- 鑻辨枃琛ㄥ悕 -->
<el-form-item
- v-show="formInline.type == 2 && formInline.serveType =='WMS'"
- :label="$t('dataManage.layerObj.enTableName')"
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.tableName')"
>
<el-input
- :placeholder="$t('dataManage.layerObj.prompt6')"
- style="width: 60%;"
- v-model="formInline.enName"
+ :placeholder="$t('dataManage.layerObj.prompt12')"
+ style="width: 80%;"
+ v-model="formInline.tab"
></el-input>
</el-form-item>
- <!-- 鏁版嵁绫诲瀷 -->
- <el-form-item :label="$t('dataManage.layerObj.dataType')">
- <el-select
- clearable
- style="width: 60%;"
- v-model="formInline.dataType"
- :placeholder="$t('dataManage.layerObj.prompt8')"
- >
- <el-option
- v-for="item in dataType"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
+
<!-- 鏄惁鏄剧ず -->
<el-form-item
- v-show="formInline.type == 2"
- :label="$t('dataManage.layerObj.displayOrNot')"
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.status')"
>
<el-radio
- v-model="formInline.isShow"
- label="0"
- > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ v-model="formInline.status"
+ :label="0"
+ > {{$t('dataManage.layerObj.isStop')}}</el-radio>
<el-radio
- v-model="formInline.isShow"
- label="1"
- >{{$t('dataManage.layerObj.istrue')}}</el-radio>
+ v-model="formInline.status"
+ :label="1"
+ >{{$t('dataManage.layerObj.isEnable')}}</el-radio>
+ <el-radio
+ v-model="formInline.status"
+ :label="-1"
+ >{{$t('dataManage.layerObj.isDisuse')}}</el-radio>
</el-form-item>
<!-- 鏄惁涓洪」鐩暟鎹� -->
- <el-form-item
- v-show="formInline.type == 2"
- :label="$t('dataManage.layerObj.isItProjectData')"
- >
- <el-radio
- v-model="formInline.isProject"
- label="0"
- > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
- <el-radio
- v-model="formInline.isProject"
- label="1"
- >{{$t('dataManage.layerObj.istrue')}}</el-radio>
- </el-form-item>
+ <!-- <el-form-item :label="$t('dataManage.layerObj.isItProjectData')">
+ <el-radio
+ v-model="insertData.isProject"
+ label="0"
+ > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ <el-radio
+ v-model="insertData.isProject"
+ label="1"
+ >{{$t('dataManage.layerObj.istrue')}}</el-radio>
+ </el-form-item> -->
<!-- 鎻忚堪 -->
- <el-form-item :label="$t('common.bak')">
+ <el-form-item :label="$t('dataManage.layerObj.descr')">
<el-input
- style="width: 60%;"
- v-model="formInline.bak"
- :placeholder="$t('dataManage.layerObj.prompt7')"
+ :placeholder="$t('dataManage.layerObj.prompt10')"
+ style="width: 80%;"
+ v-model="formInline.descr"
+ type="textarea"
></el-input>
</el-form-item>
<el-form-item v-show="menuStatus.update">
@@ -263,6 +302,14 @@
:placeholder="$t('dataManage.layerObj.prompt1')"
></el-input>
</el-form-item>
+ <!-- 鑻辨枃鍚嶇О -->
+ <el-form-item :label="$t('dataManage.layerObj.englishName')">
+ <el-input
+ style="width: 80%;"
+ v-model="insertData.enName"
+ :placeholder="$t('dataManage.layerObj.prompt6')"
+ ></el-input>
+ </el-form-item>
<!-- 鑿滃崟绫诲瀷 -->
<el-form-item :label="$t('dataManage.layerObj.layerType')">
<el-select
@@ -272,24 +319,48 @@
:placeholder="$t('dataManage.layerObj.prompt2')"
>
<el-option
- label="鐩綍"
- value='1'
+ label="鍥惧眰缁�"
+ :value='1'
></el-option>
<el-option
- label="鍥惧眰"
- value='2'
+ label="鏅�氬浘灞�"
+ :value='2'
></el-option>
+ <el-option
+ label="浠ｇ悊鍥惧眰"
+ :value='3'
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- 鏁版嵁绫诲瀷 -->
+ <el-form-item
+ v-show="insertData.type === 2 || insertData.type === 3"
+ :label="$t('dataManage.layerObj.firm')"
+ >
+ <el-select
+ clearable
+ style="width: 80%;"
+ v-model="insertData.firm"
+ :placeholder="$t('dataManage.layerObj.prompt8')"
+ >
+ <el-option
+ v-for="item in dataType"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟绫诲瀷 -->
<el-form-item
- v-show="insertData.type == 2"
+ v-show="insertData.type === 2 || insertData.type === 3"
:label="$t('dataManage.layerObj.serviceType')"
>
<el-select
clearable
style="width: 80%;"
- v-model="insertData.serveType"
+ v-model="insertData.category"
:placeholder="$t('dataManage.layerObj.prompt3')"
>
<el-option
@@ -303,7 +374,7 @@
</el-form-item>
<!-- 鏈嶅姟鍦板潃 -->
<el-form-item
- v-show="insertData.type == 2"
+ v-show="insertData.type === 2 || insertData.type === 3"
:label="$t('dataManage.layerObj.serviceAddress')"
>
<el-input
@@ -312,53 +383,48 @@
v-model="insertData.url"
></el-input>
</el-form-item>
- <!-- 鑻辨枃琛ㄥ悕 -->
<el-form-item
- v-show="insertData.type == 2 && insertData.serveType =='WMS'"
- :label="$t('dataManage.layerObj.enTableName')"
+ v-show="insertData.type === 2 || insertData.type === 3"
+ :label="$t('dataManage.layerObj.testAddress')"
>
<el-input
- :placeholder="$t('dataManage.layerObj.prompt6')"
+ :placeholder="$t('dataManage.layerObj.prompt9')"
style="width: 80%;"
- v-model="insertData.enName"
+ v-model="insertData.test"
></el-input>
</el-form-item>
- <!-- 鏁版嵁绫诲瀷 -->
- <el-form-item :label="$t('dataManage.layerObj.dataType')">
- <el-select
- clearable
+ <!-- 鑻辨枃琛ㄥ悕 -->
+ <el-form-item
+ v-show="formInline.type === 2 || formInline.type === 3 "
+ :label="$t('dataManage.layerObj.tableName')"
+ >
+ <el-input
+ :placeholder="$t('dataManage.layerObj.prompt12')"
style="width: 80%;"
- v-model="insertData.dataType"
- :placeholder="$t('dataManage.layerObj.prompt8')"
- >
- <el-option
- v-for="item in dataType"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ v-model="insertData.tab"
+ ></el-input>
</el-form-item>
+
<!-- 鏄惁鏄剧ず -->
<el-form-item
- v-show="insertData.type == 2"
- :label="$t('dataManage.layerObj.displayOrNot')"
+ v-show="insertData.type === 2 || insertData.type === 3"
+ :label="$t('dataManage.layerObj.status')"
>
<el-radio
- v-model="insertData.isShow"
- label="0"
- > {{$t('dataManage.layerObj.isfalse')}}</el-radio>
+ v-model="insertData.status"
+ :label="0"
+ > {{$t('dataManage.layerObj.isStop')}}</el-radio>
<el-radio
- v-model="insertData.isShow"
- label="1"
- >{{$t('dataManage.layerObj.istrue')}}</el-radio>
+ v-model="insertData.status"
+ :label="1"
+ >{{$t('dataManage.layerObj.isEnable')}}</el-radio>
+ <el-radio
+ v-model="insertData.status"
+ :label="-1"
+ >{{$t('dataManage.layerObj.isDisuse')}}</el-radio>
</el-form-item>
<!-- 鏄惁涓洪」鐩暟鎹� -->
- <el-form-item
- v-show="insertData.type == 2"
- :label="$t('dataManage.layerObj.isItProjectData')"
- >
+ <!-- <el-form-item :label="$t('dataManage.layerObj.isItProjectData')">
<el-radio
v-model="insertData.isProject"
label="0"
@@ -367,14 +433,14 @@
v-model="insertData.isProject"
label="1"
>{{$t('dataManage.layerObj.istrue')}}</el-radio>
- </el-form-item>
+ </el-form-item> -->
<!-- 鎻忚堪 -->
- <el-form-item :label="$t('common.bak')">
+ <el-form-item :label="$t('dataManage.layerObj.descr')">
<el-input
- :placeholder="$t('dataManage.layerObj.prompt7')"
+ :placeholder="$t('dataManage.layerObj.prompt10')"
style="width: 80%;"
- v-model="insertData.bak"
-
+ v-model="insertData.descr"
+ type="textarea"
></el-input>
</el-form-item>
<el-form-item v-show="menuStatus.update">
@@ -386,6 +452,7 @@
<el-button
type="info"
size="small"
+ @click="cannelForm( )"
>{{$t('common.cancel')}}</el-button>
</el-form-item>
@@ -398,11 +465,11 @@
import MyBread from "../../components/MyBread.vue";
import {
getPerms,
- layer_selectAll,
- layer_update,
- layer_updates,
- layer_insert,
- layer_delete
+ res_selectAll,
+ res_insert,
+ res_delete,
+ res_updates,
+ res_update,
} from "../../api/api";
import $ from 'jquery'
import { getToken } from '../../utils/auth';
@@ -486,11 +553,18 @@
arr.push(res);
}
});
+ var token = getToken();
+ if (arr[1].proxy && arr[1].proxy.indexOf(token) > -1) {
+ arr[1].proxy.replace(token, "{token}")
+ }
- const orderNum = arr[1].orderNum
- arr[1].orderNum = arr[0].orderNum
- arr[0].orderNum = orderNum
+ if (arr[0].proxy && arr[0].proxy.indexOf(token) > -1) {
+ arr[0].proxy.replace(token, "{token}")
+ }
+ const orderNum = arr[1].sort
+ arr[1].sort = arr[0].sort
+ arr[0].sort = orderNum
this.newData = arr;
this.sendChange();
} else {
@@ -517,9 +591,18 @@
arr.push(res);
}
});
- const orderNum = arr[1].orderNum
- arr[1].orderNum = arr[0].orderNum
- arr[0].orderNum = orderNum
+ var token = getToken();
+ if (arr[1].proxy && arr[1].proxy.indexOf(token) > -1) {
+ arr[1].proxy.replace(token, "{token}")
+ }
+
+ if (arr[0].proxy && arr[0].proxy.indexOf(token) > -1) {
+ arr[0].proxy.replace(token, "{token}")
+ }
+
+ const orderNum = arr[1].sort
+ arr[1].sort = arr[0].sort
+ arr[0].sort = orderNum
this.newData = arr;
this.sendChange();
} else {
@@ -532,7 +615,7 @@
}
},
async sendChange() {
- const data = await layer_updates(this.newData)
+ const data = await res_updates(this.newData)
if (data.code != 200) {
return this.$message.error("绉诲姩澶辫触");
}
@@ -540,7 +623,7 @@
},
async setDeleteNode() {
- const data = await layer_delete({ id: this.formInline.id });
+ const data = await res_delete({ id: this.formInline.id });
if (data.code != 200) {
return this.$message.error("鍒犻櫎澶辫触");
}
@@ -562,7 +645,7 @@
var val = this.insertData;
val.isShow = parseInt(val.isShow);
val.isProject = parseInt(val.isProject);
- const data = await layer_insert(val);
+ const data = await res_insert(val);
if (data.code != 200) {
return this.$message.error("鏂板澶辫触");
}
@@ -594,14 +677,18 @@
}
this.insertData.pid = id;
this.insertData.level = lever;
- this.insertData.orderNum = orderNum;
+ this.insertData.sort = orderNum;
this.dialogVisible = true;
},
+ cannelForm() {
+ this.dialogVisible = false;
+ this.insertData = {}
+ },
getMaxOrderNum(res) {
- var val = -100;
+ var val = 1;
for (var i in res) {
- if (res[i].data.orderNum > val) {
- val = res[i].data.orderNum;
+ if (res[i].data.sort > val) {
+ val = res[i].data.sort;
}
}
val = val + 1;
@@ -609,21 +696,17 @@
},
insertStart() {
this.insertData = {
- cnName: null,
- type: null,
- serveType: null,
- serveType: null,
- url: null,
- dataType: null,
- bak: null,
- isShow: '0',
- isProject: '0'
+
}
},
//淇敼鏁版嵁
async updateSend() {
var val = JSON.parse(JSON.stringify(this.formInline));
- const data = await layer_update(val);
+ var token = getToken()
+ if (val.proxy && val.proxy.indexOf(token) > -1) {
+ val.proxy = val.proxy.replace(token, "{token}");
+ }
+ const data = await res_update(val);
this.currentData = JSON.stringify(this.formInline)
if (data.code != 200) {
return this.$message.error("淇敼澶辫触");
@@ -637,20 +720,27 @@
//淇敼閲嶇疆
updateRest() {
var res = JSON.parse(this.backUpData);
+ var token = getToken()
+ if (res.proxy && res.proxy.indexOf('{token}') > -1) {
+ res.proxy = res.proxy.replace("{token}", token);
+ }
this.formInline = res;
- this.formInline.type = res.type.toString();
- this.formInline.isShow = res.isShow.toString();
- this.formInline.isProject = res.isProject.toString();
+ // this.formInline.type = res.type.toString();
+ // this.formInline.isShow = res.isShow.toString();
+ // this.formInline.isProject = res.isProject.toString();
},
//鑾峰彇鍥惧眰鍒楄〃
async getLayerTree() {
- const data = await layer_selectAll();
+ const data = await res_selectAll();
if (data.code != 200) {
return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
}
this.oriData = data.result;
this.newData = data.result;
var val = this.setTreeData(data.result);
+ val.sort(function (a, b) {
+ return a.sort - b.sort
+ })
this.treeData = val;
var cdata;
if (this.currentData) {
@@ -665,17 +755,23 @@
});
},
layerFormInline(res) {
-
+ var token = getToken();
var val = JSON.parse(JSON.stringify(res))
-
var data = this.$refs.tree.getNode(val.id).data;
var result = JSON.parse(JSON.stringify(data))
this.backUpData = JSON.stringify(result)
this.currentData = JSON.stringify(result)
this.formInline = result;
- this.formInline.type = result.type.toString();
- this.formInline.isShow = result.isShow.toString();
- this.formInline.isProject = result.isProject.toString();
+
+ if (result.proxy && result.proxy.indexOf('{token}') > -1) {
+ this.formInline.proxy = result.proxy.replace("{token}", token);
+ } else {
+ this.formInline.proxy = result.proxy
+ }
+
+ // this.formInline.type = result.type.toString();
+ // this.formInline.isShow = result.isShow.toString();
+ // this.formInline.isProject = result.isProject.toString();
},
//鍥惧眰鍒楄〃鐐瑰嚮浜嬩欢
handleNodeClick(data, node) {
@@ -690,7 +786,7 @@
branchArr.sort(function (a, b) {
- return a.orderNum - b.orderNum
+ return a.sort - b.sort
})
}
@@ -711,15 +807,15 @@
var ste = [];
for (var i in serve_type) {
std.push({
- value: serve_type[i],
- label: serve_type[i],
+ value: serve_type[i].value,
+ label: serve_type[i].name,
})
}
this.serveType = std;
for (var i in data_type) {
ste.push({
- value: data_type[i],
- label: data_type[i],
+ value: data_type[i].value,
+ label: data_type[i].name,
})
}
this.dataType = ste;
@@ -809,7 +905,10 @@
padding: 10px;
box-sizing: border-box;
border: 1px solid #dcdfe6;
+ overflow: auto;
.menuTop {
+ overflow: auto;
+ height: 100%;
/deep/ .el-form-item {
margin: 5px;
}
@@ -817,8 +916,7 @@
}
}
/deep/ .el-input__suffix {
-
- top: 50%;
- transform: translateY(-50%);
+ top: 50%;
+ transform: translateY(-50%);
}
</style>
diff --git a/src/views/maintenance/empowerController.vue b/src/views/maintenance/empowerController.vue
index 9dea572..7239dc7 100644
--- a/src/views/maintenance/empowerController.vue
+++ b/src/views/maintenance/empowerController.vue
@@ -31,8 +31,8 @@
<menu-role-authorization v-if="setMenuFlag == 'menuRoleAuthorization'"></menu-role-authorization>
<role-menu-authorization v-if="setMenuFlag == 'roleMenuAuthorization'">
</role-menu-authorization>
- <!-- <role-res-authorization v-if="setMenuFlag == 'roleResAuthorization'"></role-res-authorization>
- <log-log v-if="setMenuFlag == 'logLog'"> </log-log>
+ <role-res-authorization v-if="setMenuFlag == 'roleResAuthorization'"></role-res-authorization>
+ <!-- <log-log v-if="setMenuFlag == 'logLog'"> </log-log>
<operation-log v-if="setMenuFlag == 'operationLog'"></operation-log>
<eventlog-manage v-if="setMenuFlag == 'eventlogManage'"></eventlog-manage>
<tokentool v-if="setMenuFlag == 'tokentool'"></tokentool>
--
Gitblit v1.9.3