From 7f1dbf4296013a4b15fbc2748de072f7c7ad4388 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 一月 2024 16:42:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/dashboard/PieChart.vue | 36 ++++++++++++-----
jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml | 8 +++
jcdm-ui/src/views/dashboard/LineChart.vue | 4 ++
jcdm-ui/src/views/main/sc/stationConf/index.vue | 7 +++
jcdm-ui/src/views/main/bs/material/index.vue | 12 ++++++
jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java | 11 +++++
jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml | 7 +++
jcdm-ui/src/views/dashboard/PanelGroup.vue | 8 ++--
jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java | 9 ++++
9 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
index 015bb39..a7b9a52 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
@@ -22,6 +22,8 @@
@Excel(name = "鐗╂枡缂栧彿")
private String materialCode;
+ @Excel(name = "杞﹀瀷")
+ private String carType;
/** 鐗╂枡鍚嶇О */
@Excel(name = "鐗╂枡鍚嶇О")
private String materialName;
@@ -97,6 +99,12 @@
public String getMaterialCode()
{
return materialCode;
+ }
+ public void setCarType(String carType) {this.carType = carType;}
+
+ public String getCarType()
+ {
+ return carType;
}
public void setMaterialName(String materialName)
{
@@ -241,6 +249,7 @@
.append("id", getId())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
+ .append("carType", getCarType())
.append("materialView", getMaterialView())
.append("typeZ", getTypeZ())
.append("typeL", getTypeL())
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
index 3e418c0..959c22c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
@@ -58,6 +58,8 @@
@Excel(name = "鏇存敼鐢ㄦ埛")
private String updateUser;
+ @Excel(name = "缃戝崱鍦板潃")
+ private String macAddress;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
private String remarks;
@@ -76,9 +78,15 @@
this.processesCode = processesCode;
}
- public String getProcessesCode()
+ public String getProcessesCode()
{
return processesCode;
+ }
+ public void setMacAddress(String macAdress) {this.macAddress = macAdress;}
+
+ public String getMacAddress()
+ {
+ return macAddress;
}
public void setProcessesName(String processesName)
{
@@ -176,6 +184,7 @@
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("processesCode", getProcessesCode())
+ .append("macAddress", getMacAddress())
.append("processesName", getProcessesName())
.append("processesType", getProcessesType())
.append("ipAddress", getIpAddress())
diff --git a/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
index d76ded0..5dbc104 100644
--- a/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
@@ -23,10 +23,12 @@
<result property="status" column="status" />
<result property="supplier" column="supplier" />
<result property="mark" column="mark" />
+ <result property="carType" column="car_type" />
+
</resultMap>
<sql id="selectBsMaterialInfoVo">
- select id, material_code, mark, material_name, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
+ select id, material_code, mark, material_name,car_type, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
</sql>
<select id="selectBsMaterialInfoList" parameterType="BsMaterialInfo" resultMap="BsMaterialInfoResult">
@@ -41,6 +43,7 @@
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="matterVersion != null and matterVersion != ''"> and matter_version = #{matterVersion}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
+ <if test="carType != null and carType != ''"> and car_type = #{carType}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -63,6 +66,7 @@
<if test="id != null">id,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
+ <if test="carType != null">car_type,</if>
<if test="mark != null">mark,</if>
<if test="materialView != null">material_view,</if>
<if test="typeZ != null">type_z,</if>
@@ -84,6 +88,7 @@
<if test="id != null">#{id},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
+ <if test="carType != null">#{carType},</if>
<if test="mark != null">#{mark},</if>
<if test="materialView != null">#{materialView},</if>
<if test="typeZ != null">#{typeZ},</if>
@@ -108,6 +113,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
+ <if test="carType != null">car_type = #{carType},</if>
<if test="mark != null">mark = #{mark},</if>
<if test="materialView != null">material_view = #{materialView},</if>
<if test="typeZ != null">type_z = #{typeZ},</if>
diff --git a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
index 887a0bd..5a105a3 100644
--- a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
@@ -19,15 +19,17 @@
<result property="updateUser" column="update_user" />
<result property="updateTime" column="update_time" />
<result property="remarks" column="remarks" />
+ <result property="macAddress" column="mac_address" />
</resultMap>
<sql id="selectScStationConfVo">
- select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
+ select id, processes_code, mac_address,processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
</sql>
<select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
<include refid="selectScStationConfVo"/>
<where>
+ <if test="macAddress != null and macAddress != ''"> and mac_adress = #{macAddress}</if>
<if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="processesName != null and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
<if test="processesType != null and processesType != ''"> and processes_type = #{processesType}</if>
@@ -51,6 +53,7 @@
insert into sc_station_conf
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="processesCode != null">processes_code,</if>
+ <if test="macAddress != null">mac_address,</if>
<if test="processesName != null">processes_name,</if>
<if test="processesType != null">processes_type,</if>
<if test="ipAddress != null">ip_address,</if>
@@ -66,6 +69,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="processesCode != null">#{processesCode},</if>
+ <if test="macAddress != null">#{macAddress},</if>
<if test="processesName != null">#{processesName},</if>
<if test="processesType != null">#{processesType},</if>
<if test="ipAddress != null">#{ipAddress},</if>
@@ -86,6 +90,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="processesCode != null">processes_code = #{processesCode},</if>
<if test="processesName != null">processes_name = #{processesName},</if>
+ <if test="macAddress != null">mac_address = #{macAddress},</if>
<if test="processesType != null">processes_type = #{processesType},</if>
<if test="ipAddress != null">ip_address = #{ipAddress},</if>
<if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
diff --git a/jcdm-ui/src/views/dashboard/LineChart.vue b/jcdm-ui/src/views/dashboard/LineChart.vue
index 702ff73..4ab1c09 100644
--- a/jcdm-ui/src/views/dashboard/LineChart.vue
+++ b/jcdm-ui/src/views/dashboard/LineChart.vue
@@ -63,6 +63,10 @@
},
setOptions({ expectedData, actualData } = {}) {
this.chart.setOption({
+ title: {
+ text: '灏忔椂浜ч噺瀵规瘮', // 鏍囬鏂囨湰
+ left: 'left' // 鏍囬浣嶇疆
+ },
xAxis: {
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
boundaryGap: false,
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index 1a1081f..f7b6b93 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -7,7 +7,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 璁垮
+ 鍚堢涓婄嚎
</div>
<count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
</div>
@@ -20,7 +20,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 娑堟伅
+ 鍚堢涓嬬嚎
</div>
<count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
</div>
@@ -33,7 +33,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 閲戦
+ 鎬昏涓婄嚎
</div>
<count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
</div>
@@ -46,7 +46,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">
- 璁㈠崟
+ 鎬昏涓嬬嚎
</div>
<count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
</div>
diff --git a/jcdm-ui/src/views/dashboard/PieChart.vue b/jcdm-ui/src/views/dashboard/PieChart.vue
index 63f0d84..167711d 100644
--- a/jcdm-ui/src/views/dashboard/PieChart.vue
+++ b/jcdm-ui/src/views/dashboard/PieChart.vue
@@ -45,29 +45,43 @@
this.chart = echarts.init(this.$el, 'macarons')
this.chart.setOption({
+ title: {
+ text: '宸ヤ綅鍫靛Top5', // 鏍囬鏂囨湰
+ left: 'center' // 鏍囬浣嶇疆
+ },
tooltip: {
trigger: 'item',
formatter: '{a} <br/>{b} : {c} ({d}%)'
},
+ // textStyle
legend: {
- left: 'center',
- bottom: '10',
- data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+ orient: 'vertical',
+
+ left: 'left',
+ // left: 'center',
+ // bottom: '10',//宸︿晶楂樺害
+ data: ['OP460', 'OP090', 'OP660', 'OP650', 'OP730']
},
series: [
{
name: 'WEEKLY WRITE ARTICLES',
type: 'pie',
- roseType: 'radius',
- radius: [15, 95],
- center: ['50%', '38%'],
+ // roseType: 'radius',//鏇存敼鏍峰紡
+ radius: '50%',
+ // labelLine: {
+ // length: 10 // 璋冩暣鏍囩绾跨殑闀垮害
+ // },
+ center: ['50%', '60%'],
data: [
- { value: 320, name: 'Industries' },
- { value: 240, name: 'Technology' },
- { value: 149, name: 'Forex' },
- { value: 100, name: 'Gold' },
- { value: 59, name: 'Forecasts' }
+ { value: 5, name: 'OP460' },
+ { value: 9, name: 'OP090' },
+ { value: 5, name: 'OP660' },
+ { value: 5, name: 'OP650' },
+ { value: 7, name: 'OP730' }
],
+ label: {
+ formatter: '{b}: {c} ({d}%)'
+ },
animationEasing: 'cubicInOut',
animationDuration: 2600
}
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 97a7e15..ad04c8e 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -89,6 +89,10 @@
</el-table-column>
<el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
</el-table-column>
+ <el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="180">
+ </el-table-column>
+ <el-table-column label="杞﹀瀷" align="center" prop="carType" width="180">
+ </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"/>
@@ -170,6 +174,12 @@
<el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
<el-form-item label="鐗╂枡缂栧彿" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
+ </el-form-item>
+ <el-form-item label="鐗规畩浠ｇ爜" prop="mark">
+ <el-input v-model="form.mark" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
+ </el-form-item>
+ <el-form-item label="杞﹀瀷" prop="carType">
+ <el-input v-model="form.carType" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
<el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
@@ -262,6 +272,7 @@
pageNum: 1,
pageSize: 10,
materialCode: null,
+ carType:null,
materialName: null,
materialView: null,
typeZ: null,
@@ -324,6 +335,7 @@
materialName: null,
materialView: null,
typeZ: null,
+ carType:null,
typeL: null,
unit: null,
matterVersion: null,
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
index 8b1089c..e267c11 100644
--- a/jcdm-ui/src/views/main/sc/stationConf/index.vue
+++ b/jcdm-ui/src/views/main/sc/stationConf/index.vue
@@ -89,6 +89,9 @@
</el-table-column>
<el-table-column label="IP鍦板潃" align="center" prop="ipAddress">
</el-table-column>
+ <el-table-column label="缃戝崱鍦板潃" align="center" prop="macAddress">
+ </el-table-column>
+
<el-table-column label="澶囨敞" align="center" prop="remarks">
</el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -147,6 +150,9 @@
<el-form-item label="IP鍦板潃" prop="ipAddress">
<el-input v-model="form.ipAddress" placeholder="璇疯緭鍏P鍦板潃" />
</el-form-item>
+ <el-form-item label="缃戝崱鍦板潃" prop="macAddress">
+ <el-input v-model="form.macAddress" placeholder="璇疯緭鍏ョ綉鍗″湴鍧�" />
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -195,6 +201,7 @@
processesName: null,
processesType: null,
ipAddress: null,
+ macAddress: null,
spareField1: null,
spareField2: null,
spareField3: null,
--
Gitblit v1.9.3