From 7a6644f341970c1715c7717ff698cfd8ec501f6a Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期六, 13 四月 2024 22:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/system/interfaceConfig.vue | 178 +++++----
src/config/upload.js | 12
src/views/mdc/processParam/index.vue | 13
src/views/console/system/component-classification.vue | 206 +++++-----
src/views/mdc/configuration.vue | 11
src/views/console/system/vision-component-modify.vue | 237 +++++++-----
src/views/mdc/output-statistics.vue | 11
src/api/model/common.js | 8
src/views/mdc/station-live.vue | 13
src/api/model/setting.js | 22
src/views/mdc/realtime-status/index.vue | 9
src/views/mdc/state-feedback.vue | 11
src/views/mdc/status-record.vue | 11
副本智能制造系统功能定义.xls | 0
src/views/console/basic-data/working-condition/index.vue | 133 +++---
src/components/scUpload/index.vue | 10
src/views/mdc/alarm-statistics.vue | 21
src/views/master/time/day-off/index.vue | 119 +++---
src/views/mdc/efficiency-analysis.vue | 11
src/views/mdc/time-analysis.vue | 11
20 files changed, 581 insertions(+), 466 deletions(-)
diff --git a/src/api/model/common.js b/src/api/model/common.js
index 47c5b0f..35de0e9 100644
--- a/src/api/model/common.js
+++ b/src/api/model/common.js
@@ -1,9 +1,15 @@
+/*
+ * @Date: 2024-03-23 09:49:06
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-13 20:14:23
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/common.js
+ */
import config from "@/config"
import http from "@/utils/request"
export default {
upload: {
- url: `${config.API_URL}/upload`,
+ url: `${config.API_URL}/blade-visual/visual/put-file`,
name: "鏂囦欢涓婁紶",
post: async function(data, config={}){
return await http.post(this.url, data, config);
diff --git a/src/api/model/setting.js b/src/api/model/setting.js
index 297eae7..f18a396 100644
--- a/src/api/model/setting.js
+++ b/src/api/model/setting.js
@@ -1,7 +1,7 @@
/*
* @Date: 2024-04-07 21:49:32
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-11 22:03:49
+ * @LastEditTime: 2024-04-13 21:05:15
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/setting.js
*/
import config from "@/config"
@@ -83,12 +83,24 @@
},
del: {
url: `${config.API_URL}/blade-visual/visual-comp/remove`,
- name: "鐪嬫澘鎺ュ彛鏂板",
+ name: "缁勪欢鍒犻櫎",
delete: async function(data,conf){
return await http.delete(this.url,data,conf);
}
},
- }
-
-
+ add: {
+ url: `${config.API_URL}/blade-visual/visual-comp/insert`,
+ name: "缁勪欢鏂板",
+ post: async function(data){
+ return await http.post(this.url,data,{});
+ }
+ },
+ update: {
+ url: `${config.API_URL}/blade-visual/visual-comp/update`,
+ name: "缁勪欢鏇存柊",
+ post: async function(data,conf){
+ return await http.put(this.url,data);
+ }
+ }
+ },
}
\ No newline at end of file
diff --git a/src/components/scUpload/index.vue b/src/components/scUpload/index.vue
index 113b722..1a0a0b9 100644
--- a/src/components/scUpload/index.vue
+++ b/src/components/scUpload/index.vue
@@ -78,7 +78,7 @@
disabled: { type: Boolean, default: false },
round: { type: Boolean, default: false },
onSuccess: { type: Function, default: () => { return true } },
-
+ host: {type: String, default: ''},
cropper: { type: Boolean, default: false },
compress: {type: Number, default: 1},
aspectRatio: {type: Number, default: NaN}
@@ -116,7 +116,7 @@
if(url){
this.file = {
status: "success",
- url: url
+ url: `${this.host}${url}`
}
}else{
this.file = null
@@ -198,7 +198,11 @@
success(res, file){
//閲婃斁鍐呭瓨鍒犻櫎blob
URL.revokeObjectURL(file.tempFile)
- delete file.tempFile
+ try {
+ delete file.tempFile
+ } catch (error) {
+
+ }
var os = this.onSuccess(res, file)
if(os!=undefined && os==false){
this.$nextTick(() => {
diff --git a/src/config/upload.js b/src/config/upload.js
index aa4d282..a051d89 100644
--- a/src/config/upload.js
+++ b/src/config/upload.js
@@ -1,3 +1,9 @@
+/*
+ * @Date: 2024-03-23 09:49:06
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-13 20:20:48
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/config/upload.js
+ */
import API from "@/api";
//涓婁紶閰嶇疆
@@ -10,9 +16,9 @@
parseData: function (res) {
return {
code: res.code, //鍒嗘瀽鐘舵�佸瓧娈电粨鏋�
- fileName: res.data.fileName,//鍒嗘瀽鏂囦欢鍚嶇О
- src: res.data.src, //鍒嗘瀽鍥剧墖杩滅▼鍦板潃缁撴瀯
- msg: res.message //鍒嗘瀽鎻忚堪瀛楁缁撴瀯
+ fileName: res.data.name,//鍒嗘瀽鏂囦欢鍚嶇О
+ src: res.data.name, //鍒嗘瀽鍥剧墖杩滅▼鍦板潃缁撴瀯
+ msg: res.msg //鍒嗘瀽鎻忚堪瀛楁缁撴瀯
}
},
apiObjFile: API.common.uploadFile, //闄勪欢涓婁紶璇锋眰API瀵硅薄
diff --git a/src/views/console/basic-data/working-condition/index.vue b/src/views/console/basic-data/working-condition/index.vue
index a78ff33..81a2f25 100644
--- a/src/views/console/basic-data/working-condition/index.vue
+++ b/src/views/console/basic-data/working-condition/index.vue
@@ -1,73 +1,76 @@
<!--
* @Date: 2024-04-01 20:28:18
- * @LastEditors: gaoshp
- * @LastEditTime: 2024-04-01 21:50:06
- * @FilePath: /cps-web/src/views/console/basic-data/working-condition/index.vue
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-13 22:12:39
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/working-condition/index.vue
-->
<template>
- <el-container>
- <el-header style="justify-content:flex-start">
- <el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
- <el-button type="danger" plain icon="el-icon-delete" @click="batchDel"></el-button>
- </el-header>
- <el-main>
- <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :border="true" :stripe="true"
- @selection-change="selectionChange">
- <el-table-column type="selection" />
- <el-table-column prop="dataItem" label="宸ヤ綅鍙橀噺鍚嶇О" />
- <el-table-column prop="dataTypeDesc" label="鏁版嵁鏍囩" />
- <el-table-column prop="usageName" label="璁＄畻鏂规硶" />
- <el-table-column prop="collectSettingItem" label="閲囬泦鍙橀噺鍚嶇О" />
- <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
- <template #default="scope">
- <el-button-group>
- <el-button text type="primary" size="small"
- @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
- <template #reference>
- <el-button text type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-popconfirm>
- </el-button-group>
+ <el-main>
+ <el-card shadow="never">
+ <el-container>
+ <el-header style="justify-content:flex-start">
+ <el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
+ <el-button type="danger" plain icon="el-icon-delete" @click="batchDel"></el-button>
+ </el-header>
+ <el-main>
+ <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey" :border="true" :stripe="true"
+ @selection-change="selectionChange">
+ <el-table-column type="selection" />
+ <el-table-column prop="dataItem" label="宸ヤ綅鍙橀噺鍚嶇О" />
+ <el-table-column prop="dataTypeDesc" label="鏁版嵁鏍囩" />
+ <el-table-column prop="usageName" label="璁＄畻鏂规硶" />
+ <el-table-column prop="collectSettingItem" label="閲囬泦鍙橀噺鍚嶇О" />
+ <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-main>
+ <el-drawer v-model="drawer" title="鏂板缓" :before-close="handleClose">
+ <el-form :model="form" :rules="rules" :disabled="mode == 'show'" ref="dialogForm"
+ label-width="120px" label-position="center">
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
+ <el-input style="width: 240px" v-model="form.dataItem" placeholder="宸ヤ綅鍙橀噺鍚嶇О"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鏁版嵁鏍囩" prop="usageId">
+ <el-select v-model="form.usageId" clearable placeholder="鏁版嵁鏍囩" style="width: 240px">
+ <el-option v-for="item in workstation_param_type" :key="item.id"
+ :label="item.usageName" :value="item.id" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="閲囬泦鍙橀噺鍚嶇О" prop="collectSettingItem">
+ <el-input style="width: 240px" v-model="form.collectSettingItem"
+ placeholder="閲囬泦鍙橀噺鍚嶇О" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <div style="flex: auto">
+ <el-button @click="cancelClick">cancel</el-button>
+ <el-button type="primary" @click="confirmClick">confirm</el-button>
+ </div>
</template>
- </el-table-column>
- </el-table>
- </el-main>
- <el-drawer v-model="drawer" title="鏂板缓" :before-close="handleClose">
- <el-form :model="form" :rules="rules" :disabled="mode == 'show'" ref="dialogForm" label-width="120px"
- label-position="center">
- <el-row>
- <el-col :span="24">
- <el-form-item label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
- <el-input style="width: 240px" v-model="form.dataItem" placeholder="宸ヤ綅鍙橀噺鍚嶇О"
- clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="鏁版嵁鏍囩" prop="usageId">
- <el-select v-model="form.usageId" clearable placeholder="鏁版嵁鏍囩" style="width: 240px">
- <el-option v-for="item in workstation_param_type" :key="item.id" :label="item.usageName"
- :value="item.id" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="閲囬泦鍙橀噺鍚嶇О" prop="collectSettingItem">
- <el-input style="width: 240px" v-model="form.collectSettingItem" placeholder="閲囬泦鍙橀噺鍚嶇О"
- clearable></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div style="flex: auto">
- <el-button @click="cancelClick">cancel</el-button>
- <el-button type="primary" @click="confirmClick">confirm</el-button>
- </div>
- </template>
- </el-drawer>
-
- </el-container>
+ </el-drawer>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/console/system/component-classification.vue b/src/views/console/system/component-classification.vue
index 27f8f4c..120a75b 100644
--- a/src/views/console/system/component-classification.vue
+++ b/src/views/console/system/component-classification.vue
@@ -1,111 +1,119 @@
<!--
* @Date: 2024-04-09 22:18:47
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-11 21:36:58
+ * @LastEditTime: 2024-04-13 22:11:04
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/system/component-classification.vue
* 鍒嗙被缁存姢
-->
<template>
- <el-container>
- <el-header style="justify-content: flex-start;">
- <el-button type="primary" plain @click="add">鏂板</el-button>
- <el-button @click="del" plain type="danger" :disabled="selection.length == 0">鍒犻櫎</el-button>
- </el-header>
- <el-main>
- <el-table @selection-change="handleSelectionChange" :data="tableData"
- style="width: 100%;margin-bottom: 20px;" row-key="id" border :tree-props="{ hasChildren: 'has' }">
- <el-table-column type="selection" width="55" />
- <el-table-column prop="name" label="鍒嗙被鍚嶇О" />
- <el-table-column prop="parentId" label="涓婄骇鍒嗙被" />
- <el-table-column prop="icon" label="鍒嗙被鍥炬爣">
- <template #default="scope">
- <component v-if="icons.includes(scope.row.icon)" style="width: 20px;height: 20px;"
- :is='scope.row.icon'></component>
+ <el-main>
+ <el-card shadow="never">
+ <el-container>
+ <el-header style="justify-content: flex-start;">
+ <el-button type="primary" plain @click="add">鏂板</el-button>
+ <el-button @click="del" plain type="danger" :disabled="selection.length == 0">鍒犻櫎</el-button>
+ </el-header>
+ <el-main>
+ <el-table @selection-change="handleSelectionChange" :data="tableData"
+ style="width: 100%;margin-bottom: 20px;" row-key="id" border
+ :tree-props="{ hasChildren: 'has' }">
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="name" label="鍒嗙被鍚嶇О" />
+ <el-table-column prop="parentId" label="涓婄骇鍒嗙被" />
+ <el-table-column prop="icon" label="鍒嗙被鍥炬爣">
+ <template #default="scope">
+ <component v-if="icons.includes(scope.row.icon)" style="width: 20px;height: 20px;"
+ :is='scope.row.icon'></component>
+ </template>
+ </el-table-column>
+ <el-table-column prop="type" label="鍒嗙被缂栧彿" />
+ <el-table-column prop="orderNum" label="鎺掑垪椤哄簭" />
+ <el-table-column prop="status" label="鐘舵��">
+ <template #default="scope">
+ <span>{{ scope.row.status === 1 ? '鍚敤' : '鍋滅敤' }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-main>
+ <el-dialog v-model="dialogVisible" :title="dialogTitle" width="750" :before-close="handleClose">
+ <el-form :model="row" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鍒嗙被鍚嶇О" prop="name">
+ <el-input style="width: 240px" v-model="row.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓婄骇鍒嗙被" prop="parentId">
+ <el-select v-model="row.parentId" filterable placeholder="璇烽�夋嫨涓婄骇鍒嗙被"
+ style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒嗙被鍥炬爣" prop="icon">
+ <el-input @click="showIconDialog = true" style="width: 240px" v-model="row.icon"
+ placeholder="璇烽�夋嫨鍒嗙被鍥炬爣" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒嗙被缂栧彿" prop="type">
+ <el-input style="width: 240px" v-model="row.type" placeholder="璇疯緭鍏ュ垎绫荤紪鍙�"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺掑垪椤哄簭" prop="orderNum">
+ <el-input-number style="width: 240px" default v-model="row.orderNum" :min="0"
+ placeholder="璇疯緭鍏ユ帓鍒楅『搴�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group style="width: 240px" v-model="row.status">
+ <el-radio v-for="item in statusList" :label="item.value" :key="item.value">{{
+ item.label
+ }}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="save">
+ 淇濆瓨
+ </el-button>
+ </div>
</template>
- </el-table-column>
- <el-table-column prop="type" label="鍒嗙被缂栧彿" />
- <el-table-column prop="orderNum" label="鎺掑垪椤哄簭" />
- <el-table-column prop="status" label="鐘舵��">
- <template #default="scope">
- <span>{{ scope.row.status === 1 ? '鍚敤' : '鍋滅敤' }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
- <template #default="scope">
- <el-button-group>
- <el-button text type="primary" size="small"
- @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
- <template #reference>
- <el-button text type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-popconfirm>
- </el-button-group>
- </template>
- </el-table-column>
- </el-table>
- </el-main>
- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="750" :before-close="handleClose">
- <el-form :model="row" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
- <el-row>
- <el-col :span="12">
- <el-form-item label="鍒嗙被鍚嶇О" prop="name">
- <el-input style="width: 240px" v-model="row.name" placeholder="璇疯緭鍏ュ垎绫诲悕绉�"
- clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="涓婄骇鍒嗙被" prop="parentId">
- <el-select v-model="row.parentId" filterable placeholder="璇烽�夋嫨涓婄骇鍒嗙被" style="width: 240px">
- <el-option v-for="item in options" :key="item.value" :label="item.label"
- :value="item.value" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍒嗙被鍥炬爣" prop="icon">
- <el-input @click="showIconDialog = true" style="width: 240px" v-model="row.icon"
- placeholder="璇烽�夋嫨鍒嗙被鍥炬爣" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍒嗙被缂栧彿" prop="type">
- <el-input style="width: 240px" v-model="row.type" placeholder="璇疯緭鍏ュ垎绫荤紪鍙�"
- clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺掑垪椤哄簭" prop="orderNum">
- <el-input-number style="width: 240px" default v-model="row.orderNum" :min="0"
- placeholder="璇疯緭鍏ユ帓鍒楅『搴�" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐘舵��" prop="status">
- <el-radio-group style="width: 240px" v-model="row.status">
- <el-radio v-for="item in statusList" :label="item.value" :key="item.value">{{ item.label
- }}</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="save">
- 淇濆瓨
- </el-button>
- </div>
- </template>
- </el-dialog>
- <el-dialog v-model="showIconDialog" title="鍒嗙被鍥炬爣" width="750">
- <div class="icons">
- <component @click="setIcon(item)" class="icon" v-for="item in icons" :is='item' :key="item"></component>
- </div>
+ </el-dialog>
+ <el-dialog v-model="showIconDialog" title="鍒嗙被鍥炬爣" width="750">
+ <div class="icons">
+ <component @click="setIcon(item)" class="icon" v-for="item in icons" :is='item' :key="item">
+ </component>
+ </div>
- </el-dialog>
- </el-container>
+ </el-dialog>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/console/system/interfaceConfig.vue b/src/views/console/system/interfaceConfig.vue
index dda7433..8ba5f18 100644
--- a/src/views/console/system/interfaceConfig.vue
+++ b/src/views/console/system/interfaceConfig.vue
@@ -1,85 +1,91 @@
<!--
* @Date: 2024-04-09 22:18:47
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-11 22:08:27
+ * @LastEditTime: 2024-04-13 22:11:37
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/system/interfaceConfig.vue
* 鐪嬫澘鎺ュ彛
-->
<template>
- <el-container>
- <el-header style="justify-content: flex-start;">
- <el-button type="primary" plain @click="add">鏂板</el-button>
- <el-button @click="del" plain type="danger" :disabled="selection.length == 0">鍒犻櫎</el-button>
- <el-input clearable v-model="urlName_like" style="max-width: 200px;margin-left: auto;">
- <template #append>
- <el-button @click="query" icon="el-icon-search" />
- </template>
- </el-input>
- </el-header>
- <el-main>
- <scTable ref="table" @selection-change="handleSelectionChange" row-key="id" border :params="params"
- :apiObj="apiObj" stripe>
- <el-table-column type="selection" width="55" />
- <el-table-column prop="url" label="鎺ュ彛鍦板潃" />
- <el-table-column prop="urlName" label="鎺ュ彛涓枃鍚�" />
- <el-table-column prop="urlType" label="鎺ュ彛绫诲瀷">
- <template #default="scope">
- <span>{{ interface_url_type?.find(v => v.dictKey == scope.row.urlType)?.dictValue }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="owningChart" label="鍥捐〃绫诲瀷">
- <template #default="scope">
- <span>{{ interface_owning_chart?.find(v => v.dictKey == scope.row.owningChart)?.dictValue
- }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
- <template #default="scope">
- <el-button-group>
- <el-button text type="primary" size="small"
- @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
- <template #reference>
- <el-button text type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-popconfirm>
- </el-button-group>
- </template>
- </el-table-column>
- </scTable>
- </el-main>
- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="1000" :before-close="handleClose">
- <el-form :model="row" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
- <el-row>
- <el-col :span="24">
- <el-form-item label="鎺ュ彛鍦板潃" prop="url">
- <el-input style="width: 100%" v-model="row.url" placeholder="璇疯緭鍏�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺ュ彛涓枃鍚�" prop="urlName">
- <el-input style="width: 240px" v-model="row.urlName" placeholder="璇疯緭鍏�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺ュ彛绫诲瀷" prop="urlType">
- <el-select v-model="row.urlType" placeholder="璇烽�夋嫨" style="width: 240px">
- <el-option v-for="item in interface_url_type" :key="item.value" :label="item.dictValue"
- :value="item.dictKey - 0" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍥捐〃绫诲瀷" prop="owningChart">
- <el-select v-model="row.owningChart" placeholder="璇烽�夋嫨" style="width: 240px">
- <el-option v-for="item in interface_owning_chart" :key="item.value"
- :label="item.dictValue" :value="item.dictKey" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <!-- <el-container>
+ <el-main>
+ <el-card shadow="never">
+ <el-container>
+ <el-header style="justify-content: flex-start;">
+ <el-button type="primary" plain @click="add">鏂板</el-button>
+ <el-button @click="del" plain type="danger" :disabled="selection.length == 0">鍒犻櫎</el-button>
+ <el-input clearable v-model="urlName_like" style="max-width: 200px;margin-left: auto;">
+ <template #append>
+ <el-button @click="query" icon="el-icon-search" />
+ </template>
+ </el-input>
+ </el-header>
+ <el-main>
+ <scTable ref="table" @selection-change="handleSelectionChange" row-key="id" border :params="params"
+ :apiObj="apiObj" stripe>
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="url" label="鎺ュ彛鍦板潃" />
+ <el-table-column prop="urlName" label="鎺ュ彛涓枃鍚�" />
+ <el-table-column prop="urlType" label="鎺ュ彛绫诲瀷">
+ <template #default="scope">
+ <span>{{ interface_url_type?.find(v => v.dictKey == scope.row.urlType)?.dictValue
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="owningChart" label="鍥捐〃绫诲瀷">
+ <template #default="scope">
+ <span>{{ interface_owning_chart?.find(v => v.dictKey ==
+ scope.row.owningChart)?.dictValue
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </scTable>
+ </el-main>
+ <el-dialog v-model="dialogVisible" :title="dialogTitle" width="1000" :before-close="handleClose">
+ <el-form :model="row" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鎺ュ彛鍦板潃" prop="url">
+ <el-input style="width: 100%" v-model="row.url" placeholder="璇疯緭鍏�"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺ュ彛涓枃鍚�" prop="urlName">
+ <el-input style="width: 240px" v-model="row.urlName" placeholder="璇疯緭鍏�"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺ュ彛绫诲瀷" prop="urlType">
+ <el-select v-model="row.urlType" placeholder="璇烽�夋嫨" style="width: 240px">
+ <el-option v-for="item in interface_url_type" :key="item.value"
+ :label="item.dictValue" :value="item.dictKey - 0" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍥捐〃绫诲瀷" prop="owningChart">
+ <el-select v-model="row.owningChart" placeholder="璇烽�夋嫨" style="width: 240px">
+ <el-option v-for="item in interface_owning_chart" :key="item.value"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <!-- <el-container>
<el-header>
<el-button plain type="primary">鏂板缓</el-button>
</el-header>
@@ -90,16 +96,18 @@
</el-table>
</el-main>
</el-container> -->
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="save">
- 淇濆瓨
- </el-button>
- </div>
- </template>
- </el-dialog>
- </el-container>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="save">
+ 淇濆瓨
+ </el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/console/system/vision-component-modify.vue b/src/views/console/system/vision-component-modify.vue
index ecd406b..2b3efda 100644
--- a/src/views/console/system/vision-component-modify.vue
+++ b/src/views/console/system/vision-component-modify.vue
@@ -1,104 +1,106 @@
<!--
* @Date: 2024-04-09 22:18:47
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-11 22:07:46
+ * @LastEditTime: 2024-04-13 22:10:21
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/system/vision-component-modify.vue
-->
<template>
- <el-container>
- <el-aside width="220px">
- <el-tree default-expand-all style="max-width: 600px" :data="treeData" :props="defaultProps"
- @node-click="handleNodeClick" />
- </el-aside>
- <el-container>
- <el-header style="justify-content: flex-start;">
- <el-button type="primary" plain @click="add">鏂板</el-button>
- <el-button @click="del" plain type="danger" :disabled="selection.length == 0">鍒犻櫎</el-button>
- </el-header>
- <el-main>
- <scTable ref="table" @selection-change="handleSelectionChange" row-key="id" border :params="params"
- :apiObj="apiObj" stripe>
- <el-table-column type="selection" width="55" />
- <el-table-column prop="name" label="缁勪欢鍚嶇О" />
- <el-table-column prop="typeName" label="鍒嗙被鍚嶇О" />
- <el-table-column prop="url" label="鍥剧墖">
- <template #default="scope">
- <img style="width: 20px;height: 20px;" :src="`${host}${scope.row.url}`" alt="鍥剧墖" srcset="">
- </template>
- </el-table-column>
- <el-table-column prop="orderNum" label="鎺掑垪椤哄簭" />
- <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
- <template #default="scope">
- <el-button-group>
- <el-button text type="primary" size="small"
- @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
- <template #reference>
- <el-button text type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-popconfirm>
- </el-button-group>
- </template>
- </el-table-column>
- </scTable>
- </el-main>
- </el-container>
- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="1000" >
- <el-form :model="row" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
- <el-row>
- <el-col :span="24">
- <el-form-item label="鎺ュ彛鍦板潃" prop="url">
- <el-input style="width: 100%" v-model="row.url" placeholder="璇疯緭鍏�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺ュ彛涓枃鍚�" prop="urlName">
- <el-input style="width: 240px" v-model="row.urlName" placeholder="璇疯緭鍏�" clearable></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺ュ彛绫诲瀷" prop="urlType">
- <el-select v-model="row.urlType" placeholder="璇烽�夋嫨" style="width: 240px">
- <el-option v-for="item in interface_url_type" :key="item.value" :label="item.dictValue"
- :value="item.dictKey - 0" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍥捐〃绫诲瀷" prop="owningChart">
- <el-select v-model="row.owningChart" placeholder="璇烽�夋嫨" style="width: 240px">
- <el-option v-for="item in interface_owning_chart" :key="item.value"
- :label="item.dictValue" :value="item.dictKey" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <!-- <el-container>
- <el-header>
- <el-button plain type="primary">鏂板缓</el-button>
- </el-header>
- <el-main>
- <el-table :data="tableData"
- row-key="id" border
- >
- </el-table>
- </el-main>
- </el-container> -->
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="save">
- 淇濆瓨
- </el-button>
- </div>
- </template>
- </el-dialog>
- </el-container>
+ <el-main>
+ <el-card shadow="never">
+ <el-container>
+ <el-aside width="220px">
+ <el-tree default-expand-all style="max-width: 600px" :data="treeData" :props="defaultProps"
+ @node-click="handleNodeClick" />
+ </el-aside>
+ <el-container>
+ <el-header style="justify-content: flex-start;">
+ <el-button type="primary" plain @click="add">鏂板</el-button>
+ <el-button @click="del" plain type="danger" :disabled="selection.length == 0">鍒犻櫎</el-button>
+ </el-header>
+ <el-main>
+ <scTable ref="table" @selection-change="handleSelectionChange" row-key="id" border
+ :params="params" :apiObj="apiObj" stripe>
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="name" label="缁勪欢鍚嶇О" />
+ <el-table-column prop="typeName" label="鍒嗙被鍚嶇О" />
+ <el-table-column prop="url" label="鍥剧墖">
+ <template #default="scope">
+ <img style="width: 20px;height: 20px;" :src="`${host}${scope.row.url}`" alt="鍥剧墖"
+ srcset="">
+ </template>
+ </el-table-column>
+ <el-table-column prop="orderNum" label="鎺掑垪椤哄簭" />
+ <el-table-column label="鎿嶄綔" fixed="right" align="left" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵"
+ @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </scTable>
+ </el-main>
+ </el-container>
+ <el-dialog v-model="dialogVisible" :title="dialogTitle" width="1000">
+ <el-form :model="row" :rules="rules" ref="dialogForm" label-width="120px" label-position="center">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="缁勪欢鍚嶇О" prop="name">
+ <el-input style="width: 100%" v-model="row.name" placeholder="璇疯緭鍏�"
+ clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒嗙被鍚嶇О" prop="typeName">
+ <el-tree-select v-model="row.typeName" :data="treeData" :props="defaultProps"
+ @node-click="nodeClick" style="width: 240px" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" :data-url="`${host}${row.url}`">
+ <el-form-item label="鍥剧墖" prop="url">
+ <scUpload v-model="row.url" :host="host"></scUpload>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺掑垪椤哄簭" prop="orderNum">
+ <el-input-number v-model="row.orderNum" :min="0" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" style="height: 300px;">
+ <el-card shadow="never" header="javascript Darcula涓婚">
+ <sc-code-editor v-model="row.component" mode="javascript"
+ theme="darcula"></sc-code-editor>
+ </el-card>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="save">
+ 淇濆瓨
+ </el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
+import { defineAsyncComponent } from 'vue';
+const scCodeEditor = defineAsyncComponent(() => import('@/components/scCodeEditor'));
export default {
+ components: {
+ scCodeEditor,
+ },
data() {
return {
defaultProps: {
@@ -115,7 +117,13 @@
dialogVisible: false,
dialogTitle: '鏂板',
row: {
-
+ id: '',
+ type: '',
+ typeName: '',
+ name: '',
+ url: '',
+ orderNum: '',
+ component: "",
},
rules: {
url: [
@@ -142,7 +150,7 @@
},
getList() {
this.$API.setting.component.getImgHost.get().then(res => {
- this.host = res.data + '/visual'
+ this.host = res.data + '/visual/'
this.$API.setting.getList.get().then(res => {
this.treeData = res.data
})
@@ -164,18 +172,24 @@
this.dialogVisible = true
},
del() {
- this.$API.setting.component.del({}, { data: this.selection.map(v => v.id) }).then(res => {
+ this.$API.setting.component.del.delete({}, { data: this.selection.map(v => v.id) }).then(res => {
this.query()
})
},
save() {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- let request = this.$API.setting.interfaceConfig.add
- if (this?.row?.id) {
- request = this.$API.setting.interfaceConfig.update
+ let request = this.$API.setting.component.add
+ let data = {
+ ...this.row
}
- request.post(this.row).then(res => {
+ if (this?.row?.id) {
+ request = this.$API.setting.component.update
+ } else {
+
+ delete data.id
+ }
+ request.post(data).then(res => {
this.dialogVisible = false
this.query()
})
@@ -183,13 +197,34 @@
})
},
table_del(row) {
- this.$API.setting.component.del({}, { data: [row.id] }).then(res => {
+ this.$API.setting.component.del.delete({}, { data: [row.id] }).then(res => {
this.query()
})
- }
+ },
+ table_edit(row) {
+ this.row = row
+ this.dialogVisible = true
+ this.dialogTitle = '缂栬緫'
+ },
+ nodeClick(node) {
+ this.$nextTick(() => {
+ console.log(node)
+ if (node.hasChildren) return
+ this.row.type = node.type
+ this.row.typeName = node.name
+ console.log(this.row)
+ })
+ },
+ handleAvatarSuccess() { },
+ beforeAvatarUpload() { },
}
}
</script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.avatar {
+ width: 200px;
+ height: 200px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/master/time/day-off/index.vue b/src/views/master/time/day-off/index.vue
index 762bc4d..53d23b3 100644
--- a/src/views/master/time/day-off/index.vue
+++ b/src/views/master/time/day-off/index.vue
@@ -1,58 +1,63 @@
<!--
* @Date: 2024-04-07 20:43:26
- * @LastEditors: gaoshp
- * @LastEditTime: 2024-04-08 15:02:14
- * @FilePath: /cps-web/src/views/master/time/day-off/index.vue
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-13 22:13:40
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/master/time/day-off/index.vue
-->
<template>
- <el-container>
- <el-header>
- <el-button :disabled="selections.length == 0" @click="dels">
- 鍒犻櫎
- </el-button>
- <el-button @click="table_add">
- 鍒涘缓
- </el-button>
- <el-select style="width: 200px;margin-left: auto;" v-model="year" @change="query">
- <el-option v-for="(item, index) in years" :key="index" :label="item" :value="item"></el-option>
- </el-select>
- <el-date-picker @change="query" style="width: 300px;flex: 0 0 auto;margin-left: 8px;" v-model="date" type="daterange"
- range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫" value-format="YYYY-MM-DD"/>
- </el-header>
- <el-main>
- <scTable highlight-current-row ref="table" :params="{}"
- :apiObj="apiObj" @selection-change="selectionChange" stripe>
- <el-table-column type="selection" width="50"></el-table-column>
- <el-table-column label="鎵�灞炲勾浠�" prop="year"></el-table-column>
- <el-table-column label="鏃ユ湡" prop="startOffDay">
- <template #default="scope">
- <span>{{ scope.row.startOffDay }}-{{ scope.row.endOffDay }}</span>
- </template>
- </el-table-column>
- <el-table-column label="浼戞伅鏃ヨ鏄�" prop="remark"></el-table-column>
- <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
- <template #default="scope">
- <el-button-group>
- <el-button text type="primary" size="small"
- @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
- <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
- <template #reference>
- <el-button text type="primary" size="small">鍒犻櫎</el-button>
- </template>
- </el-popconfirm>
- </el-button-group>
- </template>
- </el-table-column>
- </scTable>
- </el-main>
- <Dialog @success="success" ref="dialog" :option="{
- years
- }"></Dialog>
- </el-container>
+ <el-main>
+ <el-card shadow="never">
+ <el-container>
+ <el-header>
+ <el-button :disabled="selections.length == 0" @click="dels">
+ 鍒犻櫎
+ </el-button>
+ <el-button @click="table_add">
+ 鍒涘缓
+ </el-button>
+ <el-select style="width: 200px;margin-left: auto;" v-model="year" @change="query">
+ <el-option v-for="(item, index) in years" :key="index" :label="item" :value="item"></el-option>
+ </el-select>
+ <el-date-picker @change="query" style="width: 300px;flex: 0 0 auto;margin-left: 8px;"
+ v-model="date" type="daterange" range-separator="鑷�" start-placeholder="寮�濮�" end-placeholder="缁撴潫"
+ value-format="YYYY-MM-DD" />
+ </el-header>
+ <el-main>
+ <scTable highlight-current-row ref="table" :params="{}" :apiObj="apiObj"
+ @selection-change="selectionChange" stripe>
+ <el-table-column type="selection" width="50"></el-table-column>
+ <el-table-column label="鎵�灞炲勾浠�" prop="year"></el-table-column>
+ <el-table-column label="鏃ユ湡" prop="startOffDay">
+ <template #default="scope">
+ <span>{{ scope.row.startOffDay }}-{{ scope.row.endOffDay }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="浼戞伅鏃ヨ鏄�" prop="remark"></el-table-column>
+ <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </scTable>
+ </el-main>
+ <Dialog @success="success" ref="dialog" :option="{
+ years
+ }"></Dialog>
+ </el-container>
+ </el-card>
+ </el-main>
</template>
<script>
-import Dialog from './Dialog.vue'
+import Dialog from './Dialog.vue'
export default {
components: {
Dialog
@@ -61,7 +66,7 @@
return {
year: '',
date: '',
- apiObj: '',
+ apiObj: '',
selections: [],
years: []
}
@@ -75,36 +80,36 @@
this.years = years;
this.apiObj = this.$API.time.getList
this.year = new Date().getFullYear()
- this.date = [`${this.year}-01-01`,`${this.year}-12-31`]
+ this.date = [`${this.year}-01-01`, `${this.year}-12-31`]
},
methods: {
- table_add () {
+ table_add() {
this.$refs.dialog.open()
},
- table_edit (row) {
+ table_edit(row) {
this.$refs.dialog.open('edit', row)
},
- query () {
+ query() {
this.$refs.table.reload({
year: this.year,
startOffDay: this.date[0] || '',
endOffDay: this.date[1] || ''
})
},
- table_del (row) {
+ table_del(row) {
this.$API.time.remove.delete([row.id]).then(res => {
this.query()
})
},
- dels () {
+ dels() {
this.$API.time.remove.delete([...this.selections.map(item => item.id)]).then(res => {
this.query()
})
},
- selectionChange (selections) {
+ selectionChange(selections) {
this.selections = selections
},
- success () {
+ success() {
this.query()
}
}
diff --git a/src/views/mdc/alarm-statistics.vue b/src/views/mdc/alarm-statistics.vue
index 6adf74c..997186a 100644
--- a/src/views/mdc/alarm-statistics.vue
+++ b/src/views/mdc/alarm-statistics.vue
@@ -1,21 +1,22 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:14:49
+ * @LastEditTime: 2024-04-13 22:14:33
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/alarm-statistics.vue
+ * 杩囩▼鍙傛暟
-->
<template>
- <div>
- 杩囩▼鍙傛暟
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 杩囩▼鍙傛暟
+ </el-card>
+ </el-main>
</template>
<script>
- export default {
-
- }
+export default {
+
+}
</script>
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/mdc/configuration.vue b/src/views/mdc/configuration.vue
index 5d11ceb..b45fff0 100644
--- a/src/views/mdc/configuration.vue
+++ b/src/views/mdc/configuration.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:15:27
+ * @LastEditTime: 2024-04-13 22:15:00
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configuration.vue
+ * 搴旂敤璁剧疆
-->
<template>
- <div>
- 搴旂敤璁剧疆
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 搴旂敤璁剧疆
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index c4335cc..f8c2e29 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:13:37
+ * @LastEditTime: 2024-04-13 22:15:17
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
+ * 鏁堢巼鍒嗘瀽
-->
<template>
- <div>
- 鏁堢巼鍒嗘瀽
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index 3a6aea1..648be68 100644
--- a/src/views/mdc/output-statistics.vue
+++ b/src/views/mdc/output-statistics.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:14:26
+ * @LastEditTime: 2024-04-13 22:15:34
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/output-statistics.vue
+ * 浜ч噺缁熻
-->
<template>
- <div>
- 浜ч噺缁熻
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index 2f42ed9..832099e 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:12:14
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
+ * @LastEditTime: 2024-04-13 22:16:48
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/processParam/index.vue
+ 瀹炴椂鐪嬫澘
-->
<template>
- <div>
- 瀹炴椂鐪嬫澘
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 2f42ed9..ed15ce9 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -3,11 +3,14 @@
* @LastEditors: Sneed
* @LastEditTime: 2024-04-09 22:12:14
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
+ 瀹炴椂鐪嬫澘
-->
<template>
- <div>
- 瀹炴椂鐪嬫澘
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/state-feedback.vue b/src/views/mdc/state-feedback.vue
index e384ab3..0617cc7 100644
--- a/src/views/mdc/state-feedback.vue
+++ b/src/views/mdc/state-feedback.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:11:27
+ * @LastEditTime: 2024-04-13 22:15:38
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/state-feedback.vue
+ 鐘舵�佸弽棣�
-->
<template>
- <div>
- 鐘舵�佸弽棣�
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index e384ab3..8cfa92b 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:11:27
- * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/state-feedback.vue
+ * @LastEditTime: 2024-04-13 22:15:47
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/station-live.vue
+ 鐘舵�佸弽棣�
-->
<template>
- <div>
- 鐘舵�佸弽棣�
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 766f57f..1715377 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:12:56
+ * @LastEditTime: 2024-04-13 22:15:52
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/status-record.vue
+ 鐘舵�佽褰�
-->
<template>
- <div>
- 鐘舵�佽褰�
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index 257de7a..9599f57 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -1,13 +1,16 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:13:57
+ * @LastEditTime: 2024-04-13 22:15:56
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/time-analysis.vue
+ 鐢ㄦ椂鍒嗘瀽
-->
<template>
- <div>
- 鐢ㄦ椂鍒嗘瀽
- </div>
+ <el-main>
+ <el-card shadow="never">
+ 鏁堢巼鍒嗘瀽
+ </el-card>
+ </el-main>
</template>
<script>
diff --git "a/\345\211\257\346\234\254\346\231\272\350\203\275\345\210\266\351\200\240\347\263\273\347\273\237\345\212\237\350\203\275\345\256\232\344\271\211.xls" "b/\345\211\257\346\234\254\346\231\272\350\203\275\345\210\266\351\200\240\347\263\273\347\273\237\345\212\237\350\203\275\345\256\232\344\271\211.xls"
index 5180fc5..5029892 100644
--- "a/\345\211\257\346\234\254\346\231\272\350\203\275\345\210\266\351\200\240\347\263\273\347\273\237\345\212\237\350\203\275\345\256\232\344\271\211.xls"
+++ "b/\345\211\257\346\234\254\346\231\272\350\203\275\345\210\266\351\200\240\347\263\273\347\273\237\345\212\237\350\203\275\345\256\232\344\271\211.xls"
Binary files differ
--
Gitblit v1.9.3