Shan9312 hace 10 meses
padre
commit
170cfebb09

+ 2 - 0
src/lang/en/langModule/selectList.js

@@ -5,5 +5,7 @@ export default{
   干奶牛:"Dry Cows",
   围产牛:"Transition Cows",
    其他:"Others",
+  已完成:"Finished",
+    
    
 }

+ 5 - 0
src/lang/zn/langModule/selectList.js

@@ -5,5 +5,10 @@ export default{
   干奶牛:"干奶牛",
   围产牛:"围产牛",
    其他:"其他",
+   已完成:"已完成",
+   全部:"全部",
+   最好的模版:"最好的模版",
+   无类别:"无类别",
    
+
 }

+ 8 - 7
src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -28,7 +28,7 @@
         <el-input-number :controls="false" :precision="2" v-model="hlzq2" :placeholder="$t('processAnalysis.hlzq')" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
       </div>
       <el-select v-model="table.getdataListParm.parammaps.fclassid" :placeholder="$t('processAnalysis.fclassid')" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in cixCategoryList" :key="item.id" :label="menusTitle(item.fcname)" :value="item.id" />
+        <el-option v-for="item in cixCategoryList" :key="item.id" :label="menusTitle('processAnalysis.',item.fcname)" :value="item.id" />
       </el-select>
       <div style="display: inline-block;" class="filter-item1">
         <el-input-number :controls="false" :precision="2" v-model="slwc1" :placeholder="$t('processAnalysis.slwc')" style="width: 120px;" class="filter-item" clearable />
@@ -330,7 +330,7 @@
       <el-col v-if="isSpreadingPlanSH" :span="16">
         <div class="title">
           <b>{{$t('processAnalysis.processdel')}}</b>
-          <span>&nbsp;({{ title }})</span>
+          <span>&nbsp;({{title}})</span>
         </div>
         <div class="detail">
           <div v-if="table2.list.length !== 0">
@@ -342,8 +342,8 @@
             <span>{{$t('processAnalysis.proesstime1')}}</span>
           </div>
           <div v-if="table2.list.length !== 0">
-            <b>{{ table2.list[0].iscompleted }}</b>
-            <span>{{$t('processAnalysis.workStatus')}}</span>
+            <b>{{   menusTitle('selectList.',table2.list[0].iscompleted )}}</b>
+            <span>{{$t('processAnalysis.workStatus') }}</span>
           </div>
           <div v-if="table2.list.length !== 0">
             <b>{{ table2.list[0].Hdif }}kg</b>
@@ -743,12 +743,13 @@ export default {
   },
   methods: {
     // CixCategoryList 根据后端返回的中文展示英文
-    menusTitle(item) {
-      if (this.$te('processAnalysis.' + item)) {
-      return this.$t('processAnalysis.' + item)
+    menusTitle(val,item) {
+      if (this.$t(val + item)) {
+      return this.$t(val + item)
       }
       return item
     },
+    
     change_date(e){
       console.log(e)
       this.getDownList()