From 07907a65daef5f8b624a8b081eebe6fbc1abcbb5 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 20:23:42 +0800
Subject: [PATCH] update
---
/dev/null | 167 -----------------------
src/container/home/index.vue | 11 +
src/container/machineList/Manage-add-update.vue | 0
src/container/machineList/index.vue | 226 ++++++++++++++++++++++++++++++++
src/router/index.js | 6
5 files changed, 236 insertions(+), 174 deletions(-)
diff --git a/src/container/devicemaintenance/index.vue b/src/container/devicemaintenance/index.vue
deleted file mode 100644
index cbcaba9..0000000
--- a/src/container/devicemaintenance/index.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<!--
- * @Date: 2024-01-06 17:40:19
- * @LastEditors: Sneed
- * @LastEditTime: 2024-01-14 14:11:17
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/devicemaintenance/index.vue
--->
-<template>
- <div class="maintenance">
- <div class="nav">鏈哄簥缁存姢</div>
- <List ref="list" :url="url">
- <template slot="search">
- <div class="item">
- <span>鍚嶇О</span>
- <el-input class="item-value" v-model="queryInfo.name"></el-input>
- </div>
- <div class="item">
- <el-button type="primary" size="small" @click="query">鏌ヨ</el-button>
- </div>
- <div class="item">
- <el-button type="primary" size="small" @click="reset">閲嶇疆</el-button>
- </div>
- </template>
-
- <template slot="table-tool">
- <el-button type="primary" size="mini" @click="add">娣诲姞璁惧绫诲瀷</el-button>
- </template>
-
- <template slot="columns">
- <el-table-column
- prop="id"
- label="ID"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍚嶇О"
- width="180">
- </el-table-column>
-
- </template>
-
- </List>
- <manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
- :row="row"></manage-add-update>
- </div>
-</template>
-<script>
- import List from '../list/index.vue'
- import ManageAddUpdate from './Manage-add-update'
- import { getUrl } from '@/api/Api'
- export default {
- components: {
- List,
- ManageAddUpdate
- },
- data () {
- return {
- url: '',
- queryInfo: {
- name: ''
- },
- row: {},
- addOrUpdateVisible: false
- }
- },
- created () {
- this.url = getUrl('machineQuery')
- },
- methods: {
- reset () {
- Object.keys(this.queryInfo).forEach(key => {
- this.queryInfo[key] = ''
- })
- },
- query () {
- this.$refs.list.pageQuery(this.queryInfo)
- },
- add() {
- this.row = {id:''}
- this.addOrUpdateVisible = true
-
- },
- close() {
- this.addOrUpdateVisible = false
- },
- confirm() {
- this.query()
- this.close()
- },
- addOrUpdateHandle(row) {
- this.row = row
- this.addOrUpdateVisible = true
- }
-
- },
- }
-</script>
-<style lang="scss">
-.maintenance {
- .item-value {
- .el-input__inner {
- background: transparent;
- border-radius: 2px;
- border: 1px solid #435F9E;
- }
- }
- .el-button--mini {
- background: transparent;
- }
- .el-button--primary {
- background-color: transparent;
- }
-}
-</style>
-<style lang="scss" scoped>
-.maintenance {
- width: 100%;
- height: 100%;
- overflow: hidden;
- color: #FFF;
- display: flex;
- flex-direction: column;
-
- .nav {
- padding: 10px 30px;
- }
-
- .item {
- margin-top: 20px;
- margin-left: 50px;
- display: flex;
- align-items: center;
-
- span {
- width: 120px;
- font-size: 16px;
- font-family: PingFangSC, PingFang SC;
- color: #C6DCE0;
- text-align: right;
- padding-right: 20px;
- }
-
- .item-value {
- width: 200px;
- border: 1px solid #435F9E;
- }
-
- .btn {
- line-height: 1.5;
- width: 100px;
- text-align: center;
- font-size: 16px;
- cursor: pointer;
- }
-
- .reset {
- background: #AAB6BA;
- color: #FFF;
- }
-
- .query {
- background: #5DD1FC;
- color: #FFF;
- }
- }
-}
-</style>
\ No newline at end of file
diff --git a/src/container/home/index.vue b/src/container/home/index.vue
index d08b296..7cae30b 100644
--- a/src/container/home/index.vue
+++ b/src/container/home/index.vue
@@ -99,7 +99,8 @@
id: 6,
children: [
{
- label: '鎶ヨ〃鐢熸垚1'
+ label: '璁捐鍣�',
+ href: '/mdc/ureport/designer'
},
{
label: '鎶ヨ〃鐢熸垚1'
@@ -134,8 +135,8 @@
pathName: 'deviceType'
},
{
- label: '鏈哄簥缁存姢',
- pathName: 'devicemaintenance'
+ label: '鏈哄簥閲囬泦',
+ pathName: 'machineList'
}
]
},
@@ -165,8 +166,10 @@
if(item.pathName) {
this.$router.push({name: item.pathName,params: item.params,query: item.query})
}
- } else {//浜岀骇鑿滃崟
+ } else if(item.pathName){//浜岀骇鑿滃崟
this.$router.push({name: item.pathName,params: item.params,query: item.query})
+ } else if(item.href) {
+ window.open(item.href)
}
},
},
diff --git a/src/container/devicemaintenance/Manage-add-update.vue b/src/container/machineList/Manage-add-update.vue
similarity index 100%
rename from src/container/devicemaintenance/Manage-add-update.vue
rename to src/container/machineList/Manage-add-update.vue
diff --git a/src/container/machineList/index.vue b/src/container/machineList/index.vue
new file mode 100644
index 0000000..482c0ea
--- /dev/null
+++ b/src/container/machineList/index.vue
@@ -0,0 +1,226 @@
+<!--
+ * @Date: 2024-01-06 17:40:19
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-01-16 20:11:37
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
+-->
+<template>
+ <div class="maintenance">
+ <div class="nav">鏈哄簥缁存姢</div>
+ <List ref="list" url="/machine/pageQuery">
+ <template slot="search">
+ <div class="item">
+ <span>鏈哄簥鍚嶇О</span>
+ <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ </div>
+ <div class="item">
+ <span>ip鍦板潃</span>
+ <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ </div>
+ <div class="item">
+ <span>鍨嬪彿</span>
+ <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ </div>
+ <div class="item">
+ <span>绋嬪簭浼犺緭妯″紡</span>
+ <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ </div>
+ <div class="item">
+ <span>鍔犲伐绫诲瀷</span>
+ <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ </div>
+ <div class="item" style="flex: 1 1 auto;justify-content: center;">
+ <el-button type="primary" size="small" @click="reset">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="reset">閲嶇疆</el-button>
+ </div>
+ </template>
+
+ <!-- <template slot="table-tool">
+ <el-button type="primary" size="mini" @click="add">娣诲姞璁惧绫诲瀷</el-button>
+ </template> -->
+
+ <template slot="columns">
+ <el-table-column
+ prop="id"
+ label="鏈哄簥鍚嶇О"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍔犲伐绫诲瀷"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鍨嬪彿"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="ip鍦板潃"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="绔彛"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="杞﹂棿"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="宸ユ"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鐝埗"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="绋嬪簭浼犺緭妯″紡"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="dnc鍚嶇О"
+ width="180">
+ </el-table-column>
+ <el-table-column align="center" label="鎿嶄綔" prop="editor">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" @click="addDevice(2, scope.row, $event)">閰嶇疆</el-button>
+ <!-- <el-button size="mini" type="text" @click="deleteHandle(2, scope.row)">鍒犻櫎</el-button> -->
+ </template>
+ </el-table-column>
+ </template>
+
+ </List>
+ <manage-add-update v-if="addOrUpdateVisible" :addVisible="addOrUpdateVisible" @close="close" @confirm="confirm"
+ :row="row"></manage-add-update>
+ </div>
+</template>
+<script>
+ import List from '../list/index.vue'
+ import ManageAddUpdate from './Manage-add-update'
+ import { getUrl } from '@/api/Api'
+ export default {
+ components: {
+ List,
+ ManageAddUpdate
+ },
+ data () {
+ return {
+ url: '',
+ queryInfo: {
+ name: ''
+ },
+ row: {},
+ addOrUpdateVisible: false
+ }
+ },
+ created () {
+ this.url = getUrl('machineQuery')
+ },
+ methods: {
+ reset () {
+ Object.keys(this.queryInfo).forEach(key => {
+ this.queryInfo[key] = ''
+ })
+ },
+ query () {
+ this.$refs.list.pageQuery(this.queryInfo)
+ },
+ add() {
+ this.row = {id:''}
+ this.addOrUpdateVisible = true
+
+ },
+ close() {
+ this.addOrUpdateVisible = false
+ },
+ confirm() {
+ this.query()
+ this.close()
+ },
+ addOrUpdateHandle(row) {
+ this.row = row
+ this.addOrUpdateVisible = true
+ }
+
+ },
+ }
+</script>
+<style lang="scss">
+.maintenance {
+ .item-value {
+ .el-input__inner {
+ background: transparent;
+ border-radius: 2px;
+ border: 1px solid #435F9E;
+ }
+ }
+ .el-button--mini {
+ background: transparent;
+ }
+ .el-button--primary {
+ background-color: transparent;
+ }
+}
+</style>
+<style lang="scss" scoped>
+.maintenance {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ color: #FFF;
+ display: flex;
+ flex-direction: column;
+
+ .nav {
+ padding: 10px 30px;
+ }
+
+ .item {
+ margin-top: 20px;
+ margin-left: 50px;
+ display: flex;
+ align-items: center;
+
+ span {
+ width: 120px;
+ font-size: 16px;
+ font-family: PingFangSC, PingFang SC;
+ color: #C6DCE0;
+ text-align: right;
+ padding-right: 20px;
+ }
+
+ .item-value {
+ width: 200px;
+ border: 1px solid #435F9E;
+ }
+
+ .btn {
+ line-height: 1.5;
+ width: 100px;
+ text-align: center;
+ font-size: 16px;
+ cursor: pointer;
+ }
+
+ .reset {
+ background: #AAB6BA;
+ color: #FFF;
+ }
+
+ .query {
+ background: #5DD1FC;
+ color: #FFF;
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 874eba9..b79cfb8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,9 +74,9 @@
component: () => import('@/container/deviceType/index')
},
{
- path: 'devicemaintenance',
- name: 'devicemaintenance',
- component: () => import('@/container/devicemaintenance/index')
+ path: 'machineList',
+ name: 'machineList',
+ component: () => import('@/container/machineList/index')
},
{
path: 'preview',
--
Gitblit v1.9.3