运行监测修改（原版、国际化版

ys_int/src/i18n/lang/en.js

@@ -24,7 +24,8 @@ const lang = {
 		back: "Back",
 		upload: "Upload",
 		invite: "Invite",
-		state: "State",
+        state: "State",
+        motion: "Motion",
     },
     prompt: {
         success: "Modify Success",
@@ -375,6 +376,7 @@ const lang = {
 		"有新的试模验收文档上传,待您审批。": "There are new acceptance documents for the test mould are uploaded, which are waiting for your approval.",
 		"有新的零件文档上传,待您审批。": "New parts documents are uploaded for your approval.",
 		"有新的保养方案文档上传,待您审批。": "There are new maintenance plan documents uploaded for your approval.",
+		"文件未找到，请联系管理员": "The file was not found, please contact the administrator",
     },
     ...locale
 }

ys_int/src/i18n/lang/zh.js

@@ -24,7 +24,8 @@ const lang = {
 		back: "返回",
 		upload: "上传",
 		invite: "邀请",
-		state: "状态",
+        state: "状态",
+        motion: "运动",
     },
     prompt: {
         success: "修改成功",

ys_int/src/views/detection/detection.vue

@@ -36,7 +36,15 @@
             <el-table-column prop="runTimes" :label="$t('mold.runTimes')" align="center" width="100" sortable></el-table-column>
             <el-table-column prop="ocCycle" :label="$t('mold.ocCycle')" align="center" width="140" sortable></el-table-column>
             <el-table-column prop="hillNumber" :label="$t('mold.hillNumber')" align="center" width="80" sortable></el-table-column>
-            <el-table-column prop="state" :label="$t('runTest.state')" align="center" width="100" sortable></el-table-column>
+            <el-table-column :label="$t('runTest.state')" align="center" width="100" sortable>
+                <template slot-scope="scope">
+                    <span v-if="scope.row.state == 0">{{$t('base.static')}}</span>
+                    <span v-else-if="scope.row.state == 1">{{$t('base.motion')}}</span>
+                    <span v-else-if="scope.row.state == 2">{{$t('base.warning')}}</span>
+                    <span v-else-if="scope.row.state == 3">{{$t('mold.beScrapped')}}</span>
+                    <span v-else-if="scope.row.state == 4">{{$t('mold.scraped')}}</span>
+                </template>
+            </el-table-column>
             <el-table-column :label="$t('runTest.stage')" align="center" width="160">
                 <template slot-scope="scope">
                     <span v-if="scope.row.stage == 0">{{$t('runTest.stage0')}}</span>

ys_int/src/views/detection/maintenance.vue

@@ -10,29 +10,29 @@
                 <el-form-item>{{mouldName}}</el-form-item>
                 <el-form-item class="state" style="float: right;">{{$t('runTest.state')}}：
                     <span v-if="mouldState == 0">{{$t('base.static')}}</span>
-                    <span v-else-if="mouldState == 1">{{$t('base.run')}}</span>
-                    <!-- 因为目前还不知道mouldState的意义 -->
-                    <span v-else>{{$t('runTest.stage4')}}</span>
+                    <span v-else-if="mouldState == 1">{{$t('base.motion')}}</span>
+                    <span v-else-if="mouldState == 2">{{$t('base.warning')}}</span>
+                    <span v-else-if="mouldState == 3">{{$t('mold.beScrapped')}}</span>
+                    <span v-else-if="mouldState == 4">{{$t('mold.scraped')}}</span>
                 </el-form-item>
             </el-form>
         </el-col>
 
-        <!-- v-if="requirement" -->
         <!-- 模具处理 -->
         <el-col :span="24" class="title">{{$t('runTest.processMold')}}</el-col>
         <el-col :span="9" style="line-height: 32px; border-right: #c3c3c3 1px solid;">
             {{$t('runTest.nowState')}}：
             <span v-if="requirement" style="color: #ff4949;">{{$t('runTest.isMaintain0')}}</span>
             <span v-else style="color: black;">{{$t('runTest.isMaintain1')}}</span>
-            <el-button size="small" type="primary" @click="showMaintenance"   style="margin-left: 16px;">
-                <!-- v-if="!(user.parentId == 1 && user.subordinateType == 1) && requirement" -->
+            <el-button size="small" type="primary" @click="showMaintenance" style="margin-left: 16px;"
+                v-if="!(user.parentId == 1 && user.subordinateType == 1) && requirement">
                 {{$t('runTest.immediate')}}
             </el-button>
         </el-col>
         <el-col :span="8" :offset="1" style="line-height: 32px;">
             {{$t('runTest.stage')}}：{{warningInfo}}
-            <el-button size="small" type="primary"  @click="warningFormVisible = true" style="margin-left: 16px;">
-                <!-- v-if="!(user.parentId == 1 && user.subordinateType == 1) && stage != 0" -->
+            <el-button size="small" type="primary"  @click="warningFormVisible = true" style="margin-left: 16px;"
+                v-if="!(user.parentId == 1 && user.subordinateType == 1) && stage != 0">
                 {{$t('runTest.immediate')}}
             </el-button>
         </el-col>

ys_vue/src/views/detection/detection.vue

@@ -1,86 +1,85 @@
 <template>
-  <section>
-    <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true" :model="filters">
-        <el-col :span="2">
-          <el-form-item>
-            <el-select v-model="filters.value" placeholder="请选择查询条件">
-              <el-option label="编号" value="0"></el-option>
-              <el-option label="名称" value="1"></el-option>
-            </el-select>
-          </el-form-item>
+    <section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+            <el-form :inline="true" :model="filters">
+                <el-col :span="2">
+                    <el-form-item>
+                        <el-select v-model="filters.value" placeholder="请选择查询条件">
+                        <el-option label="编号" value="0"></el-option>
+                        <el-option label="名称" value="1"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-form-item>
+                    <el-input v-model="filters.name" placeholder="请输入关键字进行搜索" style="width: 300px;" clearable></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="getMoulds(filters.name)">查询</el-button>
+                </el-form-item>
+            </el-form>
         </el-col>
-        <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入关键字进行搜索" style="width: 300px;" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="getMoulds(filters.name)">查询</el-button>
-        </el-form-item>
-      </el-form>
-    </el-col>
 
-    <!--列表-->
-    <el-table
-      :data="moulds"
-      :height="tableHeight"
-      highlight-current-row
-      v-loading="listLoading"
-      style="width: 100%;"
-    >
-      <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
-      <el-table-column label="模具名称" width="200" sortable>
-        <template slot-scope="scope">
-          <a
-            style="color: #409EFF; cursor: pointer"
-            @click="toMould(scope.row.id)"
-          >{{scope.row.modelName}}</a>
-        </template>
-      </el-table-column>
-      <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
-      <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
-      <el-table-column prop="factoryName" label="制造工厂" width="200" sortable></el-table-column>
-      <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
-      <el-table-column prop="runTimes" label="运行次数" align="center" width="100" sortable></el-table-column>
-      <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
-      <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
-      <el-table-column prop="state" label="当前状态" align="center" width="100" sortable></el-table-column>
-      <el-table-column label="云模盒报警" align="center" width="160">
-          <template slot-scope="scope">
-          <span v-if="scope.row.stage == 0">正常</span>
-          <span v-else-if="scope.row.stage == 1">温度过高</span>
-          <span v-else-if="scope.row.stage == 2">电量过低</span>
-          <span v-else-if="scope.row.stage == 3">温度过高、电量过低</span>
-          <span v-else>不明</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="模具保养" align="center" width="100">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isMaintain == 1">需要</span>
-          <span v-else>正常</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="处理" align="center" width="85">
-        <template slot-scope="scope">
-          <el-button size="small" type="primary" @click="toMaintenance(scope.row.id)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <!--列表-->
+        <el-table :data="moulds" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
+            <el-table-column type="index" width="60"></el-table-column>
+            <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
+            <el-table-column label="模具名称" width="200" sortable>
+                <template slot-scope="scope">
+                    <a style="color: #409EFF; cursor: pointer" @click="toMould(scope.row.id)">{{scope.row.modelName}}</a>
+                </template>
+            </el-table-column>
+            <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
+            <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
+            <el-table-column prop="factoryName" label="制造工厂" width="200" sortable></el-table-column>
+            <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
+            <el-table-column prop="runTimes" label="运行次数" align="center" width="100" sortable></el-table-column>
+            <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
+            <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
+            <el-table-column label="当前状态" align="center" width="100" sortable>
+                <template slot-scope="scope">
+                    <span v-if="scope.row.state == 0">静止</span>
+                    <span v-else-if="scope.row.state == 1">运动</span>
+                    <span v-else-if="scope.row.state == 2">告警</span>
+                    <span v-else-if="scope.row.state == 3">待报废</span>
+                    <span v-else-if="scope.row.state == 4">已报废</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="云模盒报警" align="center" width="160">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.stage == 0">正常</span>
+                    <span v-else-if="scope.row.stage == 1">温度过高</span>
+                    <span v-else-if="scope.row.stage == 2">电量过低</span>
+                    <span v-else-if="scope.row.stage == 3">温度过高、电量过低</span>
+                    <span v-else>不明</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="模具保养" align="center" width="100">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.isMaintain == 1">需要</span>
+                    <span v-else>正常</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="处理" align="center" width="85">
+                <template slot-scope="scope">
+                    <el-button size="small" type="primary" @click="toMaintenance(scope.row.id)">详情</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <!--工具条-->
-    <el-col :span="24" class="toolbar">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[20 , 50 , 80 , 100 , 200]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-        style="float:right;"
-      ></el-pagination>
-    </el-col>
-  </section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar">
+            <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :page-sizes="[20 , 50 , 80 , 100 , 200]"
+                :page-size="20"
+                layout="total, sizes, prev, pager, next"
+                :total="total"
+                style="float:right;"
+            ></el-pagination>
+        </el-col>
+    </section>
 </template>
 
 <script>

ys_vue/src/views/detection/maintenance.vue

@@ -10,31 +10,27 @@
                 <el-form-item>{{mouldName}}</el-form-item>
                 <el-form-item class="state" style="float: right;">当前状态：
                     <span v-if="mouldState == 0">静止</span>
-                    <span v-else-if="mouldState == 1">运行</span>
-                    <!-- 因为目前还不知道mouldState的意义 -->
-                    <span v-else>不明</span>
+                    <span v-else-if="mouldState == 1">运动</span>
+                    <span v-else-if="mouldState == 2">告警</span>
+                    <span v-else-if="mouldState == 3">待报废</span>
+                    <span v-else-if="mouldState == 4">已报废</span>
                 </el-form-item>
             </el-form>
         </el-col>
-        <!-- v-if="requirement" -->
         <!-- 模具处理 -->
         <el-col :span="24" class="title">模具处理</el-col>
         <el-col :span="6" style="line-height: 32px; border-right: #c3c3c3 1px solid;">
             当前保养状态：
             <span v-if="requirement" style="color: #ff4949;">需要</span>
             <span v-else style="color: black;">正常</span>
-            <el-button size="small" type="primary" 
-                @click="showMaintenance" 
-                v-if="!(user.parentId == 1 && user.subordinateType == 1) && requirement" style="margin-left: 16px;">
-                立即处理
+            <el-button size="small" type="primary" @click="showMaintenance" style="margin-left: 16px;"
+                v-if="!(user.parentId == 1 && user.subordinateType == 1) && requirement">立即处理
             </el-button>
         </el-col>
         <el-col :span="8" :offset="2" style="line-height: 32px;">
             云模盒告警：{{warningInfo}}
-            <el-button size="small" type="primary"
-                v-if="!(user.parentId == 1 && user.subordinateType == 1) && stage != 0"
-                @click="warningFormVisible = true" style="margin-left: 16px;">
-                立即处理
+            <el-button size="small" type="primary" @click="warningFormVisible = true" style="margin-left: 16px;"
+                v-if="!(user.parentId == 1 && user.subordinateType == 1) && stage != 0">立即处理
             </el-button>
         </el-col>