From cb5712942fd2637811832d5a11bb05b2cced5856 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 07 三月 2024 08:32:44 +0800
Subject: [PATCH] 1.递交
---
vue.config.js | 3 -
src/views/basicSettings/powerDivider.vue | 61 +++++++++++++++---------------
src/views/systemSetting/encodingRules.vue | 6 +--
3 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/src/views/basicSettings/powerDivider.vue b/src/views/basicSettings/powerDivider.vue
index 28a33d7..3605b2e 100644
--- a/src/views/basicSettings/powerDivider.vue
+++ b/src/views/basicSettings/powerDivider.vue
@@ -52,7 +52,8 @@
>淇� 瀛�
</el-button>
- <el-tabs v-model="activeName" type="border-card" @tab-click="tabClick">
+ <!-- <el-tabs v-model="activeName" type="border-card" @tab-click="tabClick">-->
+ <el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="PC绔�" name="PC">
<div style="display: flex;">
<div
@@ -131,36 +132,36 @@
<!-- </div>-->
</div>
</el-tab-pane>
- <el-tab-pane label="APP绔�" name="APP">
- <div style="display: flex;">
- <div
- ref="scrollLeft"
- style="border-right: 1px solid rgba(0,0,0,0.2);width:100%;
- overflow-y: auto;overflow-x:hidden;"
- :style="{height:(tableHeight-40)+'px'}"
- @scroll="scrollLeftScroll()"
- @mouseover="isScroll='left'"
- >
- <div style=" ">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 鑿滃崟鏉冮檺
- </div>
+ <!-- <el-tab-pane label="APP绔�" name="APP">-->
+ <!-- <div style="display: flex;">-->
+ <!-- <div-->
+ <!-- ref="scrollLeft"-->
+ <!-- style="border-right: 1px solid rgba(0,0,0,0.2);width:100%;-->
+ <!-- overflow-y: auto;overflow-x:hidden;"-->
+ <!-- :style="{height:(tableHeight-40)+'px'}"-->
+ <!-- @scroll="scrollLeftScroll()"-->
+ <!-- @mouseover="isScroll='left'"-->
+ <!-- >-->
+ <!-- <div style=" ">-->
+ <!-- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 鑿滃崟鏉冮檺-->
+ <!-- </div>-->
- <el-tree
- ref="treeCenterAPPRef"
- style="padding-top: 10px;"
- :data="treeCenter"
- highlight-current
- :props="defaultPropsCenter"
- show-checkbox
- node-key="menucode"
- :default-expand-all="true"
- @check-change="handleTreeCenterCheckChange"
- @check="handleTreeCenterCheck"
- @node-click="getLeftTreeNode"
- />
- </div>
- </div>
- </el-tab-pane>
+ <!-- <el-tree-->
+ <!-- ref="treeCenterAPPRef"-->
+ <!-- style="padding-top: 10px;"-->
+ <!-- :data="treeCenter"-->
+ <!-- highlight-current-->
+ <!-- :props="defaultPropsCenter"-->
+ <!-- show-checkbox-->
+ <!-- node-key="menucode"-->
+ <!-- :default-expand-all="true"-->
+ <!-- @check-change="handleTreeCenterCheckChange"-->
+ <!-- @check="handleTreeCenterCheck"-->
+ <!-- @node-click="getLeftTreeNode"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </el-tab-pane>-->
<!-- <el-tab-pane label="宸ユ帶绔�" name="宸ユ帶绔�">宸ユ帶绔�</el-tab-pane>-->
</el-tabs>
diff --git a/src/views/systemSetting/encodingRules.vue b/src/views/systemSetting/encodingRules.vue
index 104f823..7b4026d 100644
--- a/src/views/systemSetting/encodingRules.vue
+++ b/src/views/systemSetting/encodingRules.vue
@@ -173,7 +173,7 @@
<el-form-item label="鑿滃崟绫诲瀷" required>
<el-radio-group v-model="dialogForm.type" @change="radioChange">
<el-radio label="PC" name="PC" />
- <el-radio label="APP" name="APP" />
+ <!-- <el-radio label="APP" name="APP" />-->
</el-radio-group>
</el-form-item>
<el-form-item label="鑿滃崟鍚嶇О" required>
@@ -336,7 +336,6 @@
childrenProperty: 'children'
})
// this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
-
},
radioChange() {
this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
@@ -375,7 +374,6 @@
this.operation = operation
this.dialogVisible = true
-
this.$nextTick(() => {
this.dialogForm.type = row.Type
this.radioChange()
@@ -390,7 +388,7 @@
})
}
})
- console.log(parentCode,row.menucode)
+ console.log(parentCode, row.menucode)
this.$refs.cascader.checkedValue = [parentCode, row.menucode]
this.dialogForm.rightcode = row.menucode
this.dialogForm.incbit = row.incbit
diff --git a/vue.config.js b/vue.config.js
index 0485442..a82463c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,7 +34,7 @@
// css: {},
// postcss: {
// plugins: [
- // require('postcss-px2rem')({
+ // requirae('postcss-px2rem')({
// remUnit: 192// /璁捐鍥惧搴�/10
// })
// ]
@@ -52,7 +52,6 @@
},
proxy: {
[process.env.VUE_APP_BASE_API]: {
- // target: 'http://192.168.1.190:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
target: 'http://121.196.36.24:8031', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
// target: 'http://122.227.18.22:8000', // 璇锋眰鐨勭涓夆絽鎺モ紳鍦板潃 鏈湴寮�鍙戞湇鍔″櫒
changeOrigin: true, // 璇锋眰璺ㄥ煙鏃讹紝闇� 閰嶇疆姝ら」
--
Gitblit v1.9.3