From 6995a96cc2380db13bb2295de107294258ae4c63 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期一, 04 九月 2023 17:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/PM20230220027_Web
---
src/views/layer/layerSet.vue | 246 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 176 insertions(+), 70 deletions(-)
diff --git a/src/views/layer/layerSet.vue b/src/views/layer/layerSet.vue
index c5555e7..adf4b63 100644
--- a/src/views/layer/layerSet.vue
+++ b/src/views/layer/layerSet.vue
@@ -3,7 +3,10 @@
<div class="layerBox">
<div class="layerTitle">
<div class="tileLeft">
- <div class="titleImg" @click="editState">
+ <div
+ class="titleImg"
+ @click="editState"
+ >
<ArrowLeft />
</div>
<div class="titleLable">鍥惧眰缂栬緫</div>
@@ -19,57 +22,78 @@
:expand-on-click-node="false"
@node-click="handleNodeClick"
ref="treeRef"
+ style="font-size: 16px;"
/>
</div>
</div>
<div class="edit_box">
<div class="edit_box_btn btnstyle">
- <el-button type="primary" :icon="Plus" @click="insertLayerData(1)"
- >鏂板鍚岀骇</el-button
- >
- <el-button type="primary" :icon="Plus" @click="insertLayerData(2)"
- >鏂板瀛愮骇</el-button
- >
+ <el-button
+ type="primary"
+ :icon="Plus"
+ @click="insertLayerData(1)"
+ >鏂板鍚岀骇</el-button>
+ <el-button
+ type="primary"
+ :icon="Plus"
+ @click="insertLayerData(2)"
+ >鏂板瀛愮骇</el-button>
<el-button
type="primary"
:icon="Delete"
class="delbtn"
@click="delLayer"
- >鍒犻櫎</el-button
- >
- <el-button type="primary" :icon="Top" @click="move(1)"
- >鍚戜笂绉诲姩</el-button
- >
- <el-button type="primary" :icon="Bottom" @click="move(2)"
- >鍚戜笅绉诲姩</el-button
- >
+ >鍒犻櫎</el-button>
+ <el-button
+ type="primary"
+ :icon="Top"
+ @click="move(1)"
+ >鍚戜笂绉诲姩</el-button>
+ <el-button
+ type="primary"
+ :icon="Bottom"
+ @click="move(2)"
+ >鍚戜笅绉诲姩</el-button>
</div>
<div class="edit_box_form">
- <el-form :model="formInline" label-width="120px">
+ <el-form
+ :model="formInline"
+ label-width="120px"
+ >
<el-form-item label="鍥惧眰绫诲瀷">
- <el-select style="width: 100%" v-model="formInline.isLayer">
- <el-option label="鍥惧眰缁�" value="0"></el-option>
- <el-option label="鍥惧眰" value="1"></el-option>
+ <el-select
+ style="width: 100%"
+ v-model="formInline.isLayer"
+ >
+ <el-option
+ label="鍥惧眰缁�"
+ value="0"
+ ></el-option>
+ <el-option
+ label="鍥惧眰"
+ value="1"
+ ></el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟璧勬簮-->
- <el-form-item v-show="formInline.isLayer == 1" label="鏈嶅姟璧勬簮">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏈嶅姟璧勬簮"
+ >
<el-button
size="small"
class="serviceButton"
@click="setServiceChange('0')"
key="0"
:class="{ serviceActive: !serviceActive }"
- >鍚�</el-button
- >
+ >鍚�</el-button>
<el-button
size="small"
class="serviceButton"
@click="setServiceChange('1')"
key="1"
:class="{ serviceActive: serviceActive }"
- >鏄�</el-button
- >
+ >鏄�</el-button>
</el-form-item>
<el-form-item label="鍥惧眰鍚嶇О">
@@ -79,7 +103,10 @@
/>
</el-form-item>
<!-- 鏈嶅姟绫诲埆 -->
- <el-form-item v-show="formInline.isLayer == 1" label="鏈嶅姟绫诲埆">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏈嶅姟绫诲埆"
+ >
<el-select
style="width: 100%"
v-model="formInline.category"
@@ -94,7 +121,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="琛ㄥ悕绉�" v-show="formInline.category == 2">
+ <el-form-item
+ label="琛ㄥ悕绉�"
+ v-show="formInline.category == 2"
+ >
<el-input
v-model="formInline.tab"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
@@ -102,7 +132,10 @@
/>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="formInline.isLayer == 1" label="鏁版嵁绫诲瀷">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏁版嵁绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="formInline.data"
@@ -119,7 +152,10 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="formInline.isLayer == 1" label="鏈嶅姟绫诲瀷">
+ <el-form-item
+ v-show="formInline.isLayer == 1"
+ label="鏈嶅姟绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="formInline.type"
@@ -135,7 +171,10 @@
</el-select>
</el-form-item>
- <el-form-item label="鏈嶅姟鍦板潃" v-show="formInline.isLayer == 1">
+ <el-form-item
+ label="鏈嶅姟鍦板潃"
+ v-show="formInline.isLayer == 1"
+ >
<el-input
v-model="formInline.serviceUrl"
placeholder="璇疯緭鍏ユ湇鍔″湴鍧�"
@@ -144,40 +183,63 @@
</el-form-item>
<el-form-item>
<div class="btnstyle editBtn">
- <el-button type="primary" @click="onSubmit">纭畾</el-button>
- <el-button class="delbtn" @click="updateRest">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ @click="onSubmit"
+ >纭畾</el-button>
+ <el-button
+ class="delbtn"
+ @click="updateRest"
+ >鍙栨秷</el-button>
</div>
</el-form-item>
</el-form>
</div>
</div>
- <el-dialog title="鏂板" v-model="dialogVisible" width="50%">
+ <el-dialog
+ title="鏂板"
+ v-model="dialogVisible"
+ width="50%"
+ >
<div style="width: 100%; max-height: 63vh; overflow-y: auto">
- <el-form :model="insertData" label-width="120px">
+ <el-form
+ :model="insertData"
+ label-width="120px"
+ >
<el-form-item label="鍥惧眰绫诲瀷">
- <el-select style="width: 100%" v-model="insertData.isLayer">
- <el-option label="鍥惧眰缁�" value="0"></el-option>
- <el-option label="鍥惧眰" value="1"></el-option>
+ <el-select
+ style="width: 100%"
+ v-model="insertData.isLayer"
+ >
+ <el-option
+ label="鍥惧眰缁�"
+ value="0"
+ ></el-option>
+ <el-option
+ label="鍥惧眰"
+ value="1"
+ ></el-option>
</el-select>
</el-form-item>
<!-- 鏈嶅姟璧勬簮-->
- <el-form-item v-show="insertData.isLayer == 1" label="鏈嶅姟璧勬簮">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏈嶅姟璧勬簮"
+ >
<el-button
size="small"
class="serviceButton"
@click="setInsertServiceChange('0')"
key="0"
:class="{ serviceActive: !insertServiceActive }"
- >鍚�</el-button
- >
+ >鍚�</el-button>
<el-button
size="small"
class="serviceButton"
@click="setInsertServiceChange('1')"
key="1"
:class="{ serviceActive: insertServiceActive }"
- >鏄�</el-button
- >
+ >鏄�</el-button>
</el-form-item>
<el-form-item label="鍥惧眰鍚嶇О">
@@ -187,7 +249,10 @@
/>
</el-form-item>
<!-- 鏈嶅姟绫诲埆 -->
- <el-form-item v-show="insertData.isLayer == 1" label="鏈嶅姟绫诲埆">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏈嶅姟绫诲埆"
+ >
<el-select
style="width: 100%"
v-model="insertData.category"
@@ -202,7 +267,10 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="琛ㄥ悕绉�" v-show="insertData.category == 2">
+ <el-form-item
+ label="琛ㄥ悕绉�"
+ v-show="insertData.category == 2"
+ >
<el-input
v-model="insertData.tab"
placeholder="璇疯緭鍏ヨ〃鍚嶇О"
@@ -210,7 +278,10 @@
/>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="insertData.isLayer == 1" label="鏁版嵁绫诲瀷">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏁版嵁绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="insertData.data"
@@ -227,7 +298,10 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁绫诲瀷 -->
- <el-form-item v-show="insertData.isLayer == 1" label="鏈嶅姟绫诲瀷">
+ <el-form-item
+ v-show="insertData.isLayer == 1"
+ label="鏈嶅姟绫诲瀷"
+ >
<el-select
style="width: 100%"
v-model="insertData.type"
@@ -243,7 +317,10 @@
</el-select>
</el-form-item>
- <el-form-item label="鏈嶅姟鍦板潃" v-show="insertData.isLayer == 1">
+ <el-form-item
+ label="鏈嶅姟鍦板潃"
+ v-show="insertData.isLayer == 1"
+ >
<el-input
v-model="insertData.serviceUrl"
placeholder="璇疯緭鍏ユ湇鍔″湴鍧�"
@@ -252,44 +329,61 @@
</el-form-item>
<el-form-item>
<div class="btnstyle editBtn">
- <el-button type="primary" size="small" @click="added()"
- >纭畾</el-button
- >
+ <el-button
+ type="primary"
+ size="small"
+ @click="added()"
+ >纭畾</el-button>
<el-button
class="delbtn"
type="info"
size="small"
@click="submitCancel()"
- >鍙栨秷</el-button
- >
+ >鍙栨秷</el-button>
</div>
</el-form-item>
</el-form>
</div>
</el-dialog>
- <el-dialog v-model="dialogService" width="50%" :show-close="false">
+ <el-dialog
+ v-model="dialogService"
+ width="50%"
+ :show-close="false"
+ >
<div style="width: 100%; max-height: 63vh; overflow-y: auto">
<div
style="display: flex; justify-content: space-between"
class="tableForm"
>
<div>
- <el-input size="small" v-model="listData.name">
+ <el-input
+ size="small"
+ v-model="listData.name"
+ >
<template #suffix>
<el-icon
class="el-input__icon el-icon-search"
@click="setServiceQuery"
- ><search
- /></el-icon>
+ >
+ <search />
+ </el-icon>
</template>
</el-input>
</div>
<div class="btnstyle">
- <el-button type="info" size="small" @click="setServiceRest">
+ <el-button
+ type="info"
+ size="small"
+ @click="setServiceRest"
+ >
閲嶇疆
</el-button>
- <el-button type="primary" size="small" @click="setServiceConfirm">
+ <el-button
+ type="primary"
+ size="small"
+ @click="setServiceConfirm"
+ >
纭
</el-button>
<el-button
@@ -302,15 +396,26 @@
</el-button>
</div>
</div>
- <el-table ref="multipleTable" :data="tableData" @select="selectChange">
- <el-table-column type="selection" width="55"> </el-table-column>
+ <el-table
+ ref="multipleTable"
+ :data="tableData"
+ @select="selectChange"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ > </el-table-column>
<el-table-column
align="center"
type="index"
label="搴忓彿"
width="70px"
/>
- <el-table-column align="center" prop="cnName" label="璧勬簮鍚嶇О" />
+ <el-table-column
+ align="center"
+ prop="cnName"
+ label="璧勬簮鍚嶇О"
+ />
<el-table-column
align="center"
@@ -325,7 +430,10 @@
:formatter="setResType"
/>
</el-table>
- <div class="pagination_box" style="margin-top: 15px">
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -685,9 +793,7 @@
data: Tree,
checked: boolean,
indeterminate: boolean
-) => {
- console.log(data, checked, indeterminate);
-};
+) => {};
const onSubmit = () => {
if (!checkedStaste) {
return ElMessage.warning("璇峰厛鐐瑰嚮閫変腑鐩稿簲鍥惧眰");
@@ -700,9 +806,6 @@
copyNode.nextSibling = { ...node.nextSibling };
copyNode.parent = { ...node.parent };
- // console.log(1111111111111, copyNode.previousSibling);
- // console.log(2222222222222, copyNode.nextSibling);
- // console.log(3333333333333, copyNode.parent);
if (Object.keys(copyNode.previousSibling).length !== 0) {
// 鍒犻櫎鍘熷厛鐨刵ode
treeRef.value.remove(node.data);
@@ -735,8 +838,6 @@
// 澶勭悊鑺傜偣鐐瑰嚮浜嬩欢
function handleNodeClick(data: any) {
- console.log(data);
-
if (data.id === selectedNodeId.value) {
// 濡傛灉褰撳墠鑺傜偣宸茬粡閫変腑锛屽垯鍙栨秷閫変腑
selectedNodeId.value = null;
@@ -937,7 +1038,7 @@
align-items: center;
.titleLable {
- font-size: 24px;
+ font-size: 18px;
font-family: Source Han Sans CN;
font-weight: 400;
color: #ffffff;
@@ -957,6 +1058,11 @@
height: 92%;
overflow: auto;
}
+
+ /deep/.el-tree-node__content {
+ font-size: 16px;
+ }
+
.layerContent::-webkit-scrollbar {
width: 8px;
}
--
Gitblit v1.9.3