设备程序

imcs-ui/src/lang/zh/resource.js

@@ -212,7 +212,7 @@ export default {
 				toolNums: '刀具数量',
 				version: '版本',
 				status: '状态',
-				updateTime: '更新时间'
+        synTime: '同步时间'
 			},
 			// 【程序中心-新增-刀具】列表table字段名称
 			programTool: {

imcs-ui/src/views/zuihou/resourceProductMgr/equipmentProgramMgr/Index.vue

@@ -135,23 +135,22 @@
 	      </template>
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-      <el-table-column prop="no" :label='$t("resource.table.program.no")' :show-overflow-tooltip="true"></el-table-column>
+<!--      <el-table-column prop="no" :label='$t("resource.table.program.no")' :show-overflow-tooltip="true"></el-table-column>-->
       <el-table-column prop="name" :label='$t("resource.table.program.name")' width="180px"></el-table-column>
       <el-table-column prop="runTime" :label='$t("resource.table.program.runTime")' width="180px"></el-table-column>
       <el-table-column prop="size" :label='$t("resource.table.program.size")' width="180px"></el-table-column>
-      <el-table-column prop="toolNums" :label='$t("resource.table.program.toolNums")' width="180px"></el-table-column>
-      <el-table-column prop="version" :label='$t("resource.table.program.version")' width="180px"></el-table-column>
-      <el-table-column prop="status" :label='$t("resource.table.program.status")' align="center" width="90px">
-      	<template slot-scope="{ row }">
-          <el-tag :type="row.status=='1' ? 'success' : 'danger'">
-          	{{ row.status=='1' ? $t("common.show") : $t("common.hide") }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="updateTime" :label='$t("resource.table.program.updateTime")' width="180px"></el-table-column>
+<!--      <el-table-column prop="toolNums" :label='$t("resource.table.program.toolNums")' width="180px"></el-table-column>-->
+<!--      <el-table-column prop="version" :label='$t("resource.table.program.version")' width="180px"></el-table-column>-->
+<!--      <el-table-column prop="status" :label='$t("resource.table.program.status")' align="center" width="90px">-->
+<!--      	<template slot-scope="{ row }">-->
+<!--          <el-tag :type="row.status=='1' ? 'success' : 'danger'">-->
+<!--          	{{ row.status=='1' ? $t("common.show") : $t("common.hide") }}-->
+<!--          </el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column prop="synTime" :label='$t("resource.table.program.synTime")' width="180px"></el-table-column>
       <el-table-column
         :label="$t('table.operation')"
-        fixed="right"
         align="center"
         column-key="operation"
         width="120px"

imcs-ui/src/views/zuihou/resourceProductMgr/equipmentProgramMgr/components/Upload.vue

@@ -13,9 +13,8 @@
         <el-input v-model="tenant.no"  readonly="readonly" />
       </el-form-item>
       <el-form-item :label='$t("resource.form.pgUpload")+"："' prop="filePath">
-        <el-input v-model="tenant.filePath" :readOnly="true" :placeholder='$t("common.pleaseEnter")'/>
+        <el-input v-model="tenant.filePath"  :placeholder='$t("common.pleaseEnter")'/>
         <el-upload
-          accept=".txt"
           class="upload-demo"
           :headers="headers"
           :action="action"
@@ -34,7 +33,29 @@
           <div slot="tip" class="el-upload__tip">{{$t("resource.tips.fileTips")}}</div>
         </el-upload>
       </el-form-item>
-
+      <el-form-item :label='$t("resource.form.pgTime")+"："' prop="runTime">
+        <el-input v-model="tenant.runTime" :readOnly="true" :placeholder='$t("common.pleaseEnter")'/>
+      </el-form-item>
+      <el-form-item :label='$t("resource.form.pgSize")+"："' prop="size">
+        <el-input v-model="tenant.size" :readOnly="true" :placeholder='$t("common.pleaseEnter")' style="width: 85%;" />
+        <span style="margin-left: 20px;">B(Bytes)</span>
+      </el-form-item>
+      <el-form-item :label='$t("resource.form.pgContent")+"："' prop="pgContent">
+        <el-input v-model="pgContent" :readOnly="true" type="textarea" :rows="5" style="width: 100%;"/>
+      </el-form-item>
+<!--      <div>-->
+<!--        <h2 class="editTitle">刀具</h2>-->
+<!--        <el-table-->
+<!--          :data="toolList"-->
+<!--          style="width: 100%"-->
+<!--        >-->
+<!--          <el-table-column prop="specification" :label='$t("resource.table.programTool.specification")'></el-table-column>-->
+<!--          <el-table-column prop="model" :label='$t("resource.table.programTool.model")'></el-table-column>-->
+<!--          <el-table-column prop="brand" :label='$t("resource.table.programTool.brand")'></el-table-column>-->
+<!--          <el-table-column prop="usageTime" :label='$t("resource.table.programTool.usageTime")'></el-table-column>-->
+<!--          <el-table-column prop="duration" :label='$t("resource.table.programTool.duration")'></el-table-column>-->
+<!--        </el-table>-->
+<!--      </div>-->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
@@ -90,12 +111,7 @@
       */],
         roles: [],
         rules: {
-          filePath: [
-            { required: true, message: this.$t("rules.require"), trigger: 'blur' }
-          ],
-          version: [
-            { required: true, message: this.$t("rules.require"), trigger: 'blur' }
-          ]
+
         }
       }
     },
@@ -170,6 +186,7 @@
       },
       initTenant () {
         return {
+          resourceId:null,
           id: '',
           no: '',
           name: '',
@@ -203,6 +220,7 @@
           this.tenant = { ...val }
           //赋值
           this.tenant.no = val.name
+          this.tenant.resourceId = val.id
           // 如果附件存在 /
           if(!!val.filePath){
             let arr = val.filePath.split("/");
@@ -234,11 +252,7 @@
           // return false
           if (valid) {
             this.confirmDisabled = true
-            if (this.type === 'add') {
-              this.save()
-            } else {
-              this.update()
-            }
+            this.save()
           } else {
             return false
           }