Merge branch 'master' of http://kpt.kptyun.cn:3000/duanxiaoduan/tmr-admin

src/views/shedProduction/formulaDryMatter/index.vue

@@ -26,7 +26,7 @@
           <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown>
       <el-button class="export" style="float: right;" @click="handleHistoryRecord">历史记录</el-button>
     </div>
     <div class="table">
@@ -93,7 +93,7 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
           </template>
         </el-table-column>
@@ -103,18 +103,18 @@
 
     <!-- 新增/编辑 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="70%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[create.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[create.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
       <div class="app-add">
         <el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="135px" style="width: 90%;margin:0 auto 50px">
           <el-row>
@@ -183,29 +183,29 @@
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
-    </el-dialog>
-    <!-- 历史记录 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="historyRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[historyRecord.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
-      <div class="historyRecord">
-        <keep-alive>
-          <component :is="historyRecord.myComponent" ref="historyRecord" />
-        </keep-alive>
-        <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
-        </div>
-      </div>
+    </el-dialog>
+    <!-- 历史记录 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="historyRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[historyRecord.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="historyRecord">
+        <keep-alive>
+          <component :is="historyRecord.myComponent" ref="historyRecord" />
+        </keep-alive>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
+        </div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -222,7 +222,7 @@ export default {
   name: 'FormulaDryMatter',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       isRoleEdit: [],
       requestParams: [
@@ -294,15 +294,15 @@ export default {
       },
       textMap: {
         create: '新增',
-        update: '编辑',
+        update: '编辑',
         historyRecord: '历史记录'
       },
-      historyRecord: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        myComponent: null
+      historyRecord: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        myComponent: null
       },
-      requestParam: {},
+      requestParam: {},
       requestParam2: {},
       download: {
         getdataListParm: {
@@ -499,7 +499,7 @@ export default {
     handleCreate() {
       console.log('点击了新增')
       this.resetTemp()
-      this.getNoteTakerList()
+      this.getNoteTakerList()
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -546,22 +546,22 @@ export default {
           })
         }
       })
-    },
-    saveData() {
-      this.requestParam2.name = 'insertFtdryHistory'
-      this.create.temp.pastureid = Cookies.get('pastureid')
-      this.create.temp.changetime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
-      this.requestParam2.parammaps = this.create.temp
-      PostDataByName(this.requestParam2).then(response => {
-        console.log('新增保存发送参数', this.requestParam1)
-        if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-          this.create.dialogFormVisible = false
-          this.getList()
-        } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-        }
-      })
+    },
+    saveData() {
+      this.requestParam2.name = 'insertFtdryHistory'
+      this.create.temp.pastureid = Cookies.get('pastureid')
+      this.create.temp.changetime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+      this.requestParam2.parammaps = this.create.temp
+      PostDataByName(this.requestParam2).then(response => {
+        console.log('新增保存发送参数', this.requestParam1)
+        if (response.msg !== 'fail') {
+          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+          this.create.dialogFormVisible = false
+          this.getList()
+        } else {
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        }
+      })
     },
     createDataAgain() {
       console.log('点击了新增保存')
@@ -593,7 +593,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.saveData()
+              this.saveData()
               this.resetTemp()
               this.getList()
               this.getNoteTakerList()
@@ -617,7 +617,7 @@ export default {
       this.create.temp = Object.assign({}, row)
       this.create.temp.id = row.id
 
-      this.getNoteTakerList()
+      this.getNoteTakerList()
       this.dialogFull = false
       this.create.dialogStatus = 'update'
       this.create.dialogFormVisible = true
@@ -651,7 +651,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.saveData()
+              this.saveData()
               this.getList()
             } else {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
@@ -736,7 +736,7 @@ export default {
               if (barid.test(response.data)) {
                 this.$notify({ type: 'warning', message: '该栏舍该班次今日配方干物质已存在，不可重复生成', duration: 2000 })
                 return
-              }
+              }
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -744,7 +744,7 @@ export default {
             }
           })
         }).catch(() => {
-          this.$message({ type: 'info', message: '已取消删除' })
+          this.$message({ type: 'info', message: '已取消复制' })
         })
       } else {
         this.$message({ type: 'error', message: '请选择一条配方干物质', duration: 2000 })
@@ -848,15 +848,15 @@ export default {
           }
         })
       )
-    },
-    handleHistoryRecord() {
-      console.log('点击历史记录')
-      this.dialogFull = false
-      this.historyRecord.dialogStatus = 'historyRecord'
-      this.historyRecord.dialogFormVisible = true
-      const vue = this
-      var myComponent = () => import('./historyRecord.vue')
-      return vue.historyRecord.myComponent = myComponent
+    },
+    handleHistoryRecord() {
+      console.log('点击历史记录')
+      this.dialogFull = false
+      this.historyRecord.dialogStatus = 'historyRecord'
+      this.historyRecord.dialogFormVisible = true
+      const vue = this
+      var myComponent = () => import('./historyRecord.vue')
+      return vue.historyRecord.myComponent = myComponent
     }
 
   }

src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -1145,7 +1145,7 @@ export default {
       this.chartLine = echarts.init(document.getElementById('chartLine'))
       var option = {
         title: { text: '', subtext: '' },
-        color: ['#38c193', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话，legend的颜色和折线的自定义颜色就一致了
+        color: ['#ff0000', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话，legend的颜色和折线的自定义颜色就一致了
         legend: [{
           itemWidth: 15, itemHeight: 7, right: '25%', textStyle: { fontSize: 12 },
           data: [{ name: '设计重量' }, { name: '实际重量' }]