From 0aa4f9751aadb4abb3637bc74fb7f0b48dd7a23e Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 15:01:23 +0800
Subject: [PATCH] Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new
---
src/views/console/base/Add.vue | 16 ++++
src/views/console/workstation/index.vue | 6 +-
src/views/tpm/MachineTab.vue | 4
src/views/tpm/machine-management.vue | 4
src/views/console/workstation/Dialog.vue | 2
src/views/mdc/processParam/index.vue | 17 +++--
src/views/tpm/machine/Dialog.vue | 8 +-
src/views/tpm/MachineGroup.vue | 6 +-
src/views/mdc/MYTree.vue | 68 +++++++++++++++++-----
9 files changed, 89 insertions(+), 42 deletions(-)
diff --git a/src/views/console/base/Add.vue b/src/views/console/base/Add.vue
index 8d02c26..8e244b1 100644
--- a/src/views/console/base/Add.vue
+++ b/src/views/console/base/Add.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-05-04 16:37:48
* @LastEditors: gaoshp
- * @LastEditTime: 2024-10-09 23:30:14
+ * @LastEditTime: 2024-11-07 21:45:28
* @FilePath: /cps-web/src/views/console/base/Add.vue
-->
<template>
@@ -533,8 +533,20 @@
}
},
planCancel() {
+ // 鍙栨秷鎺掔彮鍙兘鍙栨秷褰撳墠鏃堕棿涔嬪悗鐨勬帓鐝�
+ let now = moment(moment().format('YYYY-MM-DD')).valueOf()
this.months.forEach((item, i) => {
- item.attributes = item.attributes.slice(0, 2)
+ // item.attributes = item.attributes.slice(0, 2)
+ item.attributes = item.attributes.map((v, i) => {
+ if (i > 1) {
+ v.dates = v.dates.filter(c => {
+ if (moment(c).valueOf() <= now) {
+ return true
+ }
+ })
+ }
+ return v
+ })
})
},
save() {
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 5e44b5f..49df965 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -151,7 +151,7 @@
<el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">娣诲姞宸ヤ綔鍙�</el-button>
</el-col> -->
<el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺" prop="createDept">
+ <el-form-item label="鎵�灞為儴闂�" prop="createDept">
<el-tree-select :props="{
label: 'title',
id: 'id',
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index e588771..e41d64a 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -228,13 +228,13 @@
<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-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> -->
<el-form-item label="浜х嚎鍚嶇О" prop="name">
<el-input style="width: 240px" v-model="form.name" clearable
placeholder="浜х嚎鍚嶇О"></el-input>
@@ -404,7 +404,7 @@
previewData: {},
// --------
form: {
- groupTag: '',
+ groupTag: 'beltline',
name: '',
sort: '',
remark: ''
diff --git a/src/views/mdc/MYTree.vue b/src/views/mdc/MYTree.vue
index 93e9090..f9b59f0 100644
--- a/src/views/mdc/MYTree.vue
+++ b/src/views/mdc/MYTree.vue
@@ -1,17 +1,30 @@
<!--
* @Date: 2024-04-18 19:53:35
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-16 16:21:59
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/MYTree.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-11-04 20:05:01
+ * @FilePath: /cps-web/src/views/mdc/MYTree.vue
-->
<template>
- <el-tree :expand-on-click-node="false" ref="treeRef" v-bind="$attrs" :show-checkbox="showCheckbox"
- :current-node-key="currentNodeKey" node-key="id" :props="defalutProps" :data="data" @check-change="checkChange"
- @node-click="handleNodeClick" highlight-current default-expand-all :render-content="renderContent"></el-tree>
+ <el-input v-model="word" style="max-width: 600px" placeholder="" @change="search" class="input-with-select">
+ <template #append>
+ <el-button :icon="ElementPlusIconsVue.Search" />
+ </template>
+ </el-input>
+ <el-switch v-model="showType" active-text="鍒楄〃" inactive-text="鏍戠姸" @change="switchFn" />
+ <el-tree v-show="!showType" :expand-on-click-node="false" ref="treeRef" v-bind="$attrs"
+ :show-checkbox="showCheckbox" :current-node-key="currentNodeKey" node-key="id" :props="defalutProps"
+ :data="data" @check-change="checkChange" @node-click="handleNodeClick" highlight-current default-expand-all
+ :render-content="renderContent"></el-tree>
+ <el-table v-show="showType" :data="tableData" @selection-change="handleSelectionChange" highlight-current-row
+ :current-row-key="currentNodeKey" row-key="id" @row-click="rowClick">
+ <el-table-column v-if="showCheckbox" type="selection" :selectable="selectable" width="55" />
+ <el-table-column prop="title" label="宸ヤ綅鍚嶇О" />
+ </el-table>
</template>
<script>
import pmsPng from '@/assets/pms.png'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
export default {
props: {
showCheckbox: {
@@ -31,6 +44,10 @@
},
data() {
return {
+ ElementPlusIconsVue,
+ word: '',
+ showType: false, // 鏄剧ず绫诲瀷
+ tableData: [],
pmsPng,
firstWorkKey: '',
currentNodeKey: [],
@@ -57,10 +74,28 @@
this.$emit('update:modelValue', value)
}
},
- created() {
+ mounted() {
this.getList()
+ let key = this.$route.path
+ if (localStorage.getItem(key) === '1') {
+ this.showType = true
+ }
+ console.log(this.$route, '>>>>>>')
},
methods: {
+ search() {
+ this.getList()
+ },
+ switchFn(val) {
+ console.log(this.$route, val, '>>>>>>')
+ localStorage.setItem(this.$route.path, val ? '1' : '0')
+ },
+ handleSelectionChange(selection) {
+ this.value = selection.map(v => v.id)
+ },
+ rowClick(row) {
+ this.currentNodeKey = row.id
+ },
renderContent(h, { data, node }) {
let img = data.groupTag == 'fms_beltline'
return h('a', {
@@ -80,20 +115,18 @@
groupType: "group_workstation"
}).then(({ code, data }) => {
if (code === 200) {
- this.data = this.formatData(data)
+ this.tableData = data.filter(v => v.isWorkstation && v.title.indexOf(this.word) > -1)
+ this.data = this.formatData(data.filter(v => !v.isWorkstation || (v.isWorkstation && v.title.indexOf(this.word) > -1)))
this.$nextTick(() => {
- this.currentNodeKey = this.firstWorkKey
- this.$emit('loaded', this.firstWorkKey)
+ this.setCurrentKey(data)
+ this.$emit('loaded', this.currentNodeKey)
this.$emit('request', data)
})
}
})
},
- setCurrentKey(v) {
- if (this.firstWorkKey) return
- if (v.isWorkstation) {
- this.firstWorkKey = v.id
- }
+ setCurrentKey(data) {
+ this.currentNodeKey = data.find(v => v.isWorkstation && v.title.indexOf(this.word) > -1).id
},
formatData(data, current) {
let newData = []
@@ -103,7 +136,7 @@
v.children = this.formatData(data, v).sort((a, b) => {
return b.sort - a.sort
})
- this.setCurrentKey(v)
+ // this.setCurrentKey(v)
return v
})
} else {
@@ -113,7 +146,7 @@
item.children = this.formatData(data, item).sort((a, b) => {
return b.sort - a.sort
})
- this.setCurrentKey(item)
+ // this.setCurrentKey(item)
return item
})
return res
@@ -129,6 +162,7 @@
},
checkChange(data, data1, data2) {
+ console.log('>>>>>>>')
if (this.getAll) {
return this.value = this.$refs.treeRef.getCheckedNodes().filter(v => v.isWorkstation)
}
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index b795e8c..bdd3267 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: gaoshp
- * @LastEditTime: 2024-11-03 20:10:01
+ * @LastEditTime: 2024-11-05 22:55:01
* @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
@@ -211,7 +211,6 @@
},
query() {
if (!this.treeChecked.toString()) return
- console.log(this.treeChecked.toString(), '>>>>>>>>>/')
this.$refs?.timeLine?.init({
dates: this.time,
workstationId: this.treeChecked.toString()
@@ -219,7 +218,6 @@
this.list = []
this.$HTTP.get('/api/mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
if (res.code === 200) {
- console.log('jkjkjkjkj', this.list)
this.list = res.data.map(v => {
let name = v.isProcessParam ? 'ProcessProgram' : v.dpName
return {
@@ -271,7 +269,6 @@
} else {
this.setLineOptions(res.data.data, item.dpName)
}
- console.log(this.list, '>>>>>>>>>>//////1')
})
},
setLineOptions(data, myname) {
@@ -336,9 +333,13 @@
let series = data.data.map((item, i) => {
let current = Math.abs(moment(start).diff(moment(item.time)))
start = item.time
- let name = i === 0 ? '' : data.data[i - 1].name
+ let name = i === 0 ? '' : data.data[i - 1].value
// if (myname === 'ProcessProgram') {
- name = item.value
+ try {
+ name = item.value.slice(-50)
+ } catch (err) {
+ name = item.value
+ }
// }
// let color = !name ? 'transparent' : data.data[i - 1].color
return {
@@ -374,7 +375,7 @@
// return current.format('HH:mm')
// return value
if (i == 0 || current === 0) return ''
- return `${name}:鏃舵${moment(data.data[i - 1].time).format('HH:mm')}-${moment(item.time).format('HH:mm')}`
+ return `${name}:鏃舵${moment(data.data[i - 1].time).format('HH:mm:ss')}-${moment(item.time).format('HH:mm:ss')}`
}
},
}
@@ -413,12 +414,12 @@
},
},
}
- console.log(dayCharts, '>>>>>>>???')
let index = this.list.findIndex(item => item.dpName === myname)
this.list[index] = Object.assign({
...this.list[index],
dayCharts
})
+ console.log(this.list, '>>>>>>>>>>>>>>>>>>>>>>111')
},
change(e) {
this.timeStart = e[0] || moment().format('YYYY-MM-DD')
diff --git a/src/views/tpm/MachineGroup.vue b/src/views/tpm/MachineGroup.vue
index 6c28209..c7fa5bb 100644
--- a/src/views/tpm/MachineGroup.vue
+++ b/src/views/tpm/MachineGroup.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-27 20:02:44
* @LastEditors: gaoshp
- * @LastEditTime: 2024-09-29 19:33:58
+ * @LastEditTime: 2024-11-04 20:10:22
* @FilePath: /cps-web/src/views/tpm/MachineGroup.vue
-->
<template>
@@ -27,7 +27,7 @@
<el-form-item label="涓婄骇鐩綍" prop="parentName">
<el-input disabled style="width: 240px" v-model="form.parentName"></el-input>
</el-form-item>
- <el-form-item label="鏈哄櫒缁勫悕绉�" prop="name">
+ <el-form-item label="璁惧缁勫悕绉�" prop="name">
<el-input :disabled="(form.id === '102' || form.id === '2')" style="width: 240px"
v-model="form.name" clearable></el-input>
</el-form-item>
@@ -97,7 +97,7 @@
},
del() {
this.$confirm(
- '纭鍒犻櫎璇ユ満鍣ㄧ粍锛�',
+ '纭鍒犻櫎璇ヨ澶囩粍锛�',
{
distinguishCancelAndClose: true,
confirmButtonText: '鍒犻櫎',
diff --git a/src/views/tpm/MachineTab.vue b/src/views/tpm/MachineTab.vue
index 49a4e66..5c4e6fe 100644
--- a/src/views/tpm/MachineTab.vue
+++ b/src/views/tpm/MachineTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-27 20:04:34
* @LastEditors: gaoshp
- * @LastEditTime: 2024-09-24 21:03:08
+ * @LastEditTime: 2024-11-04 20:10:30
* @FilePath: /cps-web/src/views/tpm/MachineTab.vue
-->
<template>
@@ -47,7 +47,7 @@
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="鏈哄櫒缂栧彿" prop="machineCode" width="120"></el-table-column>
<el-table-column label="鏈哄櫒鍚嶇О" prop="machineName" width="120"></el-table-column>
- <el-table-column label="鎵�灞炴満鍣ㄧ粍" prop="groupName" width="120"></el-table-column>
+ <el-table-column label="鎵�灞炶澶囩粍" prop="groupName" width="120"></el-table-column>
<el-table-column label="鏈哄櫒绫诲瀷" prop="machineTypeName" width="120"></el-table-column>
<el-table-column label="鏈哄櫒搴忓垪鍙�" prop="serialNo" width="120"></el-table-column>
<el-table-column label="鐭紪鍙�" prop="shortCode" width="120"></el-table-column>
diff --git a/src/views/tpm/machine-management.vue b/src/views/tpm/machine-management.vue
index 61fb8e2..b6f51fd 100644
--- a/src/views/tpm/machine-management.vue
+++ b/src/views/tpm/machine-management.vue
@@ -2,10 +2,10 @@
<el-main>
<el-card shadow="never">
<el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
- <el-tab-pane label="鏈哄櫒鍙拌处" name="1">
+ <el-tab-pane label="璁惧鍙拌处" name="1">
<Machine></Machine>
</el-tab-pane>
- <el-tab-pane label="鏈哄櫒缁�" name="2">
+ <el-tab-pane label="璁惧缁�" name="2">
<MachineGroup></MachineGroup>
</el-tab-pane>
diff --git a/src/views/tpm/machine/Dialog.vue b/src/views/tpm/machine/Dialog.vue
index 1127d07..4031b59 100644
--- a/src/views/tpm/machine/Dialog.vue
+++ b/src/views/tpm/machine/Dialog.vue
@@ -106,8 +106,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎵�灞炴満鍣ㄧ粍" prop="groupId">
- <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="鎵�灞炴満鍣ㄧ粍" clearable></el-input> -->
+ <el-form-item label="鎵�灞炶澶囩粍" prop="groupId">
+ <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="" clearable></el-input> -->
<el-tree-select v-model="form.groupId" node-key="id" :props="props" :data="options.groupId"
filterable style="width: 240px" />
</el-form-item>
@@ -332,8 +332,8 @@
},
mode: "add",
titleMap: {
- add: '鏂板缓鏈哄櫒鍙拌处',
- edit: '缂栬緫鏈哄櫒鍙拌处',
+ add: '鏂板缓璁惧鍙拌处',
+ edit: '缂栬緫璁惧鍙拌处',
// show: '鏌ョ湅'
},
visible: false,
--
Gitblit v1.9.3