update

src/assets/icons/svg/back.svg

@@ -0,0 +1 @@
+<svg t="1740621856056" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1864" width="256" height="256"><path d="M462.266 167.466l-328.098 284.381 328.098 284.359v-191.379s454.799-147.683 362.705 311.707c0 0 293.586-557.828-368.422-519.544l5.719-169.527z" p-id="1865"></path></svg>

src/views/device/device/add_edit.vue

@@ -10,7 +10,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item :label="tLang('device', '机架号')" prop="label">
-            <el-input v-model="form.code" :placeholder="tLang('common', '请输入') + tLang('device', '机架号')"
+            <el-input v-model="form.label" :placeholder="tLang('common', '请输入') + tLang('device', '机架号')"
               :disabled="form.id !== null" />
           </el-form-item>
         </el-col>

src/views/device/device/index.vue

@@ -159,6 +159,7 @@ let queryParams = reactive({
   pageSize: 10,
   name: null,
   code: null,
+  label: null,
   type: null,
   workShop: null,
   lineName: null,
@@ -258,6 +259,7 @@ function reset() {
     id: null,
     name: null,
     code: null,
+    label: null,
     workShop: null,
     lineName: null,
     maintenance: null,

src/views/screen/devItem/component/stackBarChart.vue

@@ -39,7 +39,7 @@ const options = computed(() => {
             data: prop.data.xAxis,
         },
         yAxis: {
-            name: 'h',
+            name: 'min',
             type: 'value',            
             axisLabel: {
                 color: '#fff',

src/views/screen/devItem/index.vue

@@ -2,6 +2,8 @@
     <div class="container">
         <div class="header">
             <div class="title">微工厂设备详情</div>
+            <svg-icon icon-class="back" class="back_icon" @click="handleBack"/>
+
         </div>
         <div class="content">
             <div class="left-plane">
@@ -103,7 +105,7 @@
                         header-row-class-name="table_header" style="width: 100%;height: 100%;">
                         <el-table-column prop="devCode" label="编码" width="90" />
                         <el-table-column prop="name" label="设备名称" />
-                        <el-table-column prop="runTime" label="报警内容" />
+                        <el-table-column prop="subject" label="报警内容" />
                         <el-table-column prop="person" label="负责人" />
                         <el-table-column prop="time" label="报警时间" />
                     </el-table>
@@ -115,7 +117,7 @@
                         header-row-class-name="table_header" style="width: 100%;height: 100%;">
                         <el-table-column prop="devCode" label="编码" width="90" />
                         <el-table-column prop="name" label="设备名称" />
-                        <el-table-column prop="runTime" label="保养内容" />
+                        <el-table-column prop="subject" label="保养内容" />
                         <el-table-column prop="person" label="负责人" />
                         <el-table-column prop="time" label="保养时间" />
                     </el-table>
@@ -138,11 +140,12 @@ import Card from './component/card.vue';
 import StackBarChart from './component/stackBarChart.vue';
 import Progress from './component/Progress.vue';
 import LineChart from './component/lineChart.vue';
-import { useRoute } from 'vue-router';
+import { useRoute,useRouter } from 'vue-router';
 import { listDevice, deviceCheck, deviceRepair, deviceStatusById, deviceStatusChart,deviceRateChart,deviceElectChart } from '@/api/screen/micro'
 
 
 const route = useRoute();
+const router = useRouter();
 let id = ref(0)
 
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
@@ -232,6 +235,11 @@ function getdeviceElectChart() {
         
     })
 }
+
+//返回
+function handleBack() {
+    router.go(-1);
+}
 onMounted(() => {
     id.value = route.params.id;
     getDeviceCheck();
@@ -251,6 +259,15 @@ onMounted(() => {
     color: #21dadb;
     text-align: center;
 }
+.back_icon {
+    position: absolute;
+    top: 40px;
+    left: 20px;
+    width: 60px;
+    height: 60px;
+    color: #f9f8f4;
+    cursor: pointer;
+}
 
 .container {
     width: 1920px;
@@ -267,6 +284,7 @@ onMounted(() => {
     background-position: center;
 
     .header {
+        position: relative;
         width: 100%;
         height: 89px;
         background-image: url('/src/assets/images/screen-header-bg1.png');

src/views/screen/microFactory/index.vue

@@ -16,8 +16,16 @@
                     >
                         <el-table-column prop="code" label="编码" width="90"/>
                         <el-table-column prop="name" label="设备名称" />
-                        <el-table-column prop="runTime" label="运行时长" />
+                        <el-table-column prop="runTime" label="运行时长" >
-                        <el-table-column prop="rate" label="设备利用率" />
+                            <template #default="{row}">
+                                <div>{{ row.runTime }}min</div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="rate" label="设备利用率" >
+                            <template #default="{row}">
+                                <div>{{ row.rate }}%</div>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="state" label="状态" >
                             <template #default="{row}">
                                 <div style="width:100%;height:100%;display:flex;justify-content: space-around;align-items: center;">
@@ -120,17 +128,23 @@
                     <el-table :data="remindData"  v-if="remindData.length > 0" v-tableAutoScroll="{delay:15}" header-row-class-name="table_header" style="width: 100%;height: 100%;">
                         <el-table-column prop="devCode" label="编码" width="90"/>
                         <el-table-column prop="name" label="设备名称" />
-                        <el-table-column prop="runTime" label="保养内容" />
+                        <el-table-column prop="subject" label="保养内容" />
                         <el-table-column prop="person" label="负责人" />
                         <el-table-column prop="time" label="保养时间" />
                     </el-table>
                     <el-empty v-else description="暂无记录" />
+                    <!-- <div class="radio-ab-lb">
+                        <el-radio-group v-model="radio_repair" @change="handleChangeRepair" size="small">
+                            <el-radio-button label="b">保养</el-radio-button>
+                            <el-radio-button label="w">维修</el-radio-button>
+                        </el-radio-group>
+                    </div> -->
                 </CardVue>
                 <CardVue class="left-container" title="设备报警">
                     <el-table :data="repairData" v-if="repairData.length > 0" v-tableAutoScroll="{delay:15}" header-row-class-name="table_header" style="width: 100%;height: 100%;">
                         <el-table-column prop="devCode" label="编码" width="90"/>
                         <el-table-column prop="name" label="设备名称" />
-                        <el-table-column prop="runTime" label="报警内容" />
+                        <el-table-column prop="subject" label="报警内容" />
                         <el-table-column prop="person" label="负责人" />
                         <el-table-column prop="time" label="报警时间" />
                     </el-table>
@@ -138,7 +152,7 @@
                 </CardVue>
             </div>
         </div>
-        <div class="footer">{{skinName}}</div>
+        <div class="footer"></div>
     </div>
 
 </template>
@@ -165,7 +179,7 @@ import { listDevice, listElect, electMonitoring, deviceStatus, deviceRate,device
 let {proxy} = getCurrentInstance()
 let router = useRouter()
 let radio_bar = ref('d')
-
+let radio_repair = ref('b')
 let skinName = ref('');
 
 let devStatus = reactive({
@@ -233,6 +247,13 @@ function handleChangeBar() {
     getlistElect()
 }
 
+function handleChangeRepair() {
+    if (radio_repair.value == 'b') {
+        getdeviceCheck()
+    } else {
+        getdeviceRepair()
+    }
+}
 
 let powerMonitoring = ref([
     { label: '当天耗电量', value: 8 },