修改

target/classes/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

ys_int/src/i18n/lang/en.js

@@ -134,6 +134,7 @@ const lang = {
         moldState: "Mold State",
         remove: "Installation is removed",
         temperature: "Temperature",
+        initialModulus: "Accumulative Open Frequency",
 	},
 	// 项目管理
     project: {
@@ -404,7 +405,8 @@ 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",
+        "文件未找到，请联系管理员": "The file was not found, please contact the administrator",
+        "此文件暂不支持在线预览操作": "This file does not support online preview operations at this time.",
     },
     ...locale
 }

ys_int/src/i18n/lang/zh.js

@@ -134,6 +134,7 @@ const lang = {
         moldState: "模具状态",
         remove: "安装被拆",
         temperature: "温度",
+        initialModulus: "累计开合次数",
 	},
 	// 项目管理
     project: {

ys_int/src/main.js

@@ -55,25 +55,24 @@ router.beforeEach((to, from, next) => {
         } else {
             if(user){
                 for(var i in routes){
-                    if(routes[i].name == navigation.base && user.parentId != 0){//基础管理
+                    if(routes[i].name == "navigation.base" && user.parentId != 0){//基础管理
                         routes[i].hidden = true
-                    } else if(routes[i].name == navigation.base){//基础管理
+                    } else if(routes[i].name == "navigation.base"){//基础管理
                         routes[i].hidden = false
                     }
-                    
-                    if(routes[i].name == navigation.pro && user.parentId > 1){//项目管理
+                    if(routes[i].name == "navigation.pro" && user.parentId > 1){//项目管理
                         var children = routes[i].children;
                         for(var j in children){
     
-                            if(children[j].name == navigation.staff){//人员管理
+                            if(children[j].name == "navigation.staff"){//人员管理
                                 if(user.isManager == 0){
                                     children[j].hidden = true
                                 } else {
                                     children[j].hidden = false
                                 }
                             }
-    
-                            if(children[j].name == navigation.power){//权限管理
+                            
+                            if(children[j].name == "navigation.power"){//权限管理
                                 if(user.isManager == 0){
                                     children[j].hidden = true
                                 } else {
@@ -81,14 +80,13 @@ router.beforeEach((to, from, next) => {
                                 }
                             }
                         }
-                    } else if(routes[i].name == navigation.pro) {//项目管理
+                    } else if(routes[i].name == "navigation.pro") {//项目管理
                         var children = routes[i].children;
                         for(var j in children){
                             if(children[j].name != "项目详情"){
                                 children[j].hidden = false
                             }
-                            
-                            if(children[j].name == navigation.power){//权限管理
+                            if(children[j].name == "navigation.power"){//权限管理
                                 if((user.parentId == 0 || user.parentId == 1) && user.isManager == 0){
                                     children[j].hidden = true
                                 }

ys_int/src/views/base/allocation.vue

@@ -63,10 +63,10 @@
             <el-table-column prop="diffTime" :label="$t('basic.diffTime')" width="100" align="center" sortable>
                 <template slot-scope="scope">{{scope.row.diffTime}}</template>
             </el-table-column>
-            <el-table-column prop="modelName" :label="$t('mold.modelName')" sortable></el-table-column>
+            <el-table-column prop="modelName" :label="$t('mold.modelName')" width="180" sortable></el-table-column>
             <el-table-column prop="modelNo" :label="$t('mold.moldNo')" width="120" align="center" sortable></el-table-column>
-            <el-table-column prop="companyName" :label="$t('basic.compName')" sortable></el-table-column>
-            <el-table-column prop="agent" :label="$t('basic.agent')" width="120" sortable></el-table-column>
+            <el-table-column prop="companyName" :label="$t('basic.compName')" width="300" sortable></el-table-column>
+            <el-table-column prop="agent" :label="$t('basic.agent')" width="300" sortable></el-table-column>
             <el-table-column :label="$t('basic.equipmentState')" align="center" width="120" sortable>
                 <template slot-scope="scope">
                     <span v-if="scope.row.isUse == 0">{{$t('basic.state0')}}</span>

ys_int/src/views/base/comp.vue

@@ -25,7 +25,7 @@
                     <router-link to="/staff" tag="span" style="cursor: pointer; color: #409eff;">{{scope.row.administrator}}</router-link>
                 </template>
             </el-table-column>
-            <el-table-column prop="relateCompanyList" :label="$t('basic.assProducer')" width="400" sortable>
+            <el-table-column prop="relateCompanyList" :label="$t('basic.assProducer')" sortable>
                 <template slot-scope="scope">
                     <span class="info" v-for="(item, index) in scope.row.relateCompanyList">
                         {{item.companyName}}

ys_int/src/views/base/factory.vue

@@ -24,7 +24,7 @@
                     <router-link to="/staff" tag="span" style="cursor: pointer; color: #409eff;">{{scope.row.administrator}}</router-link>
                 </template>
             </el-table-column>
-            <el-table-column prop="relateCompanyList" :label="$t('basic.proAsset')" width="400" sortable>
+            <el-table-column prop="relateCompanyList" :label="$t('basic.proAsset')" sortable>
                 <template slot-scope="scope">
                     <span class="info" v-for="(item, index) in scope.row.relateCompanyList">
                         {{item.companyName}}

ys_int/src/views/detection/detection.vue

@@ -23,18 +23,23 @@
         <!--列表-->
         <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="$t('mold.moldNo')" width="100" sortable></el-table-column>
-            <el-table-column :label="$t('mold.modelName')" width="200" sortable>
+            <el-table-column prop="modelNo" :label="$t('mold.moldNo')" width="150" sortable></el-table-column>
+            <el-table-column :label="$t('mold.modelName')" width="230" sortable>
                 <template slot-scope="scope">
-                    <a style="color: #409EFF; cursor: pointer" @click="toMould(scope.row.id)">{{scope.row.modelName}}</a>
+                    <a style="color: #409EFF; cursor: pointer" @click="toMould(scope.row.id)">{{scope.row.modelName}} {{scope.row.rfid}}</a>
                 </template>
             </el-table-column>
-            <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column>
+            <!-- <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column> -->
+            <el-table-column prop="equipmentNo" label="CCID" width="180" sortable></el-table-column>
             <el-table-column prop="equipmentName" :label="$t('basic.proNum')" width="180" sortable></el-table-column>
             <el-table-column prop="projectName" :label="$t('mold.projectName')" width="200" sortable></el-table-column>
-            <el-table-column prop="produceCompany" :label="$t('mold.factoryName')" width="200" sortable></el-table-column>
-            <el-table-column prop="area" :label="$t('mold.area')" width="200" sortable></el-table-column>
-            <el-table-column prop="runTimes" :label="$t('mold.runTimes')" align="center" width="100" sortable></el-table-column>
+            <el-table-column prop="produceCompany" :label="$t('mold.factoryName')" width="300" sortable></el-table-column>
+            <el-table-column prop="area" :label="$t('mold.area')" width="300" sortable></el-table-column>
+            <el-table-column prop="runTimes" :label="$t('mold.runTimes')" align="center" width="100" sortable>
+                <template slot-scope="scope">
+                    {{scope.row.runTimes.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}
+                </template>
+            </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>
                 <template slot-scope="scope">{{scope.row.hillNumber}}<span v-if="scope.row.hillNumber">%</span></template>
@@ -42,7 +47,10 @@
             <el-table-column prop="temperature" :label="$t('runTest.temperature')" align="center" width="80" sortable>
                 <template slot-scope="scope">{{scope.row.temperature}}<span v-if="scope.row.temperature">℃</span></template>
             </el-table-column>
-            <el-table-column prop="lastOpenTime" :label="$t('runTest.lastOpenTime')" align="center" width="150" sortable></el-table-column>
+            <el-table-column prop="lastOpenTime" :label="$t('runTest.lastOpenTime')" align="center" width="180" sortable></el-table-column>
+            <el-table-column prop="initialModulus" :label="$t('runTest.initialModulus')" align="center" width="180" sortable>
+                <template slot-scope="scope">{{(parseInt(scope.row.initialModulus) + parseInt(scope.row.runTimes)).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}次</template>
+            </el-table-column>
             <el-table-column :label="$t('runTest.moldState')" align="center" width="100" sortable>
                 <template slot-scope="scope">
                     <span v-if="scope.row.state == 0">{{$t('base.static')}}</span>

ys_int/src/views/detection/maintenance.vue

@@ -491,7 +491,7 @@
                                 data: []
                             },
                             yAxis: {
-                                name: this.$t('runTest.frequency') + '（‰）',
+                                name: this.$t('runTest.frequency') ,//+ '（‰）'
                                 type: 'value'
                             },
                             dataZoom: [{
@@ -523,6 +523,14 @@
                                                 color: "#009ad6" //改变折线颜色
                                             } 
                                         } 
+                                    },
+                                    label: {
+                                        normal: {
+                                            show: true,
+                                            formatter: function(p){
+                                                return p.value.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+                                            }
+                                        }
                                     }
                                 }
                             ]

ys_int/src/views/mold/moldDetail.vue

@@ -45,11 +45,11 @@
                 </el-col> -->
                 <el-col :span="6" class="detail">
                     {{$t('mold.initial')}}：
-                    <span class="info">{{moldDetail.initialModulus}}</span>
+                    <span class="info">{{moldDetail.initialModulus.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}</span>
                 </el-col>
                 <el-col :span="6" class="detail">
                     {{$t('mold.life')}}：
-                    <span class="info">{{moldDetail.settingLife}}</span>
+                    <span class="info">{{moldDetail.settingLife.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}</span>
                 </el-col>
                 <el-col :span="6" class="detail">
                     {{$t('mold.rfid')}}：
@@ -188,7 +188,11 @@
                             <el-table-column type="index" width="40"></el-table-column>
                             <el-table-column prop="partNo" :label="$t('mold.partNo')" width="150" sortable></el-table-column>
                             <el-table-column prop="partName" :label="$t('mold.partName')" sortable></el-table-column>
-                            <el-table-column prop="partLife" :label="$t('mold.partLife')" align="center" width="100" sortable></el-table-column>
+                            <el-table-column prop="partLife" :label="$t('mold.partLife')" align="center" width="100" sortable>
+                                <template slot-scope="scope">
+                                    {{scope.row.partLife.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}
+                                </template>
+                            </el-table-column>
                             <el-table-column prop="isVulnerable" :label="$t('runTest.vulnerable')" align="center" width="100" sortable>
                                 <template slot-scope="scope">{{scope.row.isVulnerable==0?$t('mold.no'):$t('mold.yes')}}</template>
                             </el-table-column>

ys_int/src/views/mold/moldList.vue

@@ -33,23 +33,32 @@
         <!--列表-->
         <el-table :data="molds" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
             <el-table-column type="index" width="40"></el-table-column>
-            <el-table-column prop="modelName" :label="$t('mold.modelName')" width="140" sortable>
+            <el-table-column prop="modelName" :label="$t('mold.modelName')" width="180" sortable>
                 <template slot-scope="scope">
-                    <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.modelName}}</el-link>
+                    <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.modelName}} {{scope.row.rfid}}</el-link>
                 </template>
             </el-table-column>
-            <el-table-column prop="modelNo" :label="$t('mold.moldNo')" width="120" sortable></el-table-column>
-            <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column>
-            <el-table-column prop="equipmentName" :label="$t('basic.proNum')" width="180" sortable></el-table-column>
+            <el-table-column prop="modelNo" :label="$t('mold.moldNo')" align="center" width="120" sortable></el-table-column>
+            <!-- <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column> -->
+            <el-table-column prop="equipmentNo" label="CCID" align="center" width="180" sortable></el-table-column>
+            <el-table-column prop="equipmentName" :label="$t('basic.proNum')" align="center" width="180" sortable></el-table-column>
             <!-- <el-table-column prop="hillNumber" :label="$t('mold.hillNumber')" align="center" width="100" sortable></el-table-column>
             <el-table-column prop="diffTime" :label="$t('basic.diffTime')" align="center" width="100" sortable></el-table-column> -->
             <el-table-column prop="projectName" :label="$t('mold.projectName')" width="140" sortable></el-table-column>
             <el-table-column prop="companyName" :label="$t('mold.factoryName1')" width="300" sortable></el-table-column>
-            <el-table-column prop="produceCompany" :label="$t('mold.factoryName')" width="200" sortable></el-table-column>
-            <el-table-column prop="initialModulus" :label="$t('mold.initial')" width="100" align="center" sortable></el-table-column>
-            <el-table-column prop="settingLife" :label="$t('mold.life')" width="100" align="center" sortable></el-table-column>
+            <el-table-column prop="produceCompany" :label="$t('mold.factoryName')" width="300" sortable></el-table-column>
+            <el-table-column prop="initialModulus" :label="$t('mold.initial')" width="100" align="center" sortable>
+                <template slot-scope="scope">
+                    {{scope.row.initialModulus.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}
+                </template>
+            </el-table-column>
+            <el-table-column prop="settingLife" :label="$t('mold.life')" width="100" align="center" sortable>
+                <template slot-scope="scope">
+                    {{scope.row.settingLife.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')}}
+                </template>
+            </el-table-column>
             <el-table-column prop="holes" :label="$t('mold.hole')" width="100" align="center" sortable></el-table-column>
-            <el-table-column prop="rfid" :label="$t('mold.rfid')" width="120" align="center" sortable></el-table-column>
+            <!-- <el-table-column prop="rfid" :label="$t('mold.rfid')" width="120" align="center" sortable></el-table-column> -->
             <el-table-column :label="$t('runTest.state')" width="100" align="center" sortable>
                 <template slot-scope="scope">
                     <span v-if="scope.row.state == 1" style="color:#00CD66;">{{$t('base.run')}}</span>

ys_int/src/views/project/project.vue

@@ -26,11 +26,11 @@
 			</el-table-column>
             <el-table-column prop="ownerCompanyName" :label="$t('project.assName')" sortable>
 			</el-table-column>
-            <el-table-column prop="customCompaniesStr" :label="$t('project.cusName')" width="450">
+            <el-table-column prop="customCompaniesStr" :label="$t('project.cusName')" sortable>
 			</el-table-column>
             <el-table-column prop="manager" :label="$t('project.manager')" width="100" align="center" sortable>
 			</el-table-column>
-			<el-table-column prop="indate" :label="$t('project.indate')" width="250" align="center" sortable>
+			<el-table-column prop="indate" :label="$t('project.indate')" width="200" align="center" sortable>
 			</el-table-column>
 			<!-- <el-table-column label="操作" width="250" align="center">
 				<template slot-scope="scope">

ys_int/src/views/project/staff.vue

@@ -37,7 +37,7 @@
 			<el-table-column prop="username" :label="$t('project.name')" width="120" sortable></el-table-column>
 			<el-table-column prop="account" :label="$t('project.mobile')" width="180" sortable></el-table-column>
 			<!-- <el-table-column prop="mobile" label="联系方式" width="150" sortable></el-table-column> -->
-            <el-table-column prop="projects" :label="$t('project.partake')" sortable>
+            <el-table-column prop="projects" :label="$t('project.partake')" width="300">
                 <template slot-scope="scope">
                     <span class="info" v-for="(item, index) in scope.row.projects">
                         {{item.projectName}}
@@ -47,7 +47,7 @@
 			</el-table-column>
             <el-table-column prop="roleName" :label="$t('project.remark')" width="180" sortable></el-table-column>
             <el-table-column prop="teamName" :label="$t('project.type')" width="120" align="center" sortable></el-table-column>
-			<el-table-column prop="companyName" :label="$t('project.company')" sortable></el-table-column>
+			<el-table-column prop="companyName" :label="$t('project.company')" width="300" sortable></el-table-column>
 			<el-table-column :label="$t('base.operate')" align="left" width="230">
 				<template slot-scope="scope" v-if="user.id == scope.row.parentId || user.isManager == 1 || (user.parentId == 1 && user.subordinateType == 0)">
 					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">{{$t('base.edit')}}</el-button>