From 2b0722ca2665708f7b35cf627a6aa20f3af32082 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 09 十月 2024 20:30:12 +0800
Subject: [PATCH] update
---
src/views/console/workstation/CollTable.vue | 4 ++--
src/views/console/workstation/index.vue | 5 +++--
src/assets/machine1.jpg | 0
src/views/console/workstation/CollDialog.vue | 4 ++--
src/views/mdc/processParam/index.vue | 9 ++++++---
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/assets/machine1.jpg b/src/assets/machine1.jpg
new file mode 100644
index 0000000..4ae797b
--- /dev/null
+++ b/src/assets/machine1.jpg
Binary files differ
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index 8733eb6..6723f27 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -11,7 +11,7 @@
<scFormTable v-show="type" ref="table1" v-model="tabledata" stripe hideDelete :hideAdd="!type"
:addTemplate="addTemplate">
- <el-table-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
+ <el-table-column width="200" v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
<template #header="scope">
<span v-show="item.isRequired" style="color: red;">*</span>
<span>{{ scope.column.label }}</span>
@@ -38,7 +38,7 @@
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" prop="state" width="200">
+ <el-table-column label="鎿嶄綔" prop="state" width="200" fixed="right">
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_edit(scope.row)">缂栬緫</el-button>
diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue
index 4b6afa7..3aa0465 100644
--- a/src/views/console/workstation/CollTable.vue
+++ b/src/views/console/workstation/CollTable.vue
@@ -1,13 +1,13 @@
<!--
* @Date: 2024-10-05 09:51:45
* @LastEditors: gaoshp
- * @LastEditTime: 2024-10-09 20:11:01
+ * @LastEditTime: 2024-10-09 20:22:09
* @FilePath: /cps-web/src/views/console/workstation/CollTable.vue
-->
<template>
<div>
<el-table :data="tabledata" height="200px">
- <el-table-column v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label" width="120">
+ <el-table-column width="200" v-for="item in cols" :key="item.prop" :prop="item.prop" :label="item.label">
<template #header="scope">
<span v-show="item.isRequired" style="color: red;">*</span>
<span>{{ scope.column.label }}</span>
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index a2148c6..ed7765c 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -88,7 +88,8 @@
<p class="preview-title">宸ヤ綅淇℃伅</p>
<div class="preview-content">
<div class="img">
- <img v-if="!previewData.avatar" :src="machinePng" alt="">
+ <img style="width: 148px;height: 148px;" v-if="!previewData.avatar"
+ :src="machinePng" alt="">
<scUpload v-else disabled v-model="previewData.avatar" title="宸ヤ綅鍥剧墖">
</scUpload>
</div>
@@ -350,7 +351,7 @@
import Dialog from './Dialog.vue'
import CollDialog from './CollDialog.vue'
import CollTable from './CollTable.vue'
-import machinePng from '@/assets/machine.png'
+import machinePng from '@/assets/machine1.jpg'
export default {
name: 'system',
components: {
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 287e218..a7e8ac5 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,8 +1,8 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-25 19:22:46
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/processParam/index.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-10-09 20:29:41
+ * @FilePath: /cps-web/src/views/mdc/processParam/index.vue
瀹炴椂鐪嬫澘
-->
<template>
@@ -219,10 +219,13 @@
})
},
query() {
+ if (!this.treeChecked.toString()) return
+ console.log(this.treeChecked.toString(), '>>>>>>>>>/')
this.$refs?.timeLine?.init({
dates: this.time,
workstationId: this.treeChecked.toString()
})
+ this.list = []
this.$HTTP.get('/api/blade-mdc/process-parameter/param', { workstationId: this.treeChecked.toString() }).then(res => {
if (res.code === 200) {
console.log('jkjkjkjkj', this.list)
--
Gitblit v1.9.3