更新

src/main.js

@@ -1,92 +1,92 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import 'normalize.css/normalize.css' // A modern alternative to CSS resets
-
-import ElementUI from 'element-ui'
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+import 'normalize.css/normalize.css' // A modern alternative to CSS resets
+
+import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import UmyUi from 'umy-ui'
-import 'umy-ui/lib/theme-chalk/index.css';// 引入样式
-// const ElementUI = require('element-ui')
-// require('element-ui/lib/theme-chalk/index.css')
-import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
-import iconfont from './assets/iconfont/iconfont.css'
-
-import '@/styles/index.scss' // global css
-
-import * as Sentry from '@sentry/browser'
-import {
-  Vue as VueIntegration
-} from '@sentry/integrations'
-
-import App from './App'
-import store from './store'
-import router from './router'
-import i18n from './i18n'
-import '@/icons' // icon
-import '@/permission' // permission control
-import './icons'
-import * as filters from './filters' // global filters
-
-Vue.config.productionTip = false
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online! ! !
- */
-// import { mockXHR } from '../mock'
-if (process.env.NODE_ENV === 'production') {
-  // mockXHR()
-}
-var pageCount = 50
-// console.log(process.env)
-if (process.env.NODE_ENV !== 'development') {
-  Sentry.init({
-    release: 'vislib@' + process.env.npm_package_version,
-    dsn: 'https://9d8ee0ea1a2749949dd1e641b0f7c071@o286322.ingest.sentry.io/5217806',
-    integrations: [new VueIntegration({
-      Vue,
-      attachProps: true
-    })]
-  })
-}
-
-
-// store.commit('app/SET_LANG', 'CN')
-Vue.use(VueRouter)
-Vue.use(pageCount)
-Vue.use(ElementUI, {
-  i18n: (key, value) => i18n.t(key, value)
+import 'umy-ui/lib/theme-chalk/index.css';// 引入样式
+// const ElementUI = require('element-ui')
+// require('element-ui/lib/theme-chalk/index.css')
+import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
+import iconfont from './assets/iconfont/iconfont.css'
+
+import '@/styles/index.scss' // global css
+
+import * as Sentry from '@sentry/browser'
+import {
+  Vue as VueIntegration
+} from '@sentry/integrations'
+
+import App from './App'
+import store from './store'
+import router from './router'
+import i18n from './i18n'
+import '@/icons' // icon
+import '@/permission' // permission control
+import './icons'
+import * as filters from './filters' // global filters
+
+Vue.config.productionTip = false
+/**
+ * If you don't want to use mock-server
+ * you want to use MockJs for mock api
+ * you can execute: mockXHR()
+ *
+ * Currently MockJs will be used in the production environment,
+ * please remove it before going online! ! !
+ */
+// import { mockXHR } from '../mock'
+if (process.env.NODE_ENV === 'production') {
+  // mockXHR()
+}
+var pageCount = 50
+// console.log(process.env)
+if (process.env.NODE_ENV !== 'development') {
+  Sentry.init({
+    release: 'vislib@' + process.env.npm_package_version,
+    dsn: 'https://9d8ee0ea1a2749949dd1e641b0f7c071@o286322.ingest.sentry.io/5217806',
+    integrations: [new VueIntegration({
+      Vue,
+      attachProps: true
+    })]
+  })
+}
+
+
+// store.commit('app/SET_LANG', 'CN')
+Vue.use(VueRouter)
+Vue.use(pageCount)
+Vue.use(ElementUI, {
+  i18n: (key, value) => i18n.t(key, value)
 })
-Vue.use(UmyUi);
-// register global utility filters
-Object.keys(filters).forEach(key => {
-  Vue.filter(key, filters[key])
-})
-
-import echarts from 'echarts'
-Vue.use(echarts)
-// Vue.prototype.$echarts = echarts
-
-new Vue({
-  el: '#app',
-  router,
-  store,
-  i18n,
-  render: h => h(App)
-})
-
-Vue.directive('loadmore', {
-  bind(el, binding) {
-    const selectWrap = el.querySelector('.el-table__body-wrapper')
-    selectWrap.addEventListener('scroll', function() {
-      let sign = 0
-      const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight
-      if (scrollDistance <= sign) {
-        binding.value()
-      }
-    })
-  }
+Vue.use(UmyUi);
+// register global utility filters
+Object.keys(filters).forEach(key => {
+  Vue.filter(key, filters[key])
+})
+
+import echarts from 'echarts'
+Vue.use(echarts)
+// Vue.prototype.$echarts = echarts
+
+new Vue({
+  el: '#app',
+  router,
+  store,
+  i18n,
+  render: h => h(App)
+})
+
+Vue.directive('loadmore', {
+  bind(el, binding) {
+    const selectWrap = el.querySelector('.el-table__body-wrapper')
+    selectWrap.addEventListener('scroll', function() {
+      let sign = 0
+      const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight
+      if (scrollDistance <= sign) {
+        binding.value()
+      }
+    })
+  }
 })

src/views/formulationPlan/dhedFormula/index.vue

@@ -2062,6 +2062,7 @@ export default {
       this.table.temp.w6 = row.w6
 
       var obj = {}
+      obj.userId = Cookies.get('employeid')
       obj.pastureid = row.pastureid
       obj.id = row.id
       obj.data = []
@@ -2206,7 +2207,8 @@ export default {
         supplement: '@insertSpotList2.supplement',
         feedweight: row.feedweight,
         supplyweight: row.supplyweight,
-        ratio: row.ratio
+        ratio: row.ratio,
+        userId: Cookies.get('employeid')
       }}
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('编辑保存发送参数', this.requestParam)

src/views/formulationPlan/recipeTemplate/index.vue

@@ -784,6 +784,7 @@
             </el-table-column>
             <!-- <el-table-column label="序号" width="60px" align="center" prop="sort" /> -->
             <el-table-column label="修改时间" width="100px" align="center" prop="datetime1" />
+            <el-table-column label="修改用户" width="130px" align="center" prop="empname" />
             <el-table-column label="饲料名称(单位:kg)" min-width="800px" align="center">
               <template slot-scope="scope">
                 <div v-for="element in scope.row.arrList" :key="element.name" class="list-group-item2 item" style="width:150px;float: left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin: 5px 5px;padding: 0;height: 30px;">
@@ -1537,6 +1538,7 @@ export default {
           this.requestParam3.parammaps = {}
           this.requestParam3.parammaps.id = this.table.temp.id
           this.requestParam3.parammaps.createdate = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+          this.requestParam3.parammaps.userId = Cookies.get('employeid')
           PostDataByName(this.requestParam3).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
@@ -2357,6 +2359,7 @@ export default {
       let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
       this.requestParam.common = { 'returnmap': '0' }
       this.requestParam.createdate = dateTime
+      this.requestParam.userId = Cookies.get('employeid')
       this.requestParam.data = []
       this.requestParam.data[0] = { 'name': 'insertFTdetail', 'type': 'e', 'parammaps': {
         pastureid: this.table2.temp.pastureid,
@@ -2389,11 +2392,13 @@ export default {
         dateTime: dateTime,
         slid: 0,
         fid: row.fid,
-        autosecond: row.autosecond
+        autosecond: row.autosecond,
+        userId: Cookies.get('employeid')
       }}
       this.requestParam.data[4] = { 'name': 'insertFTHistory', 'type': 'e', 'parammaps': {
         id:this.table2.getdataListParm.parammaps.ftid,
-        createdate:dateTime
+        createdate:dateTime,
+        userId: Cookies.get('employeid')
       }}
       const url = 'authdata/ftdetail/edit'
       const data = this.requestParam
@@ -2566,6 +2571,7 @@ export default {
           let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
           this.requestParam.common = { 'returnmap': '0' }
           this.requestParam.createdate = dateTime
+          this.requestParam.userId = Cookies.get('employeid')
           this.requestParam.data = []
           this.requestParam.data[0] = { 'name': 'insertFitHistory', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
@@ -2575,7 +2581,8 @@ export default {
             dateTime: dateTime,
             slid: this.table2.temp.id,
             fid: row.fid,
-            autosecond: row.autosecond
+            autosecond: row.autosecond,
+            userId: Cookies.get('employeid')
           }}
           this.requestParam.data[1] = { 'name': 'updateFTdetail', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
@@ -2609,7 +2616,8 @@ export default {
           }}
           this.requestParam.data[5] = { 'name': 'insertFTHistory', 'type': 'e', 'parammaps': {
             id:this.table2.getdataListParm.parammaps.ftid,
-            createdate:dateTime
+            createdate:dateTime,
+            userId: Cookies.get('employeid')
           }}
           const url = 'authdata/ftdetail/edit'
           const data = this.requestParam
@@ -2671,7 +2679,8 @@ export default {
             dateTime: dateTime,
             slid: row.id,
             fid: row.fid,
-            autosecond: row.autosecond
+            autosecond: row.autosecond,
+            userId: Cookies.get('employeid')
           }}
           this.requestParam.data[1] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
@@ -2689,11 +2698,13 @@ export default {
           }}
           this.requestParam.data[4] = { 'name': 'insertFTHistory', 'type': 'e', 'parammaps': {
             id:this.table2.getdataListParm.parammaps.ftid,
-            createdate:dateTime
+            createdate:dateTime,
+            userId: Cookies.get('employeid')
           }}
         } else {
           this.requestParam.common = { 'returnmap': '0' }
           this.requestParam.createdate = dateTime
+          this.requestParam.userId = Cookies.get('employeid')
           this.requestParam.data = []
           // this.requestParam.data[1] = { 'name': 'checkdeleteFT', 'type': 'v', 'parammaps': {
           //   pastureid: this.table2.getdataListParm.parammaps.pastureid,
@@ -2707,7 +2718,8 @@ export default {
             dateTime: dateTime,
             slid: row.id,
             fid: row.fid,
-            autosecond: row.autosecond
+            autosecond: row.autosecond,
+            userId: Cookies.get('employeid')
           }}
           this.requestParam.data[1] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
@@ -2725,7 +2737,8 @@ export default {
           }}
           this.requestParam.data[4] = { 'name': 'insertFTHistory', 'type': 'e', 'parammaps': {
             id:this.table2.getdataListParm.parammaps.ftid,
-            createdate:dateTime
+            createdate:dateTime,
+            userId: Cookies.get('employeid')
           }}
         }
         const url = 'authdata/ftdetail/edit'
@@ -2774,6 +2787,7 @@ export default {
           if (this.table2.list.length - this.selectList2.length > 0) {
             this.requestParam.common = { 'returnmap': '0' }
             this.requestParam.createdate = dateTime
+            this.requestParam.userId = Cookies.get('employeid')
             this.requestParam.data = []
             this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList2 }}
             this.requestParam.data[0].children = []
@@ -2785,7 +2799,8 @@ export default {
               dateTime: dateTime,
               slid: '@insertSpotList.id',
               fid: '@insertSpotList.fid',
-              autosecond: '@insertSpotList.autosecond'
+              autosecond: '@insertSpotList.autosecond',
+              userId: Cookies.get('employeid')
             }}
             this.requestParam.data[0].children[1] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
               id: '@insertSpotList.id',
@@ -2803,7 +2818,8 @@ export default {
             }}
             this.requestParam.data[3] = { 'name': 'insertFTHistory', 'type': 'e', 'parammaps': {
               id:this.table2.getdataListParm.parammaps.ftid,
-              createdate:dateTime
+              createdate:dateTime,
+              userId: Cookies.get('employeid')
             }}
             const url = 'authdata/ftdetail/edit'
             const data = this.requestParam

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

@@ -840,6 +840,7 @@
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
             <el-table-column label="修改时间" width="130px" align="center" prop="createdate" />
+            <el-table-column label="修改用户" width="130px" align="center" prop="empname" />
             <el-table-column label="配方名称" min-width="70px" align="center"  prop="tname">
               <template slot-scope="{row}">
                 <span v-if="row.tname !==undefined &&row.tname.indexOf('/') !== -1" style="color: red;">
@@ -979,6 +980,7 @@
               </template>
             </el-table-column>
             <el-table-column label="修改时间" min-width="100px" align="center" prop="updateTime" />
+            <el-table-column label="修改用户" width="130px" align="center" prop="empname" />
             <el-table-column label="饲料重量（KG）" min-width="100px" align="center">
               <template slot-scope="{row}">
                 <span v-if="row.weight !==undefined &&row.weight.indexOf('/') !== -1" style="color: red;">
@@ -1021,6 +1023,7 @@
                 >
                   <u-table-column label="序号" width="50px" align="center" type="index" />
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
+                  <u-table-column label="修改用户" width="130px" align="center" prop="empname" />
                   <u-table-column label="班次" min-width="100px" align="center" prop="times" />
                   <u-table-column label="实际牛头数" min-width="100px" align="center" prop="ccount">
                     <template slot-scope="{row}">
@@ -1081,6 +1084,7 @@
                   >
                   <u-table-column label="序号" width="50px" align="center" type="index" />
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
+                  <u-table-column label="修改用户" width="130px" align="center" prop="empname" />
                   <u-table-column label="班次" width="100px" align="center" prop="times" />
                   <!-- <u-table-column v-for="(item, index) in fenceTemp.tab2.tableLabel" :key="index" align="center" :min-width="item.width" :prop="item.prop" :label="item.label"> -->
                   <u-table-column v-for="(item, index) in fenceTemp.tab2.tableLabel" :key="index" align="center" :min-width="item.width" :prop="item.prop"  :label="item.label">