From 9c5ce6d05798da90d130ddf42d366fab369735e7 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 06 一月 2024 19:26:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-common/src/main/java/com/jcdm/common/utils/file/FileTypeUtils.java | 4
jcdm-ui/src/views/main/om/productionOrde/index.vue | 7
jcdm-ui/src/views/index.vue | 74 ------------
jcdm-ui/src/views/main/bs/material/index.vue | 64 +++++-----
jcdm-admin/src/main/resources/logback.xml | 2
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 170 ++++++++++++++++++++++++++++
README.md | 2
jcdm-common/src/main/java/com/jcdm/common/utils/file/FileUtils.java | 4
8 files changed, 213 insertions(+), 114 deletions(-)
diff --git a/README.md b/README.md
index 590de18..2931e34 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@
## 骞冲彴绠�浠�
-鑻ヤ緷鏄竴濂楀叏閮ㄥ紑婧愮殑蹇�熷紑鍙戝钩鍙帮紝姣棤淇濈暀缁欎釜浜哄強浼佷笟鍏嶈垂浣跨敤銆�
-
* 鍓嶇閲囩敤Vue銆丒lement UI銆�
* 鍚庣閲囩敤Spring Boot銆丼pring Security銆丷edis & Jwt銆�
* 鏉冮檺璁よ瘉浣跨敤Jwt锛屾敮鎸佸缁堢璁よ瘉绯荤粺銆�
diff --git a/jcdm-admin/src/main/resources/logback.xml b/jcdm-admin/src/main/resources/logback.xml
index e79adb0..6538681 100644
--- a/jcdm-admin/src/main/resources/logback.xml
+++ b/jcdm-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <property name="log.path" value="/home/ruoyi/logs" />
+ <property name="log.path" value="/home/mes/logs" />
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
diff --git a/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileTypeUtils.java b/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileTypeUtils.java
index 7cefb30..e928143 100644
--- a/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileTypeUtils.java
+++ b/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileTypeUtils.java
@@ -13,7 +13,7 @@
/**
* 鑾峰彇鏂囦欢绫诲瀷
* <p>
- * 渚嬪: ruoyi.txt, 杩斿洖: txt
+ * 渚嬪: jcdm.txt, 杩斿洖: txt
*
* @param file 鏂囦欢鍚�
* @return 鍚庣紑锛堜笉鍚�".")
@@ -30,7 +30,7 @@
/**
* 鑾峰彇鏂囦欢绫诲瀷
* <p>
- * 渚嬪: ruoyi.txt, 杩斿洖: txt
+ * 渚嬪: jcdm.txt, 杩斿洖: txt
*
* @param fileName 鏂囦欢鍚�
* @return 鍚庣紑锛堜笉鍚�".")
diff --git a/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileUtils.java b/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileUtils.java
index 809aaf4..b9ed809 100644
--- a/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileUtils.java
+++ b/jcdm-common/src/main/java/com/jcdm/common/utils/file/FileUtils.java
@@ -256,7 +256,7 @@
}
/**
- * 鑾峰彇鏂囦欢鍚嶇О /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
+ * 鑾峰彇鏂囦欢鍚嶇О /profile/upload/2022/04/16/jcdm.png
*
* @param fileName 璺緞鍚嶇О
* @return 娌℃湁鏂囦欢璺緞鐨勫悕绉�
@@ -274,7 +274,7 @@
}
/**
- * 鑾峰彇涓嶅甫鍚庣紑鏂囦欢鍚嶇О /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+ * 鑾峰彇涓嶅甫鍚庣紑鏂囦欢鍚嶇О /profile/upload/2022/04/16/jcdm.png
*
* @param fileName 璺緞鍚嶇О
* @return 娌℃湁鏂囦欢璺緞鍜屽悗缂�鐨勫悕绉�
diff --git a/jcdm-ui/src/views/index.vue b/jcdm-ui/src/views/index.vue
index d24c5af..d382cd8 100644
--- a/jcdm-ui/src/views/index.vue
+++ b/jcdm-ui/src/views/index.vue
@@ -9,81 +9,7 @@
<hr />
</el-col>
</el-row>
- <el-row :gutter="20">
- <el-col :sm="24" :lg="12" style="padding-left: 20px">
- <h2>姹熷MES绠＄悊妗嗘灦</h2>
- <p>
- </p>
- </el-col>
-
- <el-col :sm="24" :lg="12" style="padding-left: 50px">
- <el-row>
- <el-col :span="12">
- <h2>鎶�鏈�夊瀷</h2>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <h4>鍚庣鎶�鏈�</h4>
- <ul>
- <li>SpringBoot</li>
- <li>Spring Security</li>
- <li>JWT</li>
- <li>MyBatis</li>
- <li>Druid</li>
- <li>Fastjson</li>
- <li>...</li>
- </ul>
- </el-col>
- <el-col :span="6">
- <h4>鍓嶇鎶�鏈�</h4>
- <ul>
- <li>Vue</li>
- <li>Vuex</li>
- <li>Element-ui</li>
- <li>Axios</li>
- <li>Sass</li>
- <li>Quill</li>
- <li>...</li>
- </ul>
- </el-col>
- </el-row>
- </el-col>
- </el-row>
- <el-divider />
- <el-row :gutter="20">
- <el-col :xs="24" :sm="24" :md="12" :lg="8">
- <el-card class="update-log">
- <div slot="header" class="clearfix">
- <span>淇℃伅</span>
- </div>
- <div class="body">
-
- </div>
- </el-card>
- </el-col>
- <el-col :xs="24" :sm="24" :md="12" :lg="8">
- <el-card class="update-log">
- <div slot="header" class="clearfix">
- <span>鏃ュ織</span>
- </div>
- <div class="body">
-
- </div>
- </el-card>
- </el-col>
- <el-col :xs="24" :sm="24" :md="12" :lg="8">
- <el-card class="update-log">
- <div slot="header" class="clearfix">
- <span>鏀寔</span>
- </div>
- <div class="body">
-
- </div>
- </el-card>
- </el-col>
- </el-row>
</div>
</template>
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 9d7ffd3..f32dc96 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -83,41 +83,48 @@
<el-table v-loading="loading" border :data="materialList" @selection-change="handleSelectionChange" v-if="materialList.length > 0">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐗╂枡缂栧彿" width="130" align="center" prop="materialCode">
+ <el-table-column label="鐗╂枡缂栧彿" align="center" prop="materialCode" width="180">
</el-table-column>
- <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName">
+ <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="250">
</el-table-column>
- <el-table-column label="瑙嗗浘" align="center" prop="materialView">
+ <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
</el-table-column>
-<!-- <el-table-column label="绉嶇被" align="center" prop="typeZ">-->
-<!-- </el-table-column>-->
<el-table-column label="绫诲瀷" align="center" prop="typeL">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
</template>
</el-table-column>
- <el-table-column label="鍗曚綅" align="center" prop="unit">
+
+ <el-table-column label="鍨嬪彿" align="center" prop="typeZ" width="180">
+ </el-table-column>
+
+ <el-table-column label="鍗曚綅" align="center" prop="unit" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
</template>
</el-table-column>
<!-- <el-table-column label="ERP瑙勬牸" align="center" prop="erpSpec">-->
<!-- </el-table-column>-->
- <el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">
- </el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status">
+
+ <el-table-column label="鐘舵��" align="center" prop="status" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="鍘傚晢" align="center" prop="supplier">
+
+<!-- <el-table-column label="鍘傚晢" align="center" prop="supplier">
+ </el-table-column>-->
+ <el-table-column label="澶囨敞" align="center" prop="remarks" width="180">
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks">
+ <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" width="150">
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="170">
+ </el-table-column>
+ <el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="150">
+ </el-table-column>
+ <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="170">
+ </el-table-column>
+ <el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -167,14 +174,8 @@
<el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
<el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
</el-form-item>
- <el-form-item label="瑙嗗浘" prop="materialView">
- <el-input v-model="form.materialView" placeholder="璇疯緭鍏ヨ鍥�" />
- </el-form-item>
-<!-- <el-form-item label="绉嶇被" prop="typeZ">-->
-<!-- <el-input v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />-->
-<!-- </el-form-item>-->
- <el-form-item label="绫诲瀷" prop="typeL">
-<!-- <el-input v-model="form.typeL" placeholder="璇疯緭鍏ョ被鍨�" />-->
+ <el-form-item label="鐗╂枡绫诲瀷" prop="typeL">
+ <!-- <el-input v-model="form.typeL" placeholder="璇疯緭鍏ョ被鍨�" />-->
<el-select v-model="form.typeL" style="width: 204px;" placeholder="璇烽�夋嫨鍗曚綅" clearable>
<el-option
v-for="dict in dict.type.material_type"
@@ -183,6 +184,12 @@
:value="dict.value"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍨嬪彿" prop="typeZ">
+ <el-input v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />
+ </el-form-item>
+ <el-form-item label="瑙嗗浘" prop="materialView">
+ <el-input v-model="form.materialView" placeholder="璇疯緭鍏ヨ鍥�" />
</el-form-item>
<el-form-item label="鍗曚綅" prop="unit">
<!-- <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" />-->
@@ -198,12 +205,12 @@
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
- <el-form-item label="ERP瑙勬牸" prop="erpSpec">
+<!-- <el-form-item label="ERP瑙勬牸" prop="erpSpec">
<el-input v-model="form.erpSpec" placeholder="璇疯緭鍏RP瑙勬牸" />
- </el-form-item>
- <el-form-item label="鍘傚晢" prop="supplier">
+ </el-form-item>-->
+<!-- <el-form-item label="鍘傚晢" prop="supplier">
<el-input v-model="form.supplier" placeholder="璇疯緭鍏ュ巶鍟�" />
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="鐘舵��" prop="status">
<el-radio-group v-model="form.status">
<el-radio
@@ -286,9 +293,6 @@
],
typeL: [
{ required: true, message: "绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }
- ],
- unit: [
- { required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }
],
}
};
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
new file mode 100644
index 0000000..75f4f62
--- /dev/null
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -0,0 +1,170 @@
+<template>
+ <div class="app-container">
+ <el-row :gutter="5">
+ <el-col :span="6">
+ <el-card shadow="hover">
+ 宸ヤ綅缂栧彿 : OP1010
+ </el-card>
+ </el-col>
+ <el-col :span="6">
+ <el-card shadow="hover">
+ 宸ヤ綅鍚嶇О : 璐存爣鏈�-璐寸爜
+ </el-card>
+ </el-col>
+ <el-col :span="12">
+ <el-card shadow="hover">
+ 鎬绘垚缂栫爜 : 1000000000000001
+ </el-card>
+ </el-col>
+
+ </el-row>
+ <el-row :gutter="5" style="margin-top: 5px">
+ <el-col :span="6" >
+ <el-card class="bottom-card">
+ <div slot="header" class="clearfix">
+ <span>褰撳墠宸ヤ欢淇℃伅</span>
+ </div>
+ <el-descriptions :column="1" border>
+ <el-descriptions-item>
+ <template slot="label">
+ <span>宸ュ崟缂栧彿</span>
+ </template>
+ <span>test00000001</span>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <span>浜у搧缂栧彿</span>
+ </template>
+ <span>test00000001</span>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <span>浜у搧鍨嬪彿</span>
+ </template>
+ <span>test00000001</span>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <span>浜у搧鍚嶇О</span>
+ </template>
+ <span>test00000001</span>
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <span>鑺傛媿</span>
+ </template>
+ <span>姹熻嫃鐪佽嫃宸炲競鍚翠腑鍖哄惔涓�</span>
+ </el-descriptions-item>
+ </el-descriptions>
+ <el-divider></el-divider>
+ <el-row>
+ <el-col :span="12">
+ <el-button class="circle-button" circle></el-button>
+ <span> PLC鐘舵��</span>
+ </el-col>
+ <el-col :span="12">
+ <el-button class="circle-button" circle></el-button>
+ <span> 鎵爜鏋姸鎬�</span>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 20px">
+ <el-col :span="12">
+ <el-button class="circle-button" circle></el-button>
+ <span> 宸ヤ欢鍒颁綅</span>
+ </el-col>
+ <el-col :span="12">
+ <el-button class="circle-button" circle></el-button>
+ <span> 鎵爜瀹屾垚</span>
+ </el-col>
+ </el-row>
+ <el-row style="margin-top: 20px">
+ <el-col :span="12">
+ <el-button class="circle-button" circle></el-button>
+ <span> 寮�濮嬩綔涓�</span>
+ </el-col>
+ <el-col :span="12">
+ <el-button class="circle-button" circle></el-button>
+ <span> 鍏佽鏀捐</span>
+ </el-col>
+ </el-row>
+ </el-card>
+
+ </el-col>
+ <el-col :span="18">
+ <el-tabs type="border-card" style="height: 600px">
+ <el-tab-pane>
+ <span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
+ <el-col :span="8">
+ <el-table>
+ <el-table-column label="搴忓彿" align="center" prop="repairIdentification" width="50px"/>
+ <el-table-column label="鎿嶄綔鍐呭" align="center" prop="boxCode" width="300px"/>
+ </el-table>
+ </el-col>
+ <el-col :span="16">
+ <el-image style="height: 520px;width: 100%" :src="imgSrc"></el-image>
+ </el-col>
+ </el-tab-pane>
+ <el-tab-pane>
+ <span slot="label"> <b class="el-icon-date"></b>鐗╂枡BOM</span>
+ <el-empty >
+ <span slot="description">鏆傛棤鏁版嵁</span>
+ </el-empty>
+ </el-tab-pane>
+ <el-tab-pane>
+ <span slot="label"> <c class="el-icon-date"></c>閲囬泦娓呭崟</span>
+ <el-empty >
+ <span slot="description">鏆傛棤鏁版嵁</span>
+ </el-empty>
+ </el-tab-pane>
+ <el-tab-pane>
+ <span slot="label"> <d class="el-icon-date"></d>瀹夌伅鐘舵��</span>
+ <el-empty >
+ <span slot="description">鏆傛棤鏁版嵁</span>
+ </el-empty>
+ </el-tab-pane>
+ <el-tab-pane>
+ <span slot="label"> <e class="el-icon-date"></e>宸ヨ壓閰嶆柟</span>
+ <el-empty >
+ <span slot="description">鏆傛棤鏁版嵁</span>
+ </el-empty>
+ </el-tab-pane>
+ </el-tabs>
+ </el-col>
+ </el-row>
+
+
+ </div>
+</template>
+<script>
+export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ imgSrc: '',
+ }
+ },
+ computed: {},
+ watch: {},
+ created() {},
+ mounted() {},
+ methods: {}
+}
+
+</script>
+<style scoped>
+.bottom-card{
+ height: 600px;
+}
+.circle-button{
+ height: 30px;
+ width: 30px;
+ //background-color: #ce0b0b;
+ //background-color: #00afff;
+ background-color: #13ce66;
+}
+
+span{
+ font-size: 15px;
+}
+</style>
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 17ac58c..5c5df66 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -469,8 +469,10 @@
// 鍦ㄨ繖閲岀紪鍐欏鐞嗛�変腑浜嬩欢鐨勯�昏緫
handleSelectChange(selectedOption) {
this.form.lineCode = null;
- this.queryParams.workshopCode = selectedOption;
- listLineInfo(this.queryParams).then(response => {
+ let params = {
+ workshopCode: selectedOption
+ };
+ listLineInfo(params).then(response => {
this.lineOptions = response.rows;
});
},
@@ -509,7 +511,6 @@
getList() {
this.loading = true;
listProductionOrde(this.queryParams).then(response => {
- console.log(response)
this.productionOrdeList = response.rows;
this.total = response.total;
this.loading = false;
--
Gitblit v1.9.3