From a98deb841df1cf0fa5df1f91d034e224c4c0dbc0 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 27 三月 2024 21:28:01 +0800
Subject: [PATCH] Merge branch 'gaoshp'
---
src/utils/request.js | 2
src/views/basicdata/machine/workstation.vue | 274 ++++++++++++++++++++++++++++-
src/api/model/system.js | 7
src/main.js | 6
src/App.vue | 87 ++++++---
src/api/model/basicdata.js | 19 ++
src/assets/pms.png | 0
README.md | 87 +--------
8 files changed, 359 insertions(+), 123 deletions(-)
diff --git a/README.md b/README.md
index d5e80f3..975c7d6 100644
--- a/README.md
+++ b/README.md
@@ -1,75 +1,12 @@
-
-<div align="center">
-
-
-
-<p align="center">
- <a href="https://v3.vuejs.org/" target="_blank">
- <img src="https://img.shields.io/badge/VueCLI-5-green" alt="VueCLI">
- </a>
- <a href="https://v3.vuejs.org/" target="_blank">
- <img src="https://img.shields.io/badge/Vue.js-3.x-green" alt="Vue">
- </a>
- <a href="https://element-plus.gitee.io/#/zh-CN/component/changelog" target="_blank">
- <img src="https://img.shields.io/badge/element--plus-latest-blue" alt="element plus">
- </a>
-</p>
-
-<h1>SCUI Admin</h1>
-
-</div>
-
-## 浠嬬粛
-SCUI 鏄竴涓腑鍚庡彴鍓嶇瑙ｅ喅鏂规锛屽熀浜嶸UE3鍜宔lementPlus瀹炵幇銆�
-浣跨敤鏈�鏂扮殑鍓嶇鎶�鏈爤锛屾彁渚涘悇绫诲疄鐢ㄧ殑缁勪欢鏂逛究鍦ㄤ笟鍔″紑鍙戞椂鐨勮皟鐢紝骞朵笖鎸佺画鎬х殑鎻愪緵涓板瘜鐨勪笟鍔℃ā鏉垮府鍔╀綘蹇�熸惌寤轰紒涓氱骇涓悗鍙板墠绔换鍔°��
-
-SCUI鐨勫畻鏃ㄦ槸 璁╀竴鍒囧鏉傜殑涓滆タ鍌荤摐鍖栥��
-
-
-
-## 婕旂ず鍜屾枃妗�
-
-| 绫诲瀷 | 閾炬帴 |
-| -------- | -------- |
-| 鏂囨。鍦板潃 | https://lolicode.gitee.io/scui-doc/ |
-| 婕旂ず鍦板潃 | https://lolicode.gitee.io/scui-doc/demo/#/login |
-
-
-
-## 鐗圭偣
-
-- **缁勪欢** 澶氫釜鐙缁勪欢銆佷笟鍔℃ā鏉�
-- **鏉冮檺** 瀹屾暣鐨勯壌鏉冧綋绯诲拰楂樼簿搴︽潈闄愭帶鍒�
-- **甯冨眬** 鎻愪緵澶氬甯冨眬妯″紡锛屾弧瓒冲悇绉嶈瑙夐渶姹�
-- **API** 瀹屽杽鐨凙PI绠＄悊锛屼娇鐢ㄧ湡瀹炵綉缁淢OCK
-- **閰嶇疆** 缁熶竴鐨勫叏灞�閰嶇疆鍜岀粍浠堕厤缃紝鏀寔build鍚庨厤缃儹鏇存柊
-- **鎬ц兘** 鍦ㄥ噺灏戝甫瀹借姹傚拰鍓嶇绠楀姏涓婂娆′紭鍖栵紝骞朵笖鎸佺画鐫�
-- **鍏朵粬** 澶氬姛鑳借鍥炬爣绛俱�佸姩鎬佹潈闄愯彍鍗曘�佹帶鍒跺彴缁勬�佸寲銆佺粺涓�寮傚父澶勭悊绛夌瓑
-
-
-## 閮ㄥ垎鎴浘
-
-
-
-## 瀹夎鏁欑▼
-``` sh
-# 鍏嬮殕椤圭洰
-git clone https://gitee.com/lolicode/scui.git
-
-# 杩涘叆椤圭洰鐩綍
-cd scui
-
-# 瀹夎渚濊禆
-npm i
-
-# 鍚姩椤圭洰(寮�鍙戞ā寮�)
-npm run serve
-```
-鍚姩瀹屾垚鍚庢祻瑙堝櫒璁块棶 http://localhost:2800
-
-## 楦ｈ阿
-
-<img src="https://www.fastmock.site/resource/images/logo.png" style="height:40px"/>
-
-## 鏀寔
-濡傛灉瑙夊緱鏈」鐩繕涓嶉敊鎴栧湪宸ヤ綔涓湁鎵�鍚彂锛岃鍦℅itee(鐮佷簯)甯紑鍙戣�呯偣浜槦鏄燂紝杩欐槸瀵瑰紑鍙戣�呮渶澶х殑鏀寔鍜岄紦鍔憋紒
+<!--
+ * @Date: 2024-03-23 09:49:06
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-03-25 23:32:24
+ * @FilePath: /cps-web/README.md
+-->
+## 鎺ュ彛鏂囨。鍦板潃
+http://116.63.148.72:31002/doc.html
+## git
+http://gaosp@www.beijingsoft.cn:9090/r/smart-web.git
+## Admin
+http://116.63.148.72:31002/instances/0ff8ab977c9e/details
diff --git a/src/App.vue b/src/App.vue
index ed73c22..d131e70 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,9 @@
+<!--
+ * @Date: 2024-03-23 09:49:06
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-03-26 21:41:35
+ * @FilePath: /cps-web/src/App.vue
+-->
<template>
<el-config-provider :locale="locale" :size="config.size" :zIndex="config.zIndex" :button="config.button">
<router-view></router-view>
@@ -5,42 +11,63 @@
</template>
<script>
- import colorTool from '@/utils/color'
+import colorTool from '@/utils/color'
- export default {
- name: 'App',
- data() {
- return {
- config: {
- size: "default",
- zIndex: 2000,
- button: {
- autoInsertSpace: false
- }
- }
- }
- },
- computed: {
- locale(){
- return this.$i18n.messages[this.$i18n.locale].el
- },
- },
- created() {
- //璁剧疆涓婚棰滆壊
- const app_color = this.$CONFIG.COLOR || this.$TOOL.data.get('APP_COLOR')
- if(app_color){
- document.documentElement.style.setProperty('--el-color-primary', app_color);
- for (let i = 1; i <= 9; i++) {
- document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, colorTool.lighten(app_color,i/10));
- }
- for (let i = 1; i <= 9; i++) {
- document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, colorTool.darken(app_color,i/10));
+export default {
+ name: 'App',
+ data() {
+ return {
+ config: {
+ size: "default",
+ zIndex: 2000,
+ button: {
+ autoInsertSpace: false
}
}
}
+ },
+ computed: {
+ locale() {
+ return this.$i18n.messages[this.$i18n.locale].el
+ },
+ },
+ created() {
+ //璁剧疆涓婚棰滆壊
+ const app_color = this.$CONFIG.COLOR || this.$TOOL.data.get('APP_COLOR')
+ if (app_color) {
+ document.documentElement.style.setProperty('--el-color-primary', app_color);
+ for (let i = 1; i <= 9; i++) {
+ document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, colorTool.lighten(app_color, i / 10));
+ }
+ for (let i = 1; i <= 9; i++) {
+ document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, colorTool.darken(app_color, i / 10));
+ }
+ }
+ },
+ mounted() {
+ const debounce = (fn, delay) => {
+ let timer
+ return (...args) => {
+ if (timer) {
+ clearTimeout(timer)
+ }
+ timer = setTimeout(() => {
+ fn(...args)
+ }, delay)
+ }
+ }
+
+ const _ResizeObserver = window.ResizeObserver;
+ window.ResizeObserver = class ResizeObserver extends _ResizeObserver {
+ constructor(callback) {
+ callback = debounce(callback, 200);
+ super(callback);
+ }
+ }
}
+}
</script>
<style lang="scss">
- @import '@/style/style.scss';
+@import '@/style/style.scss';
</style>
diff --git a/src/api/model/basicdata.js b/src/api/model/basicdata.js
index e21493e..791e1bc 100644
--- a/src/api/model/basicdata.js
+++ b/src/api/model/basicdata.js
@@ -1,7 +1,7 @@
/*
* @Date: 2024-03-24 11:37:47
* @LastEditors: gaoshp
- * @LastEditTime: 2024-03-24 14:30:13
+ * @LastEditTime: 2024-03-27 20:46:02
* @FilePath: /cps-web/src/api/model/basicdata.js
*/
import config from "@/config"
@@ -15,4 +15,21 @@
return await http.get(this.url, params);
}
},
+ saveWorkstationGroup: {
+ url: `${config.API_URL}/blade-cps/group`,
+ name: "淇濆瓨宸ヤ綅缁�",
+ put: async function(params){
+ return await http.put(this.url, params);
+ },
+ post: async function(params){
+ return await http.post(this.url, params);
+ },
+ },
+ deleteWorkGroup: {
+ url: `${config.API_URL}/blade-cps/workstation/deleteGroup`,
+ name: "鍒犻櫎宸ヤ綅缁�",
+ delete: async function(params){
+ return await http.delete(this.url, params);
+ }
+ }
}
\ No newline at end of file
diff --git a/src/api/model/system.js b/src/api/model/system.js
index b739d74..a795fc9 100644
--- a/src/api/model/system.js
+++ b/src/api/model/system.js
@@ -39,6 +39,13 @@
get: async function(params){
return await http.get(this.url, params);
}
+ },
+ getDic: {
+ url: `${config.API_URL}/blade-system/dict/dictionary`,
+ name: "鑾峰彇瀛楀吀鏁版嵁",
+ get: async function(params){
+ return await http.get(this.url, params);
+ }
}
},
role: {
diff --git a/src/assets/pms.png b/src/assets/pms.png
new file mode 100644
index 0000000..164361a
--- /dev/null
+++ b/src/assets/pms.png
Binary files differ
diff --git a/src/main.js b/src/main.js
index afb5fc4..8c523ef 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,3 +1,9 @@
+/*
+ * @Date: 2024-03-23 09:49:06
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-03-26 21:40:32
+ * @FilePath: /cps-web/src/main.js
+ */
import { createApp } from 'vue'
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
diff --git a/src/utils/request.js b/src/utils/request.js
index 9340c69..3295418 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -205,7 +205,7 @@
axios({
method: 'delete',
url: url,
- data: data,
+ params: data,
...config
}).then((response) => {
resolve(response.data);
diff --git a/src/views/basicdata/machine/workstation.vue b/src/views/basicdata/machine/workstation.vue
index 53d10bc..d113566 100644
--- a/src/views/basicdata/machine/workstation.vue
+++ b/src/views/basicdata/machine/workstation.vue
@@ -65,15 +65,142 @@
</el-button-group>
</template>
</el-table-column>
-
</scTable>
</el-main>
</el-container>
</el-container>
</el-tab-pane>
-
+ <!-- 宸ヤ綅缁� -->
<el-tab-pane label="宸ヤ綅缁�" name="2">
-
+ <el-container>
+ <el-aside width="200px" v-loading="showGrouploading">
+ <el-container>
+ <el-main class="nopadding">
+ <el-tree ref="group" class="menu" node-key="id" :data="group"
+ :current-node-key="treeCheckKey"
+ :highlight-current="true"
+ :expand-on-click-node="false"
+ :check-on-click-node="true"
+ :default-expanded-keys="[1]"
+ :render-content="renderContent"
+ :filter-node-method="groupFilterNode"
+ @node-click="groupClick"></el-tree>
+ </el-main>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <el-main class="" v-show="addGroupShow">
+ <el-form
+ v-show="treeCheckedNode.id == 1"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ label-position="left">
+ <el-form-item label="浜х嚎鏍囩" prop="groupTag">
+ <el-select v-model="form.groupTag" clearable placeholder="浜х嚎鏍囩"
+ style="width: 240px">
+ <el-option v-for="item in beltline_type" :key="item.dictKey"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜х嚎鍚嶇О" prop="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="浜х嚎鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item label="浜х嚎鎺掑簭" prop="sort">
+ <el-input-number v-model="form.sort" :min="0" :max="10" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ <el-form v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || treeCheckedNode.id == 101"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ label-position="left">
+ <el-form-item label="宸ヤ綅缁勬爣绛�" prop="groupTag">
+ <el-select v-model="form.groupTag" clearable placeholder="宸ヤ綅缁勬爣绛�"
+ style="width: 240px">
+ <el-option v-for="item in group_tag" :key="item.dictKey"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缁勫悕绉�" prop="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缁勬帓搴�" prop="sort">
+ <el-input-number v-model="form.sort" :min="0" :max="10" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ </el-main>
+ <el-header v-show="!addGroupShow">
+ <div class="left-panel">
+ <el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
+ <el-button @click="deleteWorkGroup" v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
+ plain>鍒犻櫎</el-button>
+ </div>
+ </el-header>
+ <el-main class="" v-show="!addGroupShow">
+ <ul class="show-info" v-show="['1', '101'].includes(treeCheckedNode.id)">
+ <li>鍚嶇О: {{ treeCheckedNode.name }}</li>
+ <li>鎺掑簭: {{ treeCheckedNode.sort }}</li>
+ <li>澶囨敞: {{ treeCheckedNode.remark }}</li>
+ </ul>
+ <el-form
+ v-show="beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ label-position="left">
+ <el-form-item label="浜х嚎鏍囩" prop="groupTag">
+ <el-select v-model="form.groupTag" clearable placeholder="浜х嚎鏍囩"
+ style="width: 240px">
+ <el-option v-for="item in beltline_type" :key="item.dictKey"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜х嚎鍚嶇О" prop="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="浜х嚎鍚嶇О"></el-input>
+ </el-form-item>
+ <el-form-item label="浜х嚎鎺掑簭" prop="sort">
+ <el-input-number v-model="form.sort" :min="0" :max="10" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ <el-form v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ label-position="left">
+ <el-form-item label="宸ヤ綅缁勬爣绛�" prop="groupTag">
+ <el-select v-model="form.groupTag" clearable placeholder="宸ヤ綅缁勬爣绛�"
+ style="width: 240px">
+ <el-option v-for="item in group_tag" :key="item.dictKey"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缁勫悕绉�" prop="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="宸ヤ綅缁勬帓搴�" prop="sort">
+ <el-input-number v-model="form.sort" :min="0" :max="10" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ </el-main>
+ <el-main v-show="!['1', '101'].includes(treeCheckedNode.id) || addGroupShow">
+ <el-button @click="saveWorkstationGroup" style="width: 100px" type="primary"
+ plain>鎻愪氦</el-button>
+ </el-main>
+ </el-container>
+ </el-container>
</el-tab-pane>
</el-tabs>
@@ -82,46 +209,156 @@
</template>
<script>
+import pmsPng from '@/assets/pms.png'
export default {
name: 'system',
data() {
return {
- activeName: '1',
+ showGrouploading: false,
+ options: [],
+ activeName: '2',
group: [],
- groupFilterText: ''
+ groupFilterText: '',
+ // --------
+ form: {
+ groupTag: '',
+ name: '',
+ sort: '',
+ remark: ''
+ },
+ rules: {
+ groupTag: { required: true, message: '蹇呭～', trigger: 'blur' },
+ name: { required: true, message: '蹇呭～', trigger: 'blur' },
+ sort: { required: true, message: '蹇呭～', trigger: 'blur' }
+ },
+ treeCheckedNode: {},
+ treeCheckKey: [],
+ beltline_type: [],
+ group_tag: [],
+ addGroupShow: false
+ }
+ },
+ watch: {
+ activeName() {
+ this.queryList()
+ },
+ treeCheckedNode: {
+ handler(val) {
+ this.addGroupShow = false
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = val?.[key]
+ })
+ },
+ deep: true
}
},
created() {
- this.$API.basicdata.getWorkstationGroup.get().then(res => {
- if (res.code == 200) {
- let data = this.formatData(res.data)
- this.group = data
- }
- })
+ this.init()
+ this.queryList()
},
methods: {
+ renderContent (h, {node,data}) {
+ console.log(node,data)
+ let img = data.groupTag == 'fms_beltline'
+ return h('span',{
+
+ },
+ img ? h('img', {
+ src: pmsPng
+ }, '') : '',
+ data.name)
+ },
+ init() {
+ this.$API.system.dic.getDic.get({ code: 'beltline_type' }).then(res => {
+ this.beltline_type = res.data
+ })
+ this.$API.system.dic.getDic.get({ code: 'group_tag' }).then(res => {
+ this.group_tag = res.data
+ })
+
+ },
+ queryList(flag) {
+ this.showGrouploading = true
+ this.$API.basicdata.getWorkstationGroup.get().then(res => {
+ if (res.code == 200) {
+ if (!flag) {
+ let parent = res.data.filter(item => item.parentId == 0)[0]
+ this.treeCheckedNode = parent
+ this.treeCheckKey = parent.id
+ } else {
+ let parent = res.data.filter(item => item.id == this.treeCheckedNode.id)[0]
+ this.treeCheckedNode = parent
+ this.treeCheckKey = parent.id
+ }
+
+ let data = this.formatData(res.data)
+ this.group = data
+ this.showGrouploading = false
+ }
+ })
+ },
formatData(data, current) {
let newData = []
if (!current) {
newData = data.filter(item => item.parentId == 0).map(v => {
- v.children = this.formatData(data, v)
+ v.children = this.formatData(data, v).sort((a, b) => {
+ return b.sort - a.sort
+ })
return v
})
} else {
let res = data.filter(v => v.parentId === current.id)
res = res.map(item => {
- item.children = this.formatData(data, item)
+ item.children = this.formatData(data, item).sort((a, b) => {
+ return b.sort - a.sort
+ })
return item
})
return res
}
return newData
},
+ async saveWorkstationGroup() {
+ const validate = await this.$refs.dialogForm.validate().catch(()=>{})
+ if(!validate){ return false }
+ if (this.addGroupShow) {
+ let data = Object.assign({
+ code: "",
+ fullName: "",
+ id: "",
+ parentId: this.treeCheckedNode.id,
+ status: 1,
+ groupType: this.treeCheckedNode.groupType,
+ groupCategory: this.treeCheckedNode.groupCategory
+ },this.form)
+ return this.$API.basicdata.saveWorkstationGroup.post(data).then(res => {
+ console.log(res)
+ this.queryList(true)
+ })
+ }
+ let data = Object.assign({},this.treeCheckedNode,this.form)
+ this.$API.basicdata.saveWorkstationGroup.put(data).then(res => {
+ console.log(res)
+ this.queryList(true)
+ })
+ },
+ deleteWorkGroup () {
+ this.$API.basicdata.deleteWorkGroup.delete({
+ groupId: this.treeCheckedNode.id
+ }).then(() => {
+ this.queryList()
+ })
+ },
+ addChild () {
+ this.addGroupShow = true
+ this.$refs.dialogForm.resetFields()
+ },
groupFilterNode() {
},
- groupClick() {
-
+ groupClick(node) {
+ console.log(node)
+ this.treeCheckedNode = node
},
table_add() {
var newRow = {
@@ -146,4 +383,9 @@
}
</script>
-<style></style>
+<style scoped>
+.show-info {
+ list-style: none;
+ font-size: 14px;
+}
+</style>
--
Gitblit v1.9.3