gaoshp
2024-10-09 2b0722ca2665708f7b35cf627a6aa20f3af32082
update
已修改4个文件
已添加1个文件
22 ■■■■■ 文件已修改
src/assets/machine1.jpg 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/CollDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/CollTable.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/workstation/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/processParam/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/machine1.jpg
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>
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>
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: {
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)