From 9c094a1fe3e1ae3dadef6433f8401818fe2b8304 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 21 六月 2024 10:53:43 +0800
Subject: [PATCH] 1
---
src/views/console/workstation/index.vue | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 2671639..3d2d445 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -7,11 +7,10 @@
<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"
- @node-click="groupClick1"></el-tree>
+ <el-tree :expand-on-click-node="false" ref="group" class="menu" node-key="id"
+ :data="group" :current-node-key="treeCheckKey" :highlight-current="true"
+ :check-on-click-node="true" :default-expanded-keys="[1]"
+ :render-content="renderContent" @node-click="groupClick1"></el-tree>
</el-main>
</el-container>
</el-aside>
@@ -26,12 +25,12 @@
<div class="right-panel">
<div class="right-panel-search">
<span>绫诲瀷</span>
- <el-select v-model="type" style="width: 240px">
+ <el-select v-model="type" style="width: 240px" clearable>
<el-option v-for="item in types" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
<span>鐘舵��</span>
- <el-select v-model="statu" style="width: 240px">
+ <el-select v-model="statu" style="width: 240px" clearable>
<el-option v-for="item in status" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
@@ -47,14 +46,10 @@
ref="table" :params="params" :apiObj="apiObj"
@selection-change="selectionChange" stripe>
<el-table-column type="selection" width="50"></el-table-column>
- <el-table-column label="宸ヤ綅缂栧彿" prop="code" width="120"
- sortable='custom'></el-table-column>
- <el-table-column label="宸ヤ綅鍚嶇О" prop="name" width="120"
- sortable='custom'></el-table-column>
- <el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120"
- sortable='custom'></el-table-column>
- <el-table-column label="宸ヤ綅鏃ュ巻" prop="calendarName" width="120"
- sortable='custom'></el-table-column>
+ <el-table-column label="宸ヤ綅缂栧彿" prop="code" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅鍚嶇О" prop="name" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅鏃ュ巻" prop="calendarName" width="120"></el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
<template #default="scope">
<el-button-group>
@@ -81,7 +76,9 @@
<p class="preview-title">宸ヤ綅淇℃伅</p>
<div class="preview-content">
<div class="img">
- <img :src="machinePng" alt="">
+ <img v-if="!previewData.avatar" :src="machinePng" alt="">
+ <scUpload v-else disabled v-model="previewData.avatar" title="宸ヤ綅鍥剧墖">
+ </scUpload>
</div>
<ul>
<li>宸ヤ綅缂栧彿 {{ previewData.code }}</li>
@@ -129,49 +126,68 @@
<el-container>
<el-header>
<span>閲囬泦淇℃伅</span>
- <el-button @click="editFlag = !editFlag" style="margin-left: auto;" text type="primary" size="small">閰嶇疆宸ヤ綅閲囬泦</el-button>
- <el-button v-show="editFlag" @click="saveInfo" text type="primary" size="small">淇濆瓨</el-button>
- <el-button text type="primary" size="small">淇敼DMP閰嶇疆</el-button>
+ <el-button @click="editFlag = !editFlag"
+ style="margin-left: auto;" text type="primary"
+ size="small">閰嶇疆宸ヤ綅閲囬泦</el-button>
+ <el-button v-show="editFlag" @click="saveInfo" text
+ type="primary" size="small">淇濆瓨</el-button>
+ <el-button text type="primary"
+ size="small">淇敼DMP閰嶇疆</el-button>
</el-header>
<el-main>
<el-table :data="list" height="200px">
- <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name" />
- <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
+ <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name"
+ width="120" />
+ <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem"
+ width="120">
<template #default="scope">
- <el-input :disabled="!editFlag" v-model="scope.row.dataItem"></el-input>
+ <el-input :disabled="!editFlag"
+ v-model="scope.row.dataItem"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏁版嵁鏍囩" prop="description">
+ <el-table-column label="鏁版嵁鏍囩" prop="description"
+ width="150">
<template #default="scope">
- <el-select :disabled="!editFlag" v-model="scope.row.description">
- <el-option v-for="item in workstation_param_type" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey-0" />
+ <el-select :disabled="!editFlag"
+ v-model="scope.row.description">
+ <el-option
+ v-for="item in workstation_param_type"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey - 0" />
</el-select>
<!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
</template>
</el-table-column>
- <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType">
+ <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType"
+ width="150">
<template #default="scope">
- <el-select disabled v-model="scope.row.wcsDataType">
- <el-option v-for="item in dmp_data_type" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey-0" />
+ <el-select disabled
+ v-model="scope.row.wcsDataType">
+ <el-option v-for="item in dmp_data_type"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey - 0" />
</el-select>
<!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
</template>
</el-table-column>
<el-table-column label="澶у睆" prop="bigScreen">
<template #default="scope">
- <el-checkbox :disabled="!editFlag" v-model="scope.row.bigScreen" />
+ <el-checkbox :disabled="!editFlag"
+ v-model="scope.row.bigScreen" />
</template>
</el-table-column>
<el-table-column label="瀹炴椂鏁版嵁" prop="realTimeData">
<template #default="scope">
- <el-checkbox :disabled="!editFlag" v-model="scope.row.realTimeData" />
+ <el-checkbox :disabled="!editFlag"
+ v-model="scope.row.realTimeData" />
</template>
</el-table-column>
<el-table-column label="杩囩▼鍙傛暟" prop="processParameter">
<template #default="scope">
- <el-checkbox :disabled="!editFlag" v-model="scope.row.processParameter" />
+ <el-checkbox :disabled="!editFlag"
+ v-model="scope.row.processParameter" />
</template>
</el-table-column>
</el-table>
@@ -210,7 +226,7 @@
<el-col :span="8">
<ul class="workbench">
<li v-for="item in workbenchVOList" :key="item.sort">
- {{`銆�${item.sort}銆慲}}{{item.name}}
+ {{ `銆�${item.sort}銆慲 }}{{ item.name }}
</li>
</ul>
</el-col>
@@ -659,8 +675,8 @@
this.search()
})
},
- saveInfo () {
- this.$HTTP.post('/api/blade-cps/workstation-wcs/save',this.workbenchVOList).then(res => {
+ saveInfo() {
+ this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
this.editFlag = false
})
},
@@ -701,6 +717,7 @@
}
}
}
+
.workbench {
list-style: none;
}
--
Gitblit v1.9.3