wu
2024-09-19 5a723d52fae6f080dd16eead0bab8767e606cff3
页面样式修正和语言
3个文件已修改
352 ■■■■ 已修改文件
UI-Project/src/lang/zh.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/router/index.js 324 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/MechanicalArm/mechanicalArm.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/lang/zh.js
@@ -173,7 +173,9 @@
        downLine :'下线',
        topLine :'上线',
        start :'开工',
        stop :'暂停'
        stop :'暂停',
        bound:'绑定'
    }
    ,
    mechanicalArm:{
UI-Project/src/router/index.js
@@ -38,173 +38,173 @@
        },
        {
          /*----------- 自动扫码 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          path: 'ScanQR',
          name: 'scanQR',
          component: () => import('../views/ScanQR/scanQR.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
              path: '/ScanQR/scanQR',
              name: 'scanQR',
              component: () => import('../views/ScanQR/scanQR.vue'),
            }
          ]
        },
        {
          /*----------- 磨边机 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 清洗机 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 翻片台 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 扫码2 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 自动打标机 ----------------*/
          path: 'Marking',
          name: 'marking',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 自动丝印机 ----------------*/
          path: 'SilkScreen',
          name: 'silkScreen',
          component: () => import('../views/SilkScreen/silkScreen.vue'),
          children: [
            {
              path: '/SilkScreen/silkScreen',
              name: 'silkScreen',
              component: () => import('../views/SilkScreen/silkScreen.vue'),
            }
          ]
        },
        {
          /*----------- 自动点胶机 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 烘干线 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 旋转台 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 自动贴膜机 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 报工管理 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        {
          /*----------- 报表管理 ----------------*/
          path: 'ZiDongShangpian',
          name: 'zidongshangpian',
          component: () => import('../views/Marking/marking.vue'),
          children: [
            {
              path: '/Marking/marking',
              name: 'marking',
              component: () => import('../views/Marking/marking.vue'),
            }
          ]
        },
        // {
        //   /*----------- 磨边机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 清洗机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 翻片台 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 扫码2 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动打标机 ----------------*/
        //   path: 'Marking',
        //   name: 'marking',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动丝印机 ----------------*/
        //   path: 'SilkScreen',
        //   name: 'silkScreen',
        //   component: () => import('../views/SilkScreen/silkScreen.vue'),
        //   children: [
        //     {
        //       path: '/SilkScreen/silkScreen',
        //       name: 'silkScreen',
        //       component: () => import('../views/SilkScreen/silkScreen.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动点胶机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 烘干线 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 旋转台 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 自动贴膜机 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 报工管理 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        // {
        //   /*----------- 报表管理 ----------------*/
        //   path: 'ZiDongShangpian',
        //   name: 'zidongshangpian',
        //   component: () => import('../views/Marking/marking.vue'),
        //   children: [
        //     {
        //       path: '/Marking/marking',
        //       name: 'marking',
        //       component: () => import('../views/Marking/marking.vue'),
        //     }
        //   ]
        // },
        /*----------- 系统管理 ----------------*/
        {
          path: 'User',
UI-Project/src/views/MechanicalArm/mechanicalArm.vue
@@ -219,7 +219,7 @@
<template>
  <div ref="content" style="padding:0 20px;">
    <div id="div-title" style="font-size: 20px; font-weight: bold; margin:10px 0 10px 0;padding-left: 20px;">
      {{$t('machine.mechanicalArm')}}
      {{$t('machine.upperSlice')}}
    </div>
    <hr />
    <br>
@@ -257,9 +257,29 @@
    </div>
    <div id="main-body" 
      style="width: 45%; height: 400px;;background-image: url(../../src/assets/上片机.png) ;background-size: 100% 100%;">
      style="width: 45%; height: 400px;margin: 50px 0 0 50px;background-image: url(../../src/assets/上片机.png) ;background-size: 100% 100%;">
      <!-- 画图内容 -->
      <div style="width: 200px; height: 100px; background-color: red; position: relative; top: 271px; left: 158px">
        <div style="width: 500px; height: 300px; position: relative; top: -250PX; left: 800px">
          <el-table :data="loadData" stripe
        :header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
        :cell-style="{ textAlign: 'center' }">
        <!-- <el-table-column type="selection" min-width="30" /> -->
        <el-table-column type="index" :label="$t('glassInfo.number')" min-width="55" />
        <el-table-column prop="batchNumber" :label="$t('glassInfo.batchNumber')"/>
        <el-table-column prop="taskType" :label="$t('glassInfo.taskType')"/>
        <el-table-column prop="glassId" :label="$t('glassInfo.glassId')" />
        <el-table-column prop="length" :label="$t('glassInfo.length')" min-width="55"/>
        <el-table-column prop="width" :label="$t('glassInfo.width')" min-width="55"/>
        <el-table-column prop="thickness" :label="$t('glassInfo.thickness')"/>
        <el-table-column prop="workState" :label="$t('glassInfo.workState')"/>
        <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="100">
          <template #default="scope">
            <el-button size="mini" style="min-width: 100px;" link type="primary" plain @click="workStatus(scope.row, '绑定')" >{{$t('functionState.bound')}}</el-button>
          </template>
        </el-table-column>
      </el-table>
        </div>
      </div>
    </div>
  </div>