Bläddra i källkod

修改前端页面展现

oyq28 3 år sedan
förälder
incheckning
adea9a4e2a

+ 3 - 1
imcs-ui/src/lang/zh/dispatch.js

@@ -8,7 +8,7 @@ export default {
         // 列表搜索表单名称
         searchForm: {
             name: '指令名称',
-            feedback: '异常内容',
+            feedback: '异常内容',            
             type: '分类',
             status: '状态',
             startTime: '开始时间',
@@ -18,6 +18,8 @@ export default {
             record: {
                 name: '指令名称',
                 device: '设备',
+                nodeNo: '指令内容',
+                procedureName: '工序名',
                 status: '启用状态',
                 createTime: '创建时间',
                 updateTime: '修改时间',

+ 2 - 2
imcs-ui/src/views/login/index.vue

@@ -215,7 +215,7 @@
     </el-form>
     <span class="login-footer">
       © 2019 - 2022
-      <span>{{$t('login.shuoming.tips')}}</span>
+      <span>{{$t('login.shuoming2.tips')}}</span>
     </span>
   </div>
 </template>
@@ -256,7 +256,7 @@
           {img: "microsoft.png", name: "microsoft", radius: false}
         ],
         loginForm: {
-          account: "zuihou",
+          account: "",
           password: "",   // zuihou
           tenantView: "0000", //显示用的
           tenant: "", //传递给后端的

+ 15 - 1
imcs-ui/src/views/zuihou/dispatchMgr/dispatchRecord/Index.vue

@@ -71,13 +71,27 @@
         </template>
       </el-table-column>
       
-      <el-table-column
+       <el-table-column
         prop="resourceName"
         :label="$t('dispatch.table.record.device')"
         :show-overflow-tooltip="true"
         align="center"
       ></el-table-column>
 
+      <el-table-column
+        prop="nodeNo"
+        :label="$t('dispatch.table.record.nodeNo')"
+        :show-overflow-tooltip="true"
+        align="center"
+      ></el-table-column>
+
+      <el-table-column
+        prop="procedureName"
+        :label="$t('dispatch.table.record.procedureName')"
+        :show-overflow-tooltip="true"
+        align="center"
+      ></el-table-column>          
+
       <!-- 指令内容 -->
       <el-table-column
         prop="instructionName"