标准参数

src/components/index.vue

@@ -303,7 +303,8 @@
                 class="elTable table-fixed"
                 height="400px"
               >
-                <el-table-column label="粪便筛" min-width="60px" align="center" prop="barname" />
+                <el-table-column
+:label="$t('supplier.fbs')" min-width="60px" align="center" prop="barname" />
                 <el-table-column :label="$t('feedingEfficiency.dczl1')"min-width="60px" align="center" prop="oneweight" />
                 <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="60px" align="center" prop="onerate" />
                 <el-table-column :label="$t('feedingEfficiency.dczl2')" min-width="60px" align="center" prop="twoweight" />

src/lang/en/langModule/supplier.js

@@ -0,0 +1,41 @@
+export default {
+
+
+gysmz: "Supplier Name",
+  gysbh: "Supplier Code",
+  yes: "Yes",
+  no: "No",
+  lxr: "Contact Person",
+  lxfs: "Contact Method",
+  zf1: "1-32 Characters",
+  zf2: "1-8 Digits",
+  zf3: "1-255 Characters",
+  zf4: "11 Digits",
+
+   //
+   name1: "Condition and Manure Scoring Standards",
+   name2: "Pennsylvania Sieve and Manure Sieve Standard Range",
+   tkpfbz: "Body Condition Scoring Standards",
+   tkpfbz1: "Body Condition Scoring Standards (Score)",
+   sjly: "Data Source",
+   fbpfbz: "Manure Scoring Standards",
+   fbpfbz1: "Manure Scoring Standards (Score)",
+   scfl: "Livestock Parent Category:",
+   sczl: "Livestock Subcategory:",
+   bzsy1: "Pennsylvania Sieve First Layer (%)",
+   bzsy2: "Pennsylvania Sieve Second Layer (%)",
+   bzsy3: "Pennsylvania Sieve Third Layer (%)",
+   bzsy4: "Pennsylvania Sieve Fourth Layer (%)",
+   fbs: "Manure Sieve",
+   fbsy1: "Manure Sieve First Layer (%)",
+   fbsy2: "Manure Sieve Second Layer (%)",
+   fbsy3: "Manure Sieve Third Layer (%)",
+   pfmc: "Formula Name:",
+   bzs: "Pennsylvania Sieve",
+   zxz: "Min Value",
+  zdz:"Max Value"
+
+
+
+
+}

src/lang/zn/langModule/supplier.js

@@ -0,0 +1,45 @@
+export default {
+
+  gysmz:"供应商名称",
+  gysbh:"供应商编号",
+  yes:"是",
+  no:"否",
+  lxr:"联系人",
+  lxfs:"联系方式",
+  zf1:"1-32个字符",
+  zf2:"1-8位数字",
+  zf3:"1-255个字符",
+  zf4:"11位数字",
+  //
+ name1:"体况、粪便评分标准",
+ name2:"宾州筛、粪便筛标准范围",
+ tkpfbz:"体况评分标准",
+tkpfbz1:"体况评分标准（分）",
+sjly:"数据来源",
+fbpfbz:"粪便评分标准",
+fbpfbz1:"粪便评分标准（分）",
+ scfl:"牲畜父类：",
+sczl:"牲畜子类：",
+bzsy1:"宾州筛一层（%）",
+bzsy2:"宾州筛二层（%）",
+bzsy3:"宾州筛三层（%）",
+bzsy4:"宾州筛四层（%）",
+fbs:"粪便筛",
+fbsy1:"粪便筛一层（%）",
+fbsy2:"粪便筛二层（%）",
+fbsy3:"粪便筛三层（%）",
+ pfmc:"配方名称：",
+ bzs:"宾州筛",
+ zxz:"最小值",
+ zdz:"最大值"
+
+
+
+
+
+
+
+
+
+
+}

src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -139,17 +139,24 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
-      planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
-      isSupplementList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用补料
-      isLeftoverMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用剩料
+      planBeforeDayList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取前一天计划
+      planNextDayList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取后一天计划
+      isSupplementList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用补料
+      isLeftoverMaterialList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用剩料
       decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+      isLockBullsList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
       waterConditioningList: [{ id: '0', name: '青贮' }, { id: '1', name: '总日粮饲喂量' }, { id: '2', name: '不处理' }], // 水分调节选项
-      priceCalculationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用库存管理
+      priceCalculationList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用库存管理
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
-      feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
+      feedontractList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料合同
       leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '剩料分配' }],
       requestParams: [
         { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}

src/views/basicData/defaultParameter/function/index.vue

@@ -240,20 +240,28 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
-      planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
-      isSupplementList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用补料
-      isLeftoverMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用剩料
+      planBeforeDayList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取前一天计划
+      planNextDayList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取后一天计划
+      isSupplementList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用补料
+      isLeftoverMaterialList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用剩料
       decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+      isLockBullsList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' },{ id: '4', name: '5' },{ id: '5', name: '6' }], // 班次数量
-      feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
+      feedontractList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料合同
       leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '剩料分配' }],
       weightDecimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }, { id: '4', name: '四位小数' }], // 重量小数点位数
       rateDecimalPlacesList:  [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }],//比例小数点位数
-      smallMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 小料是否称量
-      dataSynchronizationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用数据同步
+      smallMaterialList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 小料是否称量
+      dataSynchronizationList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用数据同步
       accuracyList: [{ id: '1', name: '排除允许误差准确率' }, { id: '0', name: '不排除允许误差准确率' }],  //混料准确率
       yhautosecondList:[{ id: '1', name: '禁用' }, { id: '2', name: '3秒' }, { id: '3', name: '6秒' }, { id: '4', name: '9秒' }],  //预混跳转延时
       requestParams: [

src/views/basicData/defaultParameter/index2.vue

@@ -139,17 +139,24 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
-      planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
-      isSupplementList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用补料
-      isLeftoverMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用剩料
+      planBeforeDayList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取前一天计划
+      planNextDayList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取后一天计划
+      isSupplementList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用补料
+      isLeftoverMaterialList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用剩料
       decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+      isLockBullsList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
       waterConditioningList: [{ id: '0', name: '青贮' }, { id: '1', name: '总日粮饲喂量' }, { id: '2', name: '不处理' }], // 水分调节选项
-      priceCalculationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用库存管理
+      priceCalculationList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用库存管理
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
-      feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
+      feedontractList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料合同
       leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '平均分配' }],
       requestParams: [
         { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}

src/views/basicData/driver/index.vue

@@ -39,13 +39,15 @@
         <el-table-column :label="$t('driver.drivercode')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('driver.drivername')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.drivername }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.drivername" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.drivername"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('formulationEvaluation.sfqy')" min-width="110px" align="center">

src/views/basicData/equipmentTMR/index.vue

@@ -40,7 +40,8 @@
         <el-table-column  :label="$t('performance.tmrsbbh')"  min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.eqcode }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.eqcode" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.eqcode"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('performance.tmrsbmc')" min-width="110px" align="center">
@@ -174,7 +175,8 @@ export default {
         { name: 'getDictByName3', offset: 0, pagecount: 0, params: ['数据接口'] }
       ],
       typeList: [], // TMR设备类型
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否启用
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
       jumpDelayList: [], // 跳转延时
       dataInterfaceList: [], // 数据接口
       getAppoints:{

src/views/basicData/feedClassification/index.vue

@@ -100,7 +100,8 @@ export default {
       requestParams: [
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['饲料大类'] }
       ],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }],
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
       feedCategoryList: [],
 
       table: {

src/views/basicData/feedTable/index.vue

@@ -830,15 +830,18 @@ export default {
       requestParams2: {
         name: 'getSysoptEnable', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), inforname: 'isSmallMaterial' }
       },
-      enableList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用
+      enableList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用
       feedSourcesList: [{ id: '0', name: '系统内置' }, { id: '1', name: '用户自定义' }], // 饲料来源
       confirmStartList: [{ id: '0', name: '禁用' }, { id: '1', name: '启用' }], // 确认开始
-      associationStatusList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 关联状态
+      associationStatusList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 关联状态
       jumpDelayList: [], // 跳转延时
       feedTypeList: [], // 饲料分类
       planTypeList: [], // 计划类型
       smallMaterialList: [], // 小料秤
-      jmpList: [{ id: '0', name: '否' }, { id: '1', name: '是' }], // 无上域
+      jmpList: [{ id: '0', name: '否' }, { id: '1',
+name:this.$t('supplier.yes')}], // 无上域
       materialtypeList:[],//物料类型
       sapGoodsList:[],//sap货位
       sapCodeList:[],//sap编码

src/views/basicData/forkliftManagement/index.vue

@@ -47,7 +47,8 @@
           <el-table-column :label="$t('driver.sbcode')" min-width="110px" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.Code }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.Code" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:80%;padding:10px 0;" />
+              <el-input v-if="scope.row.Edit" v-model="scope.row.Code"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:80%;padding:10px 0;" />
             </template>
           </el-table-column>
           <el-table-column :label="$t('driver.sbname')" min-width="110px" align="center">

src/views/basicData/groupColumn/index.vue

@@ -71,7 +71,8 @@
         <el-table-column :label="$t('driver.lsbh')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.bcode }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.bcode" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.bcode"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('driver.yxwcs')" min-width="150px" align="center">
@@ -198,7 +199,8 @@ export default {
         { name: 'getScopeherd', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} },
         { name: 'getCattleorder', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} }
       ],
-      enableList: [{ id: '1', name: '是' }, { id: '0', name: '否' }],
+      enableList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }],
       jumpDelayList: [],
       barClassList:[],
       scopeherdList:[],

src/views/basicData/livestockCategory/index.vue

@@ -55,7 +55,8 @@
           <el-table-column :label="$t('driver.scflcode')" min-width="200px" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.classcode }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.classcode" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:0 10px;" />
+              <el-input v-if="scope.row.Edit" v-model="scope.row.classcode"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:0 10px;" />
             </template>
           </el-table-column>
           <el-table-column :label="$t('formulationEvaluation.sfqy')" min-width="110px" align="center">
@@ -101,7 +102,8 @@ export default {
       requestParams: [
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['牲畜父类'] }
       ],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }],
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
       parentList: [],
 
       table: {

src/views/basicData/managementGPS/index.vue

@@ -39,7 +39,8 @@
           <el-table-column label="GPS编号" min-width="110px" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.NoEdit">{{ scope.row.gpsCode }}</span>
-              <el-input v-if="scope.row.Edit" v-model="scope.row.gpsCode" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:80%;padding:10px 0;" />
+              <el-input v-if="scope.row.Edit" v-model="scope.row.gpsCode"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:80%;padding:10px 0;" />
             </template>
           </el-table-column>
           <el-table-column label="GPS名称" min-width="110px" align="center">
@@ -102,7 +103,8 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }],
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
       associatedDevicesList: [{ id: 0, name: '设备001', name2: '00123', name3: '铲车' }, { id: 1, name: '设备002', name2: '00124', name3: '铲车' }, { id: 2, name: '设备003', name2: '00125', name3: '铲车' }],
 
       getDownListParm: {

src/views/basicData/standardParameters/index.vue

@@ -25,7 +25,8 @@
       </el-dropdown>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="体况、粪便评分标准" name="first">
+      <el-tab-pane
+:label="$t('supplier.name1')" name="first">
         <div class="table1">
           <el-table
             :key="table1.tableKey"
@@ -46,25 +47,31 @@
                 <span>{{ scope.row.ftname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="体况评分标准" align="center" min-width="300px">
-              <el-table-column label="体况评分标准（分）" min-width="80px" align="center">
+            <el-table-column
+:label="$t('supplier.tkpfbz')" align="center" min-width="300px">
+              <el-table-column
+:label="$t('supplier.tkpfbz1')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bodystandard }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="数据来源" min-width="80px" align="center">
+              <el-table-column
+:label="$t('supplier.sjly')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bodysource }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
-            <el-table-column label="粪便评分标准" align="center" min-width="300px">
-              <el-table-column label="粪便评分标准（分）" min-width="80px" align="center">
+            <el-table-column
+:label="$t('supplier.fbpfbz')"align="center" min-width="300px">
+              <el-table-column
+:label="$t('supplier.fbpfbz1')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.dungstandard }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="数据来源" min-width="80px" align="center">
+              <el-table-column
+:label="$t('supplier.sjly')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.dungsource }}</span>
                 </template>
@@ -79,7 +86,8 @@
           <span v-if="table1.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ table1.total }}{{$t('processAnalysis.tiao')}}</span>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="宾州筛、粪便筛标准范围" name="second">
+      <el-tab-pane
+:label="$t('supplier.name2')" name="second">
 
         <div class="table2">
           <el-table
@@ -102,56 +110,61 @@
                   <span>{{ scope.row.parentname }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="牲畜子类" min-width="80px" align="center">
+              <el-table-column
+:label="$t('supplier.sczl')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.cowname }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
             <el-table-column :label="$t('feedingEfficiency.bzs')" align="center" min-width="200px">
-              <el-table-column label="宾州筛一层（%）" min-width="80px" align="center">
+              <el-table-column
+:label="$t('supplier.bzsy1')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bzonemin }} - {{ scope.row.bzonemax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="宾州筛二层（%）" min-width="80px" align="center">
+              <el-table-column :label="$t('supplier.bzsy2')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bztwomin }} - {{ scope.row.bztwomax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="宾州筛三层（%）" min-width="80px" align="center">
+              <el-table-column :label="$t('supplier.bzsy3')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bzthreemin }} - {{ scope.row.bzthreemax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="宾州筛四层（%）" min-width="80px" align="center">
+              <el-table-column :label="$t('supplier.bzsy4')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bzfourmin }} - {{ scope.row.bzfourmax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="数据来源" min-width="80px" align="center">
+              <el-table-column
+:label="$t('supplier.sjly')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.bzsource }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
-            <el-table-column label="粪便筛" align="center" min-width="300px">
-              <el-table-column label="粪便筛一层（%）" min-width="80px" align="center">
+            <el-table-column
+:label="$t('supplier.fbs')" align="center" min-width="300px">
+              <el-table-column :label="$t('supplier.fbsy1')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.fbonemin }} - {{ scope.row.fbonemax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="粪便筛二层（%）" min-width="80px" align="center">
+              <el-table-column :label="$t('supplier.fbsy2')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.fbtwomin }} - {{ scope.row.fbtwomax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="粪便筛三层（%）" min-width="80px" align="center">
+              <el-table-column :label="$t('supplier.fbsy3')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.fbthreemin }} - {{ scope.row.fbthreemax }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="数据来源" min-width="80px" align="center">
+              <el-table-column
+:label="$t('supplier.sjly')" min-width="80px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.fbsource }}</span>
                 </template>
@@ -191,46 +204,52 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="配方名称：" prop="ftname">
+              <el-form-item
+:label="$t('supplier.pfmc')" prop="ftname">
                 <span>{{ table1.temp.ftname }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <h3 style="width: 160px;float: left;">体况评分标准</h3>
+              <h3 style="width: 160px;float: left;">{{$t('supplier.tkpfbz')}}</h3>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="体况评分标准（分）:" prop="bodystandard">
-                <el-select v-model="table1.temp.bodystandard" filterable placeholder="评分标准" class="filter-item" style="width: 100%;">
+              <el-form-item
+              :label="$t('supplier.tkpfbz1')" prop="bodystandard">
+                <el-select v-model="table1.temp.bodystandard" filterable :placeholder="$t('supplier.tkpfbz1')" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in physicalList" :key="item.value" :label="item.label" :value="item.label" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="数据来源：" prop="bodysource">
-                <el-input v-model="table1.temp.bodysource" type="textarea" placeholder="1-255字符":autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
+              <el-form-item
+:label="$t('supplier.sjly')" prop="bodysource">
+                <el-input v-model="table1.temp.bodysource" type="textarea"
+:placeholder="$t('supplier.zf3')":autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <h3 style="width: 160px;float: left;">粪便评分标准</h3>
+              <h3 style="width: 160px;float: left;">{{ $t('supplier.fbpfbz') }}</h3>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="粪便评分标准（分）:" prop="dungstandard">
-                <el-select v-model="table1.temp.dungstandard" filterable placeholder="粪便评分标准" class="filter-item" style="width: 100%;">
+              <el-form-item :label="$t('supplier.fbpfbz1')" prop="dungstandard">
+                <el-select v-model="table1.temp.dungstandard" filterable :placeholder="$t('supplier.fbpfbz1')" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in faecesList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="数据来源：" prop="dungsource">
-                <el-input v-model="table1.temp.dungsource" type="textarea" placeholder="1-255字符" :autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
+              <el-form-item
+:label="$t('supplier.sjly')" prop="dungsource">
+                <el-input v-model="table1.temp.dungsource" type="textarea"
+:placeholder="$t('supplier.zf3')" :autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -265,92 +284,111 @@
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="牲畜父类：" prop="parentname">
+              <el-form-item
+:label="$t('supplier.scfl')"prop="parentname">
                 <span>{{ table2.temp.parentname }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="牲畜子类：" prop="cowname">
+              <el-form-item
+:label="$t('supplier.sczl')" prop="cowname">
                 <span>{{ table2.temp.cowname }}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <h3 style="width: 160px;float: left;">宾州筛</h3>
+              <h3 style="width: 160px;float: left;">{{$t('supplier.bzs')}}</h3>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="宾州筛一层（%）:">
-                <el-input-number v-model="table2.temp.bzonemin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item
+:label="$t('supplier.bzsy1')">
+                <el-input-number v-model="table2.temp.bzonemin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.bzonemax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.bzonemax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="宾州筛二层（%）:">
-                <el-input-number v-model="table2.temp.bztwomin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item :label="$t('supplier.bzsy2')">
+                <el-input-number v-model="table2.temp.bztwomin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.bztwomax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.bztwomax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="宾州筛三层（%）:">
-                <el-input-number v-model="table2.temp.bzthreemin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item :label="$t('supplier.bzsy3')">
+                <el-input-number v-model="table2.temp.bzthreemin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.bzthreemax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.bzthreemax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="宾州筛四层（%）:">
-                <el-input-number v-model="table2.temp.bzfourmin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item :label="$t('supplier.bzsy4')">
+                <el-input-number v-model="table2.temp.bzfourmin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.bzfourmax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.bzfourmax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="数据来源：" prop="bzsource">
-                <el-input v-model="table2.temp.bzsource" type="textarea" placeholder="1-255字符" :autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
+              <el-form-item :label="$t('supplier.sjly')" prop="bzsource">
+                <el-input v-model="table2.temp.bzsource" type="textarea"
+:placeholder="$t('supplier.zf3')" :autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <h3 style="width: 160px;float: left;">粪便筛</h3>
+              <h3 style="width: 160px;float: left;">{{$t('supplier.fbs')}}</h3>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="粪便筛一层（%）:">
-                <el-input-number v-model="table2.temp.fbonemin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item :label="$t('supplier.fbsy1')">
+                <el-input-number v-model="table2.temp.fbonemin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.fbonemax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.fbonemax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="粪便筛二层（%）:">
-                <el-input-number v-model="table2.temp.fbtwomin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item :label="$t('supplier.fbsy2')">
+                <el-input-number v-model="table2.temp.fbtwomin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.fbtwomax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.fbtwomax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="10">
-              <el-form-item label="粪便筛三层（%）:">
-                <el-input-number v-model="table2.temp.fbthreemin" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最小值" />
+              <el-form-item :label="$t('supplier.fbsy3')">
+                <el-input-number v-model="table2.temp.fbthreemin" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zxz')" />
                 <span style="width: 1%;">——</span>
-                <el-input-number v-model="table2.temp.fbthreemax" :min="0" :max="100" :controls="false" style="width:44%;" placeholder="最大值" />
+                <el-input-number v-model="table2.temp.fbthreemax" :min="0" :max="100" :controls="false" style="width:44%;"
+:placeholder="$t('supplier.zdz')" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="数据来源：" prop="fbsource">
-                <el-input v-model="table2.temp.fbsource" type="textarea" placeholder="1-255字符" :autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
+              <el-form-item :label="$t('supplier.sjly')" prop="fbsource">
+                <el-input v-model="table2.temp.fbsource" type="textarea"
+:placeholder="$t('supplier.zf3')" :autosize="{ minRows: 1, maxRows: 4}" style="width:100%;" maxlength="255" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/basicData/supplier/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-input v-model="table.getdataListParm.parammaps.providerName" placeholder="供应商名称" style="width: 180px;" class="filter-item" clearable />
-      <el-input v-model="table.getdataListParm.parammaps.providerNumber" placeholder="供应商编号" style="width: 180px;" class="filter-item" clearable />
+      <el-input v-model="table.getdataListParm.parammaps.providerName" :placeholder="$t('supplier.gysmz')" style="width: 180px;" class="filter-item" clearable />
+      <el-input v-model="table.getdataListParm.parammaps.providerNumber" :placeholder="$t('supplier.gysbh')" style="width: 180px;" class="filter-item" clearable />
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable :placeholder="$t('formulationEvaluation.sfqy')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
@@ -36,34 +36,40 @@
             <span v-else>1</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商名称" min-width="150px" align="center">
+        <el-table-column :label="$t('supplier.gysmz')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.providerName }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.providerName" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.providerName"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="供应商编号" min-width="150px" align="center">
+        <el-table-column :label="$t('supplier.gysbh')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.providerNumber }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.providerNumber" placeholder="1-8位数字" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="8" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.providerNumber"
+:placeholder="$t('supplier.zf2')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="8" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="联系人" min-width="150px" align="center">
+        <el-table-column
+:label="$t('supplier.lxr')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.linkman }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.linkman" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.linkman"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="联系方式" min-width="150px" align="center">
+        <el-table-column
+:label="$t('supplier.lxfs')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.telphone }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.telphone" placeholder="11位数字" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="11" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.telphone"
+:placeholder="$t('supplier.zf4')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="11" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('formulationEvaluation.remark')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.remark" placeholder="1-255个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.remark" :placeholder="$t('supplier.zf3')"  type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column :label="$t('formulationEvaluation.sfqy')" min-width="110px" align="center">
@@ -104,7 +110,8 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否启用
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
 
       table: {
         getdataListParm: {

src/views/inventoryManagement/laborConsumption/index.vue

@@ -160,12 +160,14 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.createTemp.remark" class="filter-item" placeholder="1-255字符" type="text" :disabled="create.dialogStatus==='see'" />
+                <el-input ref="remark" v-model="create.createTemp.remark" class="filter-item"
+:placeholder="$t('supplier.zf3')" type="text" :disabled="create.dialogStatus==='see'" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('performance.czr')" prop="createemp">
-                <el-input ref="createemp" v-model="create.createTemp.createemp" class="filter-item" placeholder="1-255字符" type="text" disabled />
+                <el-input ref="createemp" v-model="create.createTemp.createemp" class="filter-item"
+:placeholder="$t('supplier.zf3')" type="text" disabled />
               </el-form-item>
             </el-col>
           </el-row>

src/views/inventoryManagement/systemConsumption/index.vue

@@ -86,7 +86,8 @@
         <el-table-column :label="$t('formulationEvaluation.remark')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.remark" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.remark"
+:placeholder="$t('supplier.zf1')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column label="是否审核" min-width="100px" align="center">
@@ -123,7 +124,8 @@ export default {
 
       livestockTypeList: [], // 牲畜类别
       feedNameList: [{ id: 0, name: '羊草' }, { id: 1, name: '小苏打' }], // 饲料名称
-      isAuditList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否审核
+      isAuditList: [{ id: '1',
+name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否审核
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['牲畜父类'] }

src/views/inventoryManagement/warehousing/index.vue

@@ -247,7 +247,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="备注:" prop="remark">
-                <el-input ref="remark" v-model="create.createTemp.remark" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="1-255字符" type="text" />
+                <el-input ref="remark" v-model="create.createTemp.remark" :disabled="create.dialogStatus=='see'" class="filter-item"
+:placeholder="$t('supplier.zf3')" type="text" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/shedProduction/dungScores/index.vue

@@ -217,7 +217,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.temp.remark" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" placeholder="1-255字符" maxlength="255" class="filter-item" style="width: 100%;" />
+                <el-input ref="remark" v-model="create.temp.remark" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}"
+:placeholder="$t('supplier.zf3')" maxlength="255" class="filter-item" style="width: 100%;" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/shedProduction/fecalScreen/index.vue

@@ -191,7 +191,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.temp.remark" class="filter-item" placeholder="1-255字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width: 100%;" />
+                <el-input ref="remark" v-model="create.temp.remark" class="filter-item"
+:placeholder="$t('supplier.zf3')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width: 100%;" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -220,7 +220,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.temp.remark" class="filter-item" placeholder="1-255字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width: 100%;" />
+                <el-input ref="remark" v-model="create.temp.remark" class="filter-item"
+:placeholder="$t('supplier.zf3')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width: 100%;" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/shedProduction/physicalConditionScore/index.vue

@@ -239,7 +239,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.temp.remark" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" placeholder="1-255字符" maxlength="255" class="filter-item" style="width: 100%;" />
+                <el-input ref="remark" v-model="create.temp.remark" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}"
+:placeholder="$t('supplier.zf3')" maxlength="255" class="filter-item" style="width: 100%;" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/statisticalAnalysis/feedingEfficiency/group/tab2.vue

@@ -56,7 +56,8 @@
             class="elTable table-fixed"
             height="400px"
           >
-            <el-table-column label="粪便筛" min-width="70px" align="center" prop="barname" />
+            <el-table-column
+:label="$t('supplier.fbs')" min-width="70px" align="center" prop="barname" />
             <el-table-column :label="$t('feedingEfficiency.dczl1')"min-width="58px" align="center" prop="oneweight" />
             <el-table-column :label="$t('feedingEfficiency.dcbfb1')"min-width="58px" align="center" prop="onerate" />
             <el-table-column :label="$t('feedingEfficiency.dczl2')" min-width="58px" align="center" prop="twoweight" />

src/views/systemManagement/customboard2/ChartPanel2/index.vue

@@ -1,898 +1,899 @@
-<template>
-  <div class="app-container">
-
-    <!-- <el-dialog
-        v-dialogDrag
-        ref="dialog__wrapper">
-        <div class="dialog-body">
-            
-            <div 
-                class="line"
-                v-dialogDrag Width="$refs.dialog__wrapper">1111111111111111111</div>
-        </div>
-    </el-dialog> -->
-    
-
-    <el-row :gutter="20">
-      <el-col :span="18">
-
-
-<!-- <draggable v-model="arr1" group="itxst"   animation="300" :group="{name: 'dashboard',pull: true}">
-                    <transition-group>
-                        <div style = "width:300px;height:20px;border:1px soild #333" :class="item.id==1?'item forbid':'item'" v-for="item in arr1"  key="1">{{item.name}}</div>
-                    </transition-group>
-                </draggable> -->
-
-
-
-        <div class="search">
-          
-          <el-select v-model="tableObj.getDataParameters.parammaps.dateType" placeholder="查询日期" @change="change_date_type">
-            <el-option  v-for="item in dateTypeList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-          </el-select>
-      
-          <el-select v-model="tableObj.getDataParameters.parammaps.type" filterable placeholder="数据类型" class="filter-item" style="width: 120px;" clearable>
-            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-          <el-select v-model="tableObj.getDataParameters.parammaps.dimension" @change="change_dimension" filterable placeholder="维度" class="filter-item" style="width: 120px;"  >
-            <el-option v-for="item in dimensionList"   :key="item.id" :label="item.name" :value="item.id" />
-          </el-select> 
-
-          <!-- <el-select v-model="tableObj.getDataParameters.parammaps.mixture" multiple placeholder="混料数据">
-            <el-option  v-for="item in mixtureList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-          </el-select>
-
-          <el-select v-model="tableObj.getDataParameters.parammaps.spread" multiple placeholder="撒料数据">
-            <el-option  v-for="item in spreadList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-          </el-select> -->
-
- 
-          <el-cascader style = "width:400px;" ref = "cascader1" v-model="tableObj.getDataParameters.parammaps.mixture" :options="mixtureList" :props = "{ multiple: true, emitPath: false,}"   :show-all-levels="false" @change="change_cascader1"></el-cascader>
-
-
-          <el-cascader style = "width:400px;" ref = "cascader2" v-model="tableObj.getDataParameters.parammaps.spread" :options="spreadList" :props = "{ multiple: true, emitPath: false,}"   :show-all-levels="false" @change="change_cascader2"></el-cascader>
- 
-
- 
-
-          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
-          <el-button class="successBorder" @click="form_clear">{{$t('common.reset')}}</el-button>
-        </div>
-        <div class="operation">
-          <el-button class="success" icon="el-icon-plus" @click="form_add_screening">添加筛选条件</el-button>
-          <el-button   class="danger" icon="el-icon-delete" @click="form_clear_screening">清空筛选条件</el-button>
-        </div>
-
-        <div v-if="screeningVisible">
-           <div class="search">
-     
-        
-            <el-select v-model="screeningObj.screeningCondition" filterable placeholder="筛选条件" class="filter-item" style="width: 120px;" clearable  @change="change_screening">
-              <el-option v-for="item in screeningList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-
-            <el-input v-model="screeningObj.screeningField" placeholder="筛选字段" style="width: 180px;" class="filter-item" clearable />
- 
-
-            <el-select v-model="screeningObj.screeningField" placeholder="筛选字段">
-              <el-option  v-for="item in screeningFieldList1" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-            </el-select>
-
-            <el-select v-model="screeningObj.screeningField" placeholder="筛选字段">
-              <el-option  v-for="item in screeningFieldList2" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-            </el-select>
-
-
-            <el-date-picker v-model="screeningObj.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
-        
-
-
-
-            <el-button class="successBorder" @click="form_search_screening">{{$t('common.query')}}</el-button>
-             <el-button class="successBorder" @click="form_cancel_screening">{{$t('common.reset')}}</el-button> 
-          </div>
-
-          <div>
-            <el-row :gutter="20">
-                <el-col :span="6"  v-for = "(item,index) in screeningArr">
-                  <span style="font-size:14px;color:#555">{{index+1}}、条件：{{item.txt}}</span>
-                  
-                </el-col>
-            </el-row>
-                        
-          </div>
-      
-        </div>
-
-  
-        <ChartTable/>
-
-        <div>
-          <!-- <div style = "">
-            <el-select v-model="tableObj.getDataParameters.parammaps.dateType" multiple placeholder="维度">
-              <el-option  v-for="item in fieldTypeList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
-            </el-select>
-          </div> -->
-          
-        <BarChart v-if = "chartData.chartType == 'bar'"   :chart-data="chartData" />
-        <LineChart v-if = "chartData.chartType == 'line'"   :chart-data="chartData" />
-        <HorizontalBarChart v-if = "chartData.chartType == 'horizontal_bar'"   :chart-data="chartData" />
-        <PieChart v-if = "chartData.chartType == 'pie'"   :chart-data="chartData" />
-        <LineBarChart v-if = "chartData.chartType == 'line_bar'"   :chart-data="chartData" />
-
-          <!-- <div id="chartLine" style="width:100%;height:385px;" >
-
-          </div> -->
-        </div>
-        
-
-      </el-col>
-      <el-col :span="6">
-        
-          <div  class="chart-style-panel">
-            <el-form label-position="top" size="mini">
-              <el-form-item  label="图表类型">
-                <div class="chart-type-list">
-             
-
-                  <span  @click="switch_chart_type(item)" v-for="item in chartTypeList" style = "display:inline-block;height:30px;width:30px;margin-right:10px;margin-bottom:10px">
-                    <el-tooltip  :content="item.desc" placement="top">
-                      <svg-icon class="icon"  style="height:20px;width:20px" :icon-class="item.isUse? item.icon : (item.icon + '_disabled')" />   
-                    </el-tooltip>
-                  </span>
- 
-
-                </div>
-              </el-form-item>
-            </el-form>
-          </div>
-
-      </el-col>
-    </el-row>
-
-
-    
-  </div>
-
-</template>
-
-<script>
-import echarts from 'echarts'
-import draggable from 'vuedraggable'
-
-import ChartTable from '@/componentChart/ChartTable.vue'
-import LineChart from '@/componentChart/LineChart.vue'
-import BarChart from '@/componentChart/BarChart.vue'
-import HorizontalBarChart from '@/componentChart/HorizontalBarChart.vue'
-import PieChart from '@/componentChart/PieChart.vue'
-import LineBarChart from '@/componentChart/LineBarChart.vue'
-
-require('echarts/theme/macarons')
-import { GetDataByName, PostDataByName, failproccess, ExecDataByConfig, checkButtons } from '@/api/common'
-import Cookies from 'js-cookie'
-import Pagination from '@/components/Pagination'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'ChartPanel2',
-  components: { Pagination, draggable , ChartTable ,LineChart,BarChart ,HorizontalBarChart, PieChart, LineBarChart},
-  data() {
-    return {
-      
-      chartType:'line',
-      chartTypeList:[
-          // {type:'table', desc:"表格：任意维度数据" ,icon:'chart_table',isUse:true,id:0}, 
-          {type:'line', desc:"折线图：任意维度数据" ,icon:'chart_line',isUse:false,id:0}, 
-          {type:'bar', desc:"柱状图：任意维度数据" ,icon:'chart_bar',isUse:false,id:1}, 
-          {type:'horizontal_bar', desc:"条形图：任意维度数据" ,icon:'horizontal_bar',isUse:false,id:2}, 
-          {type:'pie', desc:"饼图：任意维度数据" ,icon:'chart_pie',isUse:false,id:3}, 
-          {type:'line_bar', desc:"线柱图：任意维度数据" ,icon:'linebar_chart',isUse:false,id:4}, 
-      ],
-  
- 
- 
-      isRoleEdit: [],
-
-      dateTypeList: [
-        { id: '汇总', name: '汇总' }, 
-        { id: '分日', name: '分日' }
-      ],
-      typeList: [
-        { id: '车次', name: this.$t('errorAnalysis.projname') }, 
-        { id: '栏舍', name: '栏舍' }
-      ],
-
-      dimensionList: [
-        { id: '栏舍', name: '栏舍' }, 
-        { id: '配方', name: '配方' }, 
-        { id: '班次', name: '班次' }, 
-        { id: '车次', name: this.$t('errorAnalysis.projname') }, 
-        { id: 'TMR', name: 'TMR' }, 
-        { id: '牲畜大类', name: '牲畜大类' }, 
-        { id: '牲畜小类', name: '牲畜小类' }
-      ],
-
-
-      //混料数据
-      mixtureList: [],
-      //撒料数据
-      spreadList: [],
-
-      //车次 - 数据1 - 栏舍 - 理论重量、实际重量、误差值、允许误差数、准确率（平均）、是否超出误差
-      mixtureSpreadArr1: [
-        { 
-          value: '理论重量',label: '理论重量',
-          children: [
-            { value: '理论重量-合计', label: '理论重量-合计'}, 
-            { value: '理论重量-平均', label: '理论重量-平均'}, 
-            { value: '理论重量-最大值', label: '理论重量-最大值'}, 
-            { value: '理论重量-最小值', label: '理论重量-最小值'}, 
-            { value: '理论重量-标准差', label: '理论重量-标准差'}, 
-            { value: '理论重量-变异系数', label: '理论重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '实际重量',label: '实际重量',
-          children: [
-            { value: '实际重量-合计', label: '实际重量-合计'}, 
-            { value: '实际重量-平均', label: '实际重量-平均'}, 
-            { value: '实际重量-最大值', label: '实际重量-最大值'}, 
-            { value: '实际重量-最小值', label: '实际重量-最小值'}, 
-            { value: '实际重量-标准差', label: '实际重量-标准差'}, 
-            { value: '实际重量-变异系数', label: '实际重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '误差值',label: '误差值',
-          children: [
-            { value: '误差值-合计', label: '误差值-合计'}, 
-            { value: '误差值-平均', label: '误差值-平均'}, 
-            { value: '误差值-最大值', label: '误差值-最大值'}, 
-            { value: '误差值-最小值', label: '误差值-最小值'}, 
-            { value: '误差值-标准差', label: '误差值-标准差'}, 
-            { value: '误差值-变异系数', label: '误差值-变异系数'}, 
-          ]
-        },
-        {  
-          value: '允许误差数',label: '允许误差数',
-          children: [
-            { value: '允许误差数-合计', label: '允许误差数-合计'}, 
-            { value: '允许误差数-平均', label: '允许误差数-平均'}, 
-            { value: '允许误差数-最大值', label: '允许误差数-最大值'}, 
-            { value: '允许误差数-最小值', label: '允许误差数-最小值'}, 
-            { value: '允许误差数-标准差', label: '允许误差数-标准差'}, 
-            { value: '允许误差数-变异系数', label: '允许误差数-变异系数'}, 
-          ]
-        },
-        { value: '准确率-平均',label: '准确率-平均'},
-        { value: '是否超出误差',label: '是否超出误差'}
-      ],
-      //车次 - 数据2 - 配方 - 理论重量、实际重量、误差值、准确率（平均）
-      mixtureSpreadArr2: [
-        { 
-          value: '理论重量',label: '理论重量',
-          children: [
-            { value: '理论重量-合计', label: '理论重量-合计'}, 
-            { value: '理论重量-平均', label: '理论重量-平均'}, 
-            { value: '理论重量-最大值', label: '理论重量-最大值'}, 
-            { value: '理论重量-最小值', label: '理论重量-最小值'}, 
-            { value: '理论重量-标准差', label: '理论重量-标准差'}, 
-            { value: '理论重量-变异系数', label: '理论重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '实际重量',label: '实际重量',
-          children: [
-            { value: '实际重量-合计', label: '实际重量-合计'}, 
-            { value: '实际重量-平均', label: '实际重量-平均'}, 
-            { value: '实际重量-最大值', label: '实际重量-最大值'}, 
-            { value: '实际重量-最小值', label: '实际重量-最小值'}, 
-            { value: '实际重量-标准差', label: '实际重量-标准差'}, 
-            { value: '实际重量-变异系数', label: '实际重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '误差值',label: '误差值',
-          children: [
-            { value: '误差值-合计', label: '误差值-合计'}, 
-            { value: '误差值-平均', label: '误差值-平均'}, 
-            { value: '误差值-最大值', label: '误差值-最大值'}, 
-            { value: '误差值-最小值', label: '误差值-最小值'}, 
-            { value: '误差值-标准差', label: '误差值-标准差'}, 
-            { value: '误差值-变异系数', label: '误差值-变异系数'}, 
-          ]
-        },
-        { value: '准确率-平均',label: '准确率-平均'} 
-      ],
-      //车次 - 数据3 - 班次 - 理论重量、实际重量、误差值、准确率（平均）、开始重量、结束重量
-      mixtureSpreadArr3: [
-        { 
-          value: '理论重量',label: '理论重量',
-          children: [
-            { value: '理论重量-合计', label: '理论重量-合计'}, 
-            { value: '理论重量-平均', label: '理论重量-平均'}, 
-            { value: '理论重量-最大值', label: '理论重量-最大值'}, 
-            { value: '理论重量-最小值', label: '理论重量-最小值'}, 
-            { value: '理论重量-标准差', label: '理论重量-标准差'}, 
-            { value: '理论重量-变异系数', label: '理论重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '实际重量',label: '实际重量',
-          children: [
-            { value: '实际重量-合计', label: '实际重量-合计'}, 
-            { value: '实际重量-平均', label: '实际重量-平均'}, 
-            { value: '实际重量-最大值', label: '实际重量-最大值'}, 
-            { value: '实际重量-最小值', label: '实际重量-最小值'}, 
-            { value: '实际重量-标准差', label: '实际重量-标准差'}, 
-            { value: '实际重量-变异系数', label: '实际重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '误差值',label: '误差值',
-          children: [
-            { value: '误差值-合计', label: '误差值-合计'}, 
-            { value: '误差值-平均', label: '误差值-平均'}, 
-            { value: '误差值-最大值', label: '误差值-最大值'}, 
-            { value: '误差值-最小值', label: '误差值-最小值'}, 
-            { value: '误差值-标准差', label: '误差值-标准差'}, 
-            { value: '误差值-变异系数', label: '误差值-变异系数'}, 
-          ]
-        },
-        { value: '准确率-平均',label: '准确率-平均'},
-        {  
-          value: '开始重量',label: '开始重量',
-          children: [
-            { value: '开始重量-合计', label: '开始重量-合计'}, 
-            { value: '开始重量-平均', label: '开始重量-平均'}, 
-            { value: '开始重量-最大值', label: '开始重量-最大值'}, 
-            { value: '开始重量-最小值', label: '开始重量-最小值'}, 
-            { value: '开始重量-标准差', label: '开始重量-标准差'}, 
-            { value: '开始重量-变异系数', label: '开始重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '结束重量',label: '结束重量',
-          children: [
-            { value: '结束重量-合计', label: '结束重量-合计'}, 
-            { value: '结束重量-平均', label: '结束重量-平均'}, 
-            { value: '结束重量-最大值', label: '结束重量-最大值'}, 
-            { value: '结束重量-最小值', label: '结束重量-最小值'}, 
-            { value: '结束重量-标准差', label: '结束重量-标准差'}, 
-            { value: '结束重量-变异系数', label: '结束重量-变异系数'}, 
-          ]
-        }
-      ],
-      //车次 - 数据4 - 车次 - 理论重量、实际重量、误差值、准确率（平均）、跳转方式、开始重量、结束重量、计划时间、开始时间、结束时间、过程时间
-      mixtureSpreadArr4: [
-        { 
-          value: '理论重量',label: '理论重量',
-          children: [
-            { value: '理论重量-合计', label: '理论重量-合计'}, 
-            { value: '理论重量-平均', label: '理论重量-平均'}, 
-            { value: '理论重量-最大值', label: '理论重量-最大值'}, 
-            { value: '理论重量-最小值', label: '理论重量-最小值'}, 
-            { value: '理论重量-标准差', label: '理论重量-标准差'}, 
-            { value: '理论重量-变异系数', label: '理论重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '实际重量',label: '实际重量',
-          children: [
-            { value: '实际重量-合计', label: '实际重量-合计'}, 
-            { value: '实际重量-平均', label: '实际重量-平均'}, 
-            { value: '实际重量-最大值', label: '实际重量-最大值'}, 
-            { value: '实际重量-最小值', label: '实际重量-最小值'}, 
-            { value: '实际重量-标准差', label: '实际重量-标准差'}, 
-            { value: '实际重量-变异系数', label: '实际重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '误差值',label: '误差值',
-          children: [
-            { value: '误差值-合计', label: '误差值-合计'}, 
-            { value: '误差值-平均', label: '误差值-平均'}, 
-            { value: '误差值-最大值', label: '误差值-最大值'}, 
-            { value: '误差值-最小值', label: '误差值-最小值'}, 
-            { value: '误差值-标准差', label: '误差值-标准差'}, 
-            { value: '误差值-变异系数', label: '误差值-变异系数'}, 
-          ]
-        },
-        { value: '准确率-平均',label: '准确率-平均'},
-        { value: '跳转方式',label: '跳转方式'},
-        {  
-          value: '开始重量',label: '开始重量',
-          children: [
-            { value: '开始重量-合计', label: '开始重量-合计'}, 
-            { value: '开始重量-平均', label: '开始重量-平均'}, 
-            { value: '开始重量-最大值', label: '开始重量-最大值'}, 
-            { value: '开始重量-最小值', label: '开始重量-最小值'}, 
-            { value: '开始重量-标准差', label: '开始重量-标准差'}, 
-            { value: '开始重量-变异系数', label: '开始重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '结束重量',label: '结束重量',
-          children: [
-            { value: '结束重量-合计', label: '结束重量-合计'}, 
-            { value: '结束重量-平均', label: '结束重量-平均'}, 
-            { value: '结束重量-最大值', label: '结束重量-最大值'}, 
-            { value: '结束重量-最小值', label: '结束重量-最小值'}, 
-            { value: '结束重量-标准差', label: '结束重量-标准差'}, 
-            { value: '结束重量-变异系数', label: '结束重量-变异系数'}, 
-          ]
-        },
-        { value: '计划时间',label: '计划时间'},
-        { value: '开始时间',label: '开始时间'},
-        { value: '结束时间',label: '结束时间'},
-        { value: '过程时间',label: '过程时间'},
-      ],
-      //车次 - 数据5 - 牲畜大类 - 理论重量、实际重量、误差值、准确率（平均）
-      //车次 - 数据5 - 牲畜小类 - 理论重量、实际重量、误差值、准确率（平均）
-      //车次 - 数据5 - TMR - 理论重量、实际重量、误差值、准确率（平均）
-      mixtureSpreadArr5: [
-        { 
-          value: '理论重量',label: '理论重量',
-          children: [
-            { value: '理论重量-合计', label: '理论重量-合计'}, 
-            { value: '理论重量-平均', label: '理论重量-平均'}, 
-            { value: '理论重量-最大值', label: '理论重量-最大值'}, 
-            { value: '理论重量-最小值', label: '理论重量-最小值'}, 
-            { value: '理论重量-标准差', label: '理论重量-标准差'}, 
-            { value: '理论重量-变异系数', label: '理论重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '实际重量',label: '实际重量',
-          children: [
-            { value: '实际重量-合计', label: '实际重量-合计'}, 
-            { value: '实际重量-平均', label: '实际重量-平均'}, 
-            { value: '实际重量-最大值', label: '实际重量-最大值'}, 
-            { value: '实际重量-最小值', label: '实际重量-最小值'}, 
-            { value: '实际重量-标准差', label: '实际重量-标准差'}, 
-            { value: '实际重量-变异系数', label: '实际重量-变异系数'}, 
-          ]
-        },
-        {  
-          value: '误差值',label: '误差值',
-          children: [
-            { value: '误差值-合计', label: '误差值-合计'}, 
-            { value: '误差值-平均', label: '误差值-平均'}, 
-            { value: '误差值-最大值', label: '误差值-最大值'}, 
-            { value: '误差值-最小值', label: '误差值-最小值'}, 
-            { value: '误差值-标准差', label: '误差值-标准差'}, 
-            { value: '误差值-变异系数', label: '误差值-变异系数'}, 
-          ]
-        },
-        { value: '准确率-平均',label: '准确率-平均'}
-      ],
-
-      mixScreenArr:[],
-      spreadScreenArr:[],
-
-   
-      screeningVisible:true,
-      // 筛选条件
-      screeningList: [
-        // { id: '配方名称', name: '配方名称' }, 
-        // { id: 'TMR名称', name: 'TMR名称' }, 
-        // { id: '班次', name: '班次' }, 
-        // { id: '车次计划', name: '车次计划' }, 
-      ],
-
-      // 筛选条件 - 参数
-      screeningObj:{
-            screeningCondition: '',
-            screeningField: '',
-
-            inputDatetime: '',
-             startTime: '',
-             stopTime: '',
-      },
-      // 筛选条件 - 参数
-      screeningArr:[
-         
-        
-         
-      ],
-      
-
-      screeningFieldList1:[
-        { id: '是', name: '是' }, 
-        { id: '否', name: '否' }
-      ],
-      screeningFieldList2:[
-        { id: '自动', name: '自动' }, 
-        { id: '手动', name: '手动' }
-      ],
-
-
-      // 筛选条件 - 结果
-
-
- 
-      fieldTypeList: [
-        { id: '配方A', name: '配方A' }, 
-        { id: '配方B', name: '配方B' }
-      ],
-
-
-      tableObj: {
-         getDataParameters: {
-          name: 'getDriverList',
-          page: 1,
-          offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            dateType:'',
-            type: '',
-            dimension: '',
-            mixture: [],
-            spread: [],
-          }
-        },
-        tableKey: 0,
-        list: [],
-        total: 0,
-        listLoading: false,
-        temp: {}
-      },
-
-
-      chartData:{
-         chartType:null,
-        // xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-        // legendArr: ['数据1', '数据2', '数据3', '数据4', '线条1'],
-        // dataArr:[
-        //   [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-        //   [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-        //   [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-        //   [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
-        //   [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8]
-        // ]
-      },
-
-
-  
-
-
-      chartLine_data2:{
-        chartType:'pie',
-        xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-        legendArr: ['数据1', '数据2', '数据3', '数据4', '线条1'],
-        dataArr:[1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-      
-      },
-
-
-       chartLine_data3:{
-        chartType:'line_bar',
-        xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-        legendArr1: ['数据1', '数据2', '数据3', '数据4' ],
-        dataArr1:[
-          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-          [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
-        ],
-         legendArr2: ['数据5',  '线条1'],
-        dataArr2:[
-          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-        ]
-      },
-
-      requestParam: {},
-      isokDisable: false,
-      selectList: [],
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-
-    }
-  },
-
-  created() {
-    // console.log(VUE_APP_BASE_pageCount)
-    // console.log(this.VUE_APP_BASE_pageCount, 'this.VUE_APP_BASE_pageCount')
-    // this.getList()
-    // this.getButtons()
-
-    
-  },
-
-  methods: {
-
-    
-
-    getButtons() {
-      const Edit = 'Driver'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
-    },
-    getList() {
-      this.tableObj.listLoading = true
-      GetDataByName(this.tableObj.getDataParameters).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          for (let i = 0; i < response.data.list.length; i++) {
-            this.$set(response.data.list[i], 'Edit', false) // 编辑
-            this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
-            this.$set(response.data.list[i], 'isCreate', false) // 新增操作
-            this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
-            this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
-          }
-          this.tableObj.list = response.data.list
-          this.tableObj.pageNum = response.data.pageNum
-          this.tableObj.pageSize = response.data.pageSize
-          this.tableObj.total = response.data.total
-        } else {
-          this.tableObj.list = []
-        }
-        setTimeout(() => {
-          this.tableObj.listLoading = false
-        }, 100)
-      })
-    },
- 
-
-    form_search() {
-      console.log('点击了查询 - 表单 tableObj', this.tableObj.getDataParameters.parammaps)
-      // this.tableObj.getDataParameters.offset = 1
-      // this.getList()
-      console.log('点击了查询 - this.chartLine_data', this.chartLine_data)
-
- 
-     // this.roadChartLine(this.chartLine_data)
-    },
-    form_clear() {
-      console.log('点击了重置')
-      // this.tableObj.getDataParameters.parammaps.drivername = ''
-      // this.tableObj.getDataParameters.parammaps.enable = ''
-      // this.tableObj.getDataParameters.parammaps.drivercode = ''
-      // this.tableObj.getDataParameters.offset = 1
-      //this.getList() 
-    },
-
-  //查询 - 汇总/分日
-    change_date_type(value) {
-      console.log('查询日期', value)
-     
-  
-    },
-
-
-
-    //维度
-    change_dimension(value) {
-      console.log('维度', value)
-      this.tableObj.getDataParameters.parammaps.mixture = []
-      this.tableObj.getDataParameters.parammaps.spread = []
-      if(value == "栏舍"){
-        this.mixtureList = this.mixtureSpreadArr1
-        this.spreadList = this.mixtureSpreadArr1
-      } else if(value == "配方"){
-        this.mixtureList = this.mixtureSpreadArr2
-        this.spreadList = this.mixtureSpreadArr2
-      } else if(value == "班次"){
-        this.mixtureList = this.mixtureSpreadArr3
-        this.spreadList = this.mixtureSpreadArr3
-      } else if(value == "车次"){
-        this.mixtureList = this.mixtureSpreadArr4
-        this.spreadList = this.mixtureSpreadArr4
-      } else if(value == "牲畜大类" || value == "牲畜小类"  || value == "TMR"){
-        this.mixtureList = this.mixtureSpreadArr5
-        this.spreadList = this.mixtureSpreadArr5
-      }
-  
-    },
-
-    //级联选择 - 混料数据
-    change_cascader1(value) {
-      console.log('级联选择 - 混料数据', value)
-      var allNode = this.$refs['cascader1'].getCheckedNodes()
-
-      console.log("级联选择 - 混料数据的Node", allNode)
-      var mixScreenArr = []
-
- 
-        value.forEach(function(i){
-          allNode.forEach(function(j){
-            if(i == j.value){
-              mixScreenArr.push({name: "混料-"+j.label, id:j.value})
-            }
-          })
-        })
-
-      
-      // allNode.forEach(function(item){
-      //   if(item.children.length == 0){
-      //     mixScreenArr.push({name: "混料-"+item.label, id:item.value})
-      //   }
-      // })
-
-      
-      var spreadScreenArr = this.spreadScreenArr
-      this.mixScreenArr = mixScreenArr
-      this.screeningList = mixScreenArr.concat(spreadScreenArr)
-
-    },
-
-    //级联选择 - 撒料数据
-    change_cascader2(value) {
-      console.log('级联选择 - 撒料数据', value)
-      var allNode2 = this.$refs['cascader2'].getCheckedNodes()
- 
-      console.log("级联选择 - 撒料数据的Node", allNode2)
-
-      var spreadScreenArr = []
-
-       value.forEach(function(i){
-          allNode2.forEach(function(j){
-            if(i == j.value){
-              spreadScreenArr.push({name: "撒料-"+j.label, id:j.value})
-            }
-          })
-        })
-      // allNode2.forEach(function(item){
-      //   if(item.children.length == 0){
-      //     spreadScreenArr.push({name: "撒料-"+item.label, id:item.value})
-      //   }
-      // })
- 
-
-      var mixScreenArr = this.mixScreenArr
-      this.spreadScreenArr = spreadScreenArr
-      this.screeningList = mixScreenArr.concat(spreadScreenArr)
-    },
-    
-    change_screening(value) {
-      console.log('筛选', value)
-      console.log('筛选数组', this.screeningList)
-
-    },
-
-
-    handleCreate() {
-      // this.resetRequestParam()
-      // this.dialogStatus = 'create'
-      // this.parent = this.parentmenu
-      // this.screeningVisible = true
-      // this.$nextTick(() => {
-      //   this.$refs['dataForm'].clearValidate()
-      //   this.$refs.name.focus()
-      // })
-    },
-   
-    
-
-    form_search_screening() {
-      console.log('点击了筛选条件 - 确认 - screeningObj',this.screeningObj)
-      var screeningCondition = this.screeningObj.screeningCondition
-      var screeningField = this.screeningObj.screeningField
-      var txt = { txt:    screeningCondition + screeningField}
-
-      console.log(txt)
-      this.screeningArr.push(txt)
- 
-      
-
-
-      
-    },
-
-
-    form_add_screening() {
-      console.log('点击了查询')
-      this.tableObj.getDataParameters.offset = 1
-      this.getList()
-    },
-
-    form_clear_screening() {
-      console.log('点击了查询')
-      this.tableObj.getDataParameters.offset = 1
-      this.getList()
-    },
-
-    form_cancel_screening() {
-      console.log('点击了查询')
-      this.tableObj.getDataParameters.offset = 1
-      this.getList()
-    },
-
- 
-    //切换图表类型
-    switch_chart_type(item){
-      console.log(item)
-      console.log(this.chartTypeList)
-      var chartTypeList = this.chartTypeList
-      chartTypeList.forEach(function(i){
-        i.isUse = false
-      })
-      chartTypeList[item.id].isUse = true
-
-      this.chartType = item.type
-      this.chartTypeList = chartTypeList
-
-
-     if(item.type == 'line'){
-
-        this.chartData = {
-          chartType:'line',
-          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-          legendArr: ['数据1', '数据2', '数据3'],
-          dataArr:[
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-          ]
-        }
-
-      } else if(item.type == 'bar'){
-
-        this.chartData = {
-          chartType:'bar',
-          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-          legendArr: ['数据1', '数据2', '数据3'],
-          dataArr:[
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-      
-          ]
-        }
-        
-      } else if(item.type == 'horizontal_bar'){
-        this.chartData = {
-          chartType:'horizontal_bar',
-          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-          legendArr: ['数据1', '数据2', '数据3', '数据4'],
-          dataArr:[
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-      
-          ]
-        }
-      }  else if (item.type == 'pie'){
-        console.log("pie!=============")
-        this.chartData = {
-          chartType:'pie',
-          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-          legendArr: ['数据1', '数据2', '数据3', '数据4', '线条1'],
-          dataArr:[1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-        
-        }
-      }   else if (item.type == 'line_bar'){
-        console.log("pie!=============")
-        this.chartData = {
-          chartType:'line_bar',
-          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
-          legendArr1: ['数据1', '数据2', '数据3', '数据4' ],
-          dataArr1:[
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
-          ],
-          legendArr2: ['数据5',  '线条1'],
-          dataArr2:[
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
-          ]
-        
-        }
-      }  
-
- 
-      
-    }
-
-  }
-}
-</script>
-<style lang="scss" scoped>
-  .search{margin-top:10px;}
-  
- </style>
+<template>
+  <div class="app-container">
+
+    <!-- <el-dialog
+        v-dialogDrag
+        ref="dialog__wrapper">
+        <div class="dialog-body">
+
+            <div
+                class="line"
+                v-dialogDrag Width="$refs.dialog__wrapper">1111111111111111111</div>
+        </div>
+    </el-dialog> -->
+
+
+    <el-row :gutter="20">
+      <el-col :span="18">
+
+
+<!-- <draggable v-model="arr1" group="itxst"   animation="300" :group="{name: 'dashboard',pull: true}">
+                    <transition-group>
+                        <div style = "width:300px;height:20px;border:1px soild #333" :class="item.id==1?'item forbid':'item'" v-for="item in arr1"  key="1">{{item.name}}</div>
+                    </transition-group>
+                </draggable> -->
+
+
+
+        <div class="search">
+
+          <el-select v-model="tableObj.getDataParameters.parammaps.dateType" placeholder="查询日期" @change="change_date_type">
+            <el-option  v-for="item in dateTypeList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+          </el-select>
+
+          <el-select v-model="tableObj.getDataParameters.parammaps.type" filterable placeholder="数据类型" class="filter-item" style="width: 120px;" clearable>
+            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+          <el-select v-model="tableObj.getDataParameters.parammaps.dimension" @change="change_dimension" filterable placeholder="维度" class="filter-item" style="width: 120px;"  >
+            <el-option v-for="item in dimensionList"   :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+
+          <!-- <el-select v-model="tableObj.getDataParameters.parammaps.mixture" multiple placeholder="混料数据">
+            <el-option  v-for="item in mixtureList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+          </el-select>
+
+          <el-select v-model="tableObj.getDataParameters.parammaps.spread" multiple placeholder="撒料数据">
+            <el-option  v-for="item in spreadList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+          </el-select> -->
+
+
+          <el-cascader style = "width:400px;" ref = "cascader1" v-model="tableObj.getDataParameters.parammaps.mixture" :options="mixtureList" :props = "{ multiple: true, emitPath: false,}"   :show-all-levels="false" @change="change_cascader1"></el-cascader>
+
+
+          <el-cascader style = "width:400px;" ref = "cascader2" v-model="tableObj.getDataParameters.parammaps.spread" :options="spreadList" :props = "{ multiple: true, emitPath: false,}"   :show-all-levels="false" @change="change_cascader2"></el-cascader>
+
+
+
+
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="form_clear">{{$t('common.reset')}}</el-button>
+        </div>
+        <div class="operation">
+          <el-button class="success" icon="el-icon-plus" @click="form_add_screening">添加筛选条件</el-button>
+          <el-button   class="danger" icon="el-icon-delete" @click="form_clear_screening">清空筛选条件</el-button>
+        </div>
+
+        <div v-if="screeningVisible">
+           <div class="search">
+
+
+            <el-select v-model="screeningObj.screeningCondition" filterable placeholder="筛选条件" class="filter-item" style="width: 120px;" clearable  @change="change_screening">
+              <el-option v-for="item in screeningList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+
+            <el-input v-model="screeningObj.screeningField" placeholder="筛选字段" style="width: 180px;" class="filter-item" clearable />
+
+
+            <el-select v-model="screeningObj.screeningField" placeholder="筛选字段">
+              <el-option  v-for="item in screeningFieldList1" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+            </el-select>
+
+            <el-select v-model="screeningObj.screeningField" placeholder="筛选字段">
+              <el-option  v-for="item in screeningFieldList2" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+            </el-select>
+
+
+            <el-date-picker v-model="screeningObj.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
+
+
+
+
+            <el-button class="successBorder" @click="form_search_screening">{{$t('common.query')}}</el-button>
+             <el-button class="successBorder" @click="form_cancel_screening">{{$t('common.reset')}}</el-button>
+          </div>
+
+          <div>
+            <el-row :gutter="20">
+                <el-col :span="6"  v-for = "(item,index) in screeningArr">
+                  <span style="font-size:14px;color:#555">{{index+1}}、条件：{{item.txt}}</span>
+
+                </el-col>
+            </el-row>
+
+          </div>
+
+        </div>
+
+
+        <ChartTable/>
+
+        <div>
+          <!-- <div style = "">
+            <el-select v-model="tableObj.getDataParameters.parammaps.dateType" multiple placeholder="维度">
+              <el-option  v-for="item in fieldTypeList" :key="item.id" :label="item.name" :value="item.id" ></el-option>
+            </el-select>
+          </div> -->
+
+        <BarChart v-if = "chartData.chartType == 'bar'"   :chart-data="chartData" />
+        <LineChart v-if = "chartData.chartType == 'line'"   :chart-data="chartData" />
+        <HorizontalBarChart v-if = "chartData.chartType == 'horizontal_bar'"   :chart-data="chartData" />
+        <PieChart v-if = "chartData.chartType == 'pie'"   :chart-data="chartData" />
+        <LineBarChart v-if = "chartData.chartType == 'line_bar'"   :chart-data="chartData" />
+
+          <!-- <div id="chartLine" style="width:100%;height:385px;" >
+
+          </div> -->
+        </div>
+
+
+      </el-col>
+      <el-col :span="6">
+
+          <div  class="chart-style-panel">
+            <el-form label-position="top" size="mini">
+              <el-form-item  label="图表类型">
+                <div class="chart-type-list">
+
+
+                  <span  @click="switch_chart_type(item)" v-for="item in chartTypeList" style = "display:inline-block;height:30px;width:30px;margin-right:10px;margin-bottom:10px">
+                    <el-tooltip  :content="item.desc" placement="top">
+                      <svg-icon class="icon"  style="height:20px;width:20px" :icon-class="item.isUse? item.icon : (item.icon + '_disabled')" />
+                    </el-tooltip>
+                  </span>
+
+
+                </div>
+              </el-form-item>
+            </el-form>
+          </div>
+
+      </el-col>
+    </el-row>
+
+
+
+  </div>
+
+</template>
+
+<script>
+import echarts from 'echarts'
+import draggable from 'vuedraggable'
+
+import ChartTable from '@/componentChart/ChartTable.vue'
+import LineChart from '@/componentChart/LineChart.vue'
+import BarChart from '@/componentChart/BarChart.vue'
+import HorizontalBarChart from '@/componentChart/HorizontalBarChart.vue'
+import PieChart from '@/componentChart/PieChart.vue'
+import LineBarChart from '@/componentChart/LineBarChart.vue'
+
+require('echarts/theme/macarons')
+import { GetDataByName, PostDataByName, failproccess, ExecDataByConfig, checkButtons } from '@/api/common'
+import Cookies from 'js-cookie'
+import Pagination from '@/components/Pagination'
+import { MessageBox } from 'element-ui'
+export default {
+  name: 'ChartPanel2',
+  components: { Pagination, draggable , ChartTable ,LineChart,BarChart ,HorizontalBarChart, PieChart, LineBarChart},
+  data() {
+    return {
+
+      chartType:'line',
+      chartTypeList:[
+          // {type:'table', desc:"表格：任意维度数据" ,icon:'chart_table',isUse:true,id:0},
+          {type:'line', desc:"折线图：任意维度数据" ,icon:'chart_line',isUse:false,id:0},
+          {type:'bar', desc:"柱状图：任意维度数据" ,icon:'chart_bar',isUse:false,id:1},
+          {type:'horizontal_bar', desc:"条形图：任意维度数据" ,icon:'horizontal_bar',isUse:false,id:2},
+          {type:'pie', desc:"饼图：任意维度数据" ,icon:'chart_pie',isUse:false,id:3},
+          {type:'line_bar', desc:"线柱图：任意维度数据" ,icon:'linebar_chart',isUse:false,id:4},
+      ],
+
+
+
+      isRoleEdit: [],
+
+      dateTypeList: [
+        { id: '汇总', name: '汇总' },
+        { id: '分日', name: '分日' }
+      ],
+      typeList: [
+        { id: '车次', name: this.$t('errorAnalysis.projname') },
+        { id: '栏舍', name: '栏舍' }
+      ],
+
+      dimensionList: [
+        { id: '栏舍', name: '栏舍' },
+        { id: '配方', name: '配方' },
+        { id: '班次', name: '班次' },
+        { id: '车次', name: this.$t('errorAnalysis.projname') },
+        { id: 'TMR', name: 'TMR' },
+        { id: '牲畜大类', name: '牲畜大类' },
+        { id: '牲畜小类', name: '牲畜小类' }
+      ],
+
+
+      //混料数据
+      mixtureList: [],
+      //撒料数据
+      spreadList: [],
+
+      //车次 - 数据1 - 栏舍 - 理论重量、实际重量、误差值、允许误差数、准确率（平均）、是否超出误差
+      mixtureSpreadArr1: [
+        {
+          value: '理论重量',label: '理论重量',
+          children: [
+            { value: '理论重量-合计', label: '理论重量-合计'},
+            { value: '理论重量-平均', label: '理论重量-平均'},
+            { value: '理论重量-最大值', label: '理论重量-最大值'},
+            { value: '理论重量-最小值', label: '理论重量-最小值'},
+            { value: '理论重量-标准差', label: '理论重量-标准差'},
+            { value: '理论重量-变异系数', label: '理论重量-变异系数'},
+          ]
+        },
+        {
+          value: '实际重量',label: '实际重量',
+          children: [
+            { value: '实际重量-合计', label: '实际重量-合计'},
+            { value: '实际重量-平均', label: '实际重量-平均'},
+            { value: '实际重量-最大值', label: '实际重量-最大值'},
+            { value: '实际重量-最小值', label: '实际重量-最小值'},
+            { value: '实际重量-标准差', label: '实际重量-标准差'},
+            { value: '实际重量-变异系数', label: '实际重量-变异系数'},
+          ]
+        },
+        {
+          value: '误差值',label: '误差值',
+          children: [
+            { value: '误差值-合计', label: '误差值-合计'},
+            { value: '误差值-平均', label: '误差值-平均'},
+            { value: '误差值-最大值', label: '误差值-最大值'},
+            { value: '误差值-最小值', label: '误差值-最小值'},
+            { value: '误差值-标准差', label: '误差值-标准差'},
+            { value: '误差值-变异系数', label: '误差值-变异系数'},
+          ]
+        },
+        {
+          value: '允许误差数',label: '允许误差数',
+          children: [
+            { value: '允许误差数-合计', label: '允许误差数-合计'},
+            { value: '允许误差数-平均', label: '允许误差数-平均'},
+            { value: '允许误差数-最大值', label: '允许误差数-最大值'},
+            { value: '允许误差数-最小值', label: '允许误差数-最小值'},
+            { value: '允许误差数-标准差', label: '允许误差数-标准差'},
+            { value: '允许误差数-变异系数', label: '允许误差数-变异系数'},
+          ]
+        },
+        { value: '准确率-平均',label: '准确率-平均'},
+        { value: '是否超出误差',label: '是否超出误差'}
+      ],
+      //车次 - 数据2 - 配方 - 理论重量、实际重量、误差值、准确率（平均）
+      mixtureSpreadArr2: [
+        {
+          value: '理论重量',label: '理论重量',
+          children: [
+            { value: '理论重量-合计', label: '理论重量-合计'},
+            { value: '理论重量-平均', label: '理论重量-平均'},
+            { value: '理论重量-最大值', label: '理论重量-最大值'},
+            { value: '理论重量-最小值', label: '理论重量-最小值'},
+            { value: '理论重量-标准差', label: '理论重量-标准差'},
+            { value: '理论重量-变异系数', label: '理论重量-变异系数'},
+          ]
+        },
+        {
+          value: '实际重量',label: '实际重量',
+          children: [
+            { value: '实际重量-合计', label: '实际重量-合计'},
+            { value: '实际重量-平均', label: '实际重量-平均'},
+            { value: '实际重量-最大值', label: '实际重量-最大值'},
+            { value: '实际重量-最小值', label: '实际重量-最小值'},
+            { value: '实际重量-标准差', label: '实际重量-标准差'},
+            { value: '实际重量-变异系数', label: '实际重量-变异系数'},
+          ]
+        },
+        {
+          value: '误差值',label: '误差值',
+          children: [
+            { value: '误差值-合计', label: '误差值-合计'},
+            { value: '误差值-平均', label: '误差值-平均'},
+            { value: '误差值-最大值', label: '误差值-最大值'},
+            { value: '误差值-最小值', label: '误差值-最小值'},
+            { value: '误差值-标准差', label: '误差值-标准差'},
+            { value: '误差值-变异系数', label: '误差值-变异系数'},
+          ]
+        },
+        { value: '准确率-平均',label: '准确率-平均'}
+      ],
+      //车次 - 数据3 - 班次 - 理论重量、实际重量、误差值、准确率（平均）、开始重量、结束重量
+      mixtureSpreadArr3: [
+        {
+          value: '理论重量',label: '理论重量',
+          children: [
+            { value: '理论重量-合计', label: '理论重量-合计'},
+            { value: '理论重量-平均', label: '理论重量-平均'},
+            { value: '理论重量-最大值', label: '理论重量-最大值'},
+            { value: '理论重量-最小值', label: '理论重量-最小值'},
+            { value: '理论重量-标准差', label: '理论重量-标准差'},
+            { value: '理论重量-变异系数', label: '理论重量-变异系数'},
+          ]
+        },
+        {
+          value: '实际重量',label: '实际重量',
+          children: [
+            { value: '实际重量-合计', label: '实际重量-合计'},
+            { value: '实际重量-平均', label: '实际重量-平均'},
+            { value: '实际重量-最大值', label: '实际重量-最大值'},
+            { value: '实际重量-最小值', label: '实际重量-最小值'},
+            { value: '实际重量-标准差', label: '实际重量-标准差'},
+            { value: '实际重量-变异系数', label: '实际重量-变异系数'},
+          ]
+        },
+        {
+          value: '误差值',label: '误差值',
+          children: [
+            { value: '误差值-合计', label: '误差值-合计'},
+            { value: '误差值-平均', label: '误差值-平均'},
+            { value: '误差值-最大值', label: '误差值-最大值'},
+            { value: '误差值-最小值', label: '误差值-最小值'},
+            { value: '误差值-标准差', label: '误差值-标准差'},
+            { value: '误差值-变异系数', label: '误差值-变异系数'},
+          ]
+        },
+        { value: '准确率-平均',label: '准确率-平均'},
+        {
+          value: '开始重量',label: '开始重量',
+          children: [
+            { value: '开始重量-合计', label: '开始重量-合计'},
+            { value: '开始重量-平均', label: '开始重量-平均'},
+            { value: '开始重量-最大值', label: '开始重量-最大值'},
+            { value: '开始重量-最小值', label: '开始重量-最小值'},
+            { value: '开始重量-标准差', label: '开始重量-标准差'},
+            { value: '开始重量-变异系数', label: '开始重量-变异系数'},
+          ]
+        },
+        {
+          value: '结束重量',label: '结束重量',
+          children: [
+            { value: '结束重量-合计', label: '结束重量-合计'},
+            { value: '结束重量-平均', label: '结束重量-平均'},
+            { value: '结束重量-最大值', label: '结束重量-最大值'},
+            { value: '结束重量-最小值', label: '结束重量-最小值'},
+            { value: '结束重量-标准差', label: '结束重量-标准差'},
+            { value: '结束重量-变异系数', label: '结束重量-变异系数'},
+          ]
+        }
+      ],
+      //车次 - 数据4 - 车次 - 理论重量、实际重量、误差值、准确率（平均）、跳转方式、开始重量、结束重量、计划时间、开始时间、结束时间、过程时间
+      mixtureSpreadArr4: [
+        {
+          value: '理论重量',label: '理论重量',
+          children: [
+            { value: '理论重量-合计', label: '理论重量-合计'},
+            { value: '理论重量-平均', label: '理论重量-平均'},
+            { value: '理论重量-最大值', label: '理论重量-最大值'},
+            { value: '理论重量-最小值', label: '理论重量-最小值'},
+            { value: '理论重量-标准差', label: '理论重量-标准差'},
+            { value: '理论重量-变异系数', label: '理论重量-变异系数'},
+          ]
+        },
+        {
+          value: '实际重量',label: '实际重量',
+          children: [
+            { value: '实际重量-合计', label: '实际重量-合计'},
+            { value: '实际重量-平均', label: '实际重量-平均'},
+            { value: '实际重量-最大值', label: '实际重量-最大值'},
+            { value: '实际重量-最小值', label: '实际重量-最小值'},
+            { value: '实际重量-标准差', label: '实际重量-标准差'},
+            { value: '实际重量-变异系数', label: '实际重量-变异系数'},
+          ]
+        },
+        {
+          value: '误差值',label: '误差值',
+          children: [
+            { value: '误差值-合计', label: '误差值-合计'},
+            { value: '误差值-平均', label: '误差值-平均'},
+            { value: '误差值-最大值', label: '误差值-最大值'},
+            { value: '误差值-最小值', label: '误差值-最小值'},
+            { value: '误差值-标准差', label: '误差值-标准差'},
+            { value: '误差值-变异系数', label: '误差值-变异系数'},
+          ]
+        },
+        { value: '准确率-平均',label: '准确率-平均'},
+        { value: '跳转方式',label: '跳转方式'},
+        {
+          value: '开始重量',label: '开始重量',
+          children: [
+            { value: '开始重量-合计', label: '开始重量-合计'},
+            { value: '开始重量-平均', label: '开始重量-平均'},
+            { value: '开始重量-最大值', label: '开始重量-最大值'},
+            { value: '开始重量-最小值', label: '开始重量-最小值'},
+            { value: '开始重量-标准差', label: '开始重量-标准差'},
+            { value: '开始重量-变异系数', label: '开始重量-变异系数'},
+          ]
+        },
+        {
+          value: '结束重量',label: '结束重量',
+          children: [
+            { value: '结束重量-合计', label: '结束重量-合计'},
+            { value: '结束重量-平均', label: '结束重量-平均'},
+            { value: '结束重量-最大值', label: '结束重量-最大值'},
+            { value: '结束重量-最小值', label: '结束重量-最小值'},
+            { value: '结束重量-标准差', label: '结束重量-标准差'},
+            { value: '结束重量-变异系数', label: '结束重量-变异系数'},
+          ]
+        },
+        { value: '计划时间',label: '计划时间'},
+        { value: '开始时间',label: '开始时间'},
+        { value: '结束时间',label: '结束时间'},
+        { value: '过程时间',label: '过程时间'},
+      ],
+      //车次 - 数据5 - 牲畜大类 - 理论重量、实际重量、误差值、准确率（平均）
+      //车次 - 数据5 - 牲畜小类 - 理论重量、实际重量、误差值、准确率（平均）
+      //车次 - 数据5 - TMR - 理论重量、实际重量、误差值、准确率（平均）
+      mixtureSpreadArr5: [
+        {
+          value: '理论重量',label: '理论重量',
+          children: [
+            { value: '理论重量-合计', label: '理论重量-合计'},
+            { value: '理论重量-平均', label: '理论重量-平均'},
+            { value: '理论重量-最大值', label: '理论重量-最大值'},
+            { value: '理论重量-最小值', label: '理论重量-最小值'},
+            { value: '理论重量-标准差', label: '理论重量-标准差'},
+            { value: '理论重量-变异系数', label: '理论重量-变异系数'},
+          ]
+        },
+        {
+          value: '实际重量',label: '实际重量',
+          children: [
+            { value: '实际重量-合计', label: '实际重量-合计'},
+            { value: '实际重量-平均', label: '实际重量-平均'},
+            { value: '实际重量-最大值', label: '实际重量-最大值'},
+            { value: '实际重量-最小值', label: '实际重量-最小值'},
+            { value: '实际重量-标准差', label: '实际重量-标准差'},
+            { value: '实际重量-变异系数', label: '实际重量-变异系数'},
+          ]
+        },
+        {
+          value: '误差值',label: '误差值',
+          children: [
+            { value: '误差值-合计', label: '误差值-合计'},
+            { value: '误差值-平均', label: '误差值-平均'},
+            { value: '误差值-最大值', label: '误差值-最大值'},
+            { value: '误差值-最小值', label: '误差值-最小值'},
+            { value: '误差值-标准差', label: '误差值-标准差'},
+            { value: '误差值-变异系数', label: '误差值-变异系数'},
+          ]
+        },
+        { value: '准确率-平均',label: '准确率-平均'}
+      ],
+
+      mixScreenArr:[],
+      spreadScreenArr:[],
+
+
+      screeningVisible:true,
+      // 筛选条件
+      screeningList: [
+        // { id: '配方名称', name: '配方名称' },
+        // { id: 'TMR名称', name: 'TMR名称' },
+        // { id: '班次', name: '班次' },
+        // { id: '车次计划', name: '车次计划' },
+      ],
+
+      // 筛选条件 - 参数
+      screeningObj:{
+            screeningCondition: '',
+            screeningField: '',
+
+            inputDatetime: '',
+             startTime: '',
+             stopTime: '',
+      },
+      // 筛选条件 - 参数
+      screeningArr:[
+
+
+
+      ],
+
+
+      screeningFieldList1:[
+        { id: '是',
+name:this.$t('supplier.yes')},
+        { id: '否', name: '否' }
+      ],
+      screeningFieldList2:[
+        { id: '自动', name: '自动' },
+        { id: '手动', name: '手动' }
+      ],
+
+
+      // 筛选条件 - 结果
+
+
+
+      fieldTypeList: [
+        { id: '配方A', name: '配方A' },
+        { id: '配方B', name: '配方B' }
+      ],
+
+
+      tableObj: {
+         getDataParameters: {
+          name: 'getDriverList',
+          page: 1,
+          offset: 1,
+          pagecount: parseInt(Cookies.get('pageCount')),
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            dateType:'',
+            type: '',
+            dimension: '',
+            mixture: [],
+            spread: [],
+          }
+        },
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: false,
+        temp: {}
+      },
+
+
+      chartData:{
+         chartType:null,
+        // xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+        // legendArr: ['数据1', '数据2', '数据3', '数据4', '线条1'],
+        // dataArr:[
+        //   [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+        //   [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+        //   [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+        //   [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
+        //   [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8]
+        // ]
+      },
+
+
+
+
+
+      chartLine_data2:{
+        chartType:'pie',
+        xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+        legendArr: ['数据1', '数据2', '数据3', '数据4', '线条1'],
+        dataArr:[1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+
+      },
+
+
+       chartLine_data3:{
+        chartType:'line_bar',
+        xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+        legendArr1: ['数据1', '数据2', '数据3', '数据4' ],
+        dataArr1:[
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
+        ],
+         legendArr2: ['数据5',  '线条1'],
+        dataArr2:[
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+        ]
+      },
+
+      requestParam: {},
+      isokDisable: false,
+      selectList: [],
+      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+
+    }
+  },
+
+  created() {
+    // console.log(VUE_APP_BASE_pageCount)
+    // console.log(this.VUE_APP_BASE_pageCount, 'this.VUE_APP_BASE_pageCount')
+    // this.getList()
+    // this.getButtons()
+
+
+  },
+
+  methods: {
+
+
+
+    getButtons() {
+      const Edit = 'Driver'
+      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      this.isRoleEdit = isRoleEdit
+    },
+    getList() {
+      this.tableObj.listLoading = true
+      GetDataByName(this.tableObj.getDataParameters).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          for (let i = 0; i < response.data.list.length; i++) {
+            this.$set(response.data.list[i], 'Edit', false) // 编辑
+            this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
+            this.$set(response.data.list[i], 'isCreate', false) // 新增操作
+            this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
+            this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
+          }
+          this.tableObj.list = response.data.list
+          this.tableObj.pageNum = response.data.pageNum
+          this.tableObj.pageSize = response.data.pageSize
+          this.tableObj.total = response.data.total
+        } else {
+          this.tableObj.list = []
+        }
+        setTimeout(() => {
+          this.tableObj.listLoading = false
+        }, 100)
+      })
+    },
+
+
+    form_search() {
+      console.log('点击了查询 - 表单 tableObj', this.tableObj.getDataParameters.parammaps)
+      // this.tableObj.getDataParameters.offset = 1
+      // this.getList()
+      console.log('点击了查询 - this.chartLine_data', this.chartLine_data)
+
+
+     // this.roadChartLine(this.chartLine_data)
+    },
+    form_clear() {
+      console.log('点击了重置')
+      // this.tableObj.getDataParameters.parammaps.drivername = ''
+      // this.tableObj.getDataParameters.parammaps.enable = ''
+      // this.tableObj.getDataParameters.parammaps.drivercode = ''
+      // this.tableObj.getDataParameters.offset = 1
+      //this.getList()
+    },
+
+  //查询 - 汇总/分日
+    change_date_type(value) {
+      console.log('查询日期', value)
+
+
+    },
+
+
+
+    //维度
+    change_dimension(value) {
+      console.log('维度', value)
+      this.tableObj.getDataParameters.parammaps.mixture = []
+      this.tableObj.getDataParameters.parammaps.spread = []
+      if(value == "栏舍"){
+        this.mixtureList = this.mixtureSpreadArr1
+        this.spreadList = this.mixtureSpreadArr1
+      } else if(value == "配方"){
+        this.mixtureList = this.mixtureSpreadArr2
+        this.spreadList = this.mixtureSpreadArr2
+      } else if(value == "班次"){
+        this.mixtureList = this.mixtureSpreadArr3
+        this.spreadList = this.mixtureSpreadArr3
+      } else if(value == "车次"){
+        this.mixtureList = this.mixtureSpreadArr4
+        this.spreadList = this.mixtureSpreadArr4
+      } else if(value == "牲畜大类" || value == "牲畜小类"  || value == "TMR"){
+        this.mixtureList = this.mixtureSpreadArr5
+        this.spreadList = this.mixtureSpreadArr5
+      }
+
+    },
+
+    //级联选择 - 混料数据
+    change_cascader1(value) {
+      console.log('级联选择 - 混料数据', value)
+      var allNode = this.$refs['cascader1'].getCheckedNodes()
+
+      console.log("级联选择 - 混料数据的Node", allNode)
+      var mixScreenArr = []
+
+
+        value.forEach(function(i){
+          allNode.forEach(function(j){
+            if(i == j.value){
+              mixScreenArr.push({name: "混料-"+j.label, id:j.value})
+            }
+          })
+        })
+
+
+      // allNode.forEach(function(item){
+      //   if(item.children.length == 0){
+      //     mixScreenArr.push({name: "混料-"+item.label, id:item.value})
+      //   }
+      // })
+
+
+      var spreadScreenArr = this.spreadScreenArr
+      this.mixScreenArr = mixScreenArr
+      this.screeningList = mixScreenArr.concat(spreadScreenArr)
+
+    },
+
+    //级联选择 - 撒料数据
+    change_cascader2(value) {
+      console.log('级联选择 - 撒料数据', value)
+      var allNode2 = this.$refs['cascader2'].getCheckedNodes()
+
+      console.log("级联选择 - 撒料数据的Node", allNode2)
+
+      var spreadScreenArr = []
+
+       value.forEach(function(i){
+          allNode2.forEach(function(j){
+            if(i == j.value){
+              spreadScreenArr.push({name: "撒料-"+j.label, id:j.value})
+            }
+          })
+        })
+      // allNode2.forEach(function(item){
+      //   if(item.children.length == 0){
+      //     spreadScreenArr.push({name: "撒料-"+item.label, id:item.value})
+      //   }
+      // })
+
+
+      var mixScreenArr = this.mixScreenArr
+      this.spreadScreenArr = spreadScreenArr
+      this.screeningList = mixScreenArr.concat(spreadScreenArr)
+    },
+
+    change_screening(value) {
+      console.log('筛选', value)
+      console.log('筛选数组', this.screeningList)
+
+    },
+
+
+    handleCreate() {
+      // this.resetRequestParam()
+      // this.dialogStatus = 'create'
+      // this.parent = this.parentmenu
+      // this.screeningVisible = true
+      // this.$nextTick(() => {
+      //   this.$refs['dataForm'].clearValidate()
+      //   this.$refs.name.focus()
+      // })
+    },
+
+
+
+    form_search_screening() {
+      console.log('点击了筛选条件 - 确认 - screeningObj',this.screeningObj)
+      var screeningCondition = this.screeningObj.screeningCondition
+      var screeningField = this.screeningObj.screeningField
+      var txt = { txt:    screeningCondition + screeningField}
+
+      console.log(txt)
+      this.screeningArr.push(txt)
+
+
+
+
+
+    },
+
+
+    form_add_screening() {
+      console.log('点击了查询')
+      this.tableObj.getDataParameters.offset = 1
+      this.getList()
+    },
+
+    form_clear_screening() {
+      console.log('点击了查询')
+      this.tableObj.getDataParameters.offset = 1
+      this.getList()
+    },
+
+    form_cancel_screening() {
+      console.log('点击了查询')
+      this.tableObj.getDataParameters.offset = 1
+      this.getList()
+    },
+
+
+    //切换图表类型
+    switch_chart_type(item){
+      console.log(item)
+      console.log(this.chartTypeList)
+      var chartTypeList = this.chartTypeList
+      chartTypeList.forEach(function(i){
+        i.isUse = false
+      })
+      chartTypeList[item.id].isUse = true
+
+      this.chartType = item.type
+      this.chartTypeList = chartTypeList
+
+
+     if(item.type == 'line'){
+
+        this.chartData = {
+          chartType:'line',
+          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+          legendArr: ['数据1', '数据2', '数据3'],
+          dataArr:[
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          ]
+        }
+
+      } else if(item.type == 'bar'){
+
+        this.chartData = {
+          chartType:'bar',
+          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+          legendArr: ['数据1', '数据2', '数据3'],
+          dataArr:[
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+
+          ]
+        }
+
+      } else if(item.type == 'horizontal_bar'){
+        this.chartData = {
+          chartType:'horizontal_bar',
+          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+          legendArr: ['数据1', '数据2', '数据3', '数据4'],
+          dataArr:[
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+
+          ]
+        }
+      }  else if (item.type == 'pie'){
+        console.log("pie!=============")
+        this.chartData = {
+          chartType:'pie',
+          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+          legendArr: ['数据1', '数据2', '数据3', '数据4', '线条1'],
+          dataArr:[1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+
+        }
+      }   else if (item.type == 'line_bar'){
+        console.log("pie!=============")
+        this.chartData = {
+          chartType:'line_bar',
+          xAxisArr: ['2019-01', '2019-02', '2019-03', '2019-04', '2019-05', '2019-06', '2019-07', '2019-08', '2019-09', '2019-10', '2019-11', '2019-12'],
+          legendArr1: ['数据1', '数据2', '数据3', '数据4' ],
+          dataArr1:[
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [2, 10, 3, 2, 10, 4, 4, 9, 3, 9, 3, 8],
+          ],
+          legendArr2: ['数据5',  '线条1'],
+          dataArr2:[
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+            [1, 10, 7, 0, 1, 7, 7, 6, 4, 4, 1, 6],
+          ]
+
+        }
+      }
+
+
+
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .search{margin-top:10px;}
+
+ </style>

src/views/systemManagement/groupInformation/index.vue

@@ -36,12 +36,14 @@
                 <span>{{ scope.row.groupsname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="联系人" min-width="130px" align="center">
+            <el-table-column
+:label="$t('supplier.lxr')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.emp }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="联系方式" min-width="130px" align="center">
+            <el-table-column
+:label="$t('supplier.lxfs')" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.phone }}</span>
               </template>

src/views/systemManagement/operationManagement/group/index.vue

@@ -42,13 +42,15 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.groupsname" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" placeholder="1-32字符" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="联系人" min-width="130px" align="center">
+        <el-table-column
+:label="$t('supplier.lxr')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.emp }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.emp" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" placeholder="1-32字符" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="联系方式" min-width="130px" align="center">
+        <el-table-column
+:label="$t('supplier.lxfs')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.phone }}</span>
             <el-input v-if="scope.row.Edit" v-model.trim="scope.row.phone" placeholder="请输入11位手机号" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="11" style="width:95%;padding:10px 0;" />
@@ -68,7 +70,8 @@
         <el-table-column :label="$t('formulationEvaluation.remark')" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.note }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.note" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" placeholder="1-255字符" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.note" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255"
+:placeholder="$t('supplier.zf3')" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="180" class-name="small-padding fixed-width" fixed="right">

src/views/systemManagement/operationManagement/pasture/index.vue

@@ -130,7 +130,8 @@ export default {
       ],
       isRoleEdit: [],
       stateList: [{ id: 1, name: '启用' }, { id: 0, name: '禁止' }], // 状态
-      isBelongGroupList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否归属集团
+      isBelongGroupList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否归属集团
       belongGroupList: [], // 权限归属
       tab1: {
         // 页面配置

src/views/systemManagement/ranchInformation/index.vue

@@ -59,10 +59,12 @@
         <el-table-column label="地址" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.address }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.address" placeholder="1-255字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width:95%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.address"
+:placeholder="$t('supplier.zf3')" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="255" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="联系人" min-width="150px" align="center">
+        <el-table-column
+:label="$t('supplier.lxr')" min-width="150px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.contact }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.contact" placeholder="1-32字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
@@ -101,7 +103,8 @@ export default {
   data() {
     return {
       isRoleEdit: [],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }],
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
 
       table: {
         getdataListParm: {

src/views/systemManagement/role/index.vue

@@ -155,7 +155,8 @@ export default {
     return {
       dialogFull: false,
       isRoleEdit: [],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否启用
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
 
       table: {
         getdataListParm: {

src/views/systemManagement/user/index.vue

@@ -152,7 +152,8 @@ export default {
       requestParams: [
         { name: 'getRoleAll', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid') }}
       ],
-      enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是否启用
+      enableList: [{ id: 1,
+name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
       attentionStatusList: [{ id: 1, name: '已关注公众号' }, { id: 0, name: '未关注公众号' }],
       roleList: [], // 角色