路由页面

src/router/index.js

@@ -10,9 +10,11 @@ import Cate from '@/views/goods/Cate.vue'
 import Time from '@/views/goods/Time.vue'
 import Roles1 from '@/views/power/Roles1.vue'
 
+import FeedProcess from '@/views/dataStatistics/FeedProcess.vue'
+import CowInfo from '@/views/cowManagement/CowInfo.vue'
+import EventRecord from '@/views/cowManagement/EventRecord.vue'
 
 
-import CowInfo from '@/views/cowManagement/CowInfo.vue'
 
 import CowCowShed from '@/views/cowShedManagement/CowCowShed.vue'
 import CowShedGroup from '@/views/cowShedManagement/CowShedGroup.vue'
@@ -25,9 +27,11 @@ import WorkOrderType from '@/views/basicSettings/WorkOrderType.vue'
 import FeedCarManagement from '@/views/basicSettings/FeedCarManagement.vue'
 import DiseaseType from '@/views/basicSettings/DiseaseType.vue'
 import FeedTemplate from '@/views/basicSettings/FeedTemplate.vue'
+import DefaultPara from '@/views/basicSettings/DefaultPara.vue'
+import FeedCost from '@/views/basicSettings/FeedCost.vue'
 
 import User from '@/views/systemManagement/User.vue'
-
+import Role from '@/views/systemManagement/Role.vue'
 
 
 Vue.use(Router)
@@ -49,16 +53,21 @@ const router =  new Router({
         { path: '/welcome', component: Welcome },
          
 
-        { path: '/users', component: Users },
-        { path: '/rights', component: Rights },
-        { path: '/roles', component: Roles },
-        { path: '/roles1', component: Roles1 },
-        { path: '/categories', component: Cate },
-        { path: '/time', component: Time },
 
+        
 
-        { path: '/CowInfo', component: CowInfo },
+        // { path: '/users', component: Users },
+        // { path: '/rights', component: Rights },
+        // { path: '/roles', component: Roles },
+        // { path: '/roles1', component: Roles1 },
+        // { path: '/categories', component: Cate },
+        // { path: '/time', component: Time },
+
+        { path: '/FeedProcess', component: FeedProcess },
 
+        { path: '/CowInfo', component: CowInfo },
+        { path: '/EventRecord', component: EventRecord },
+        
 
         { path: '/CowCowShed', component: CowCowShed },
         { path: '/CowShedGroup', component: CowShedGroup },
@@ -71,10 +80,15 @@ const router =  new Router({
         { path: '/FeedCarManagement', component: FeedCarManagement },
         { path: '/DiseaseType', component: DiseaseType },
         { path: '/FeedTemplate', component: FeedTemplate },
+        { path: '/DefaultPara', component: DefaultPara },
+        { path: '/FeedCost', component: FeedCost },
 
-        { path: '/User', component: User },
+ 
 
 
+        { path: '/User', component: User },
+        { path: '/Role', component: Role },
+        
 
  
         

src/views/Home.vue

@@ -106,12 +106,19 @@ export default {
         //     // {id:204,authName:"权限列表",iconclass:'iconfont el-icon-message',path: 'rights'},
         //   ]
         // },
+        {
+          authName:"数据统计", id:20, order:1,iconclass:'iconfont el-icon-s-order',
+          children:[
+            {id:101,authName:"饲喂过程",iconclass:'iconfont el-icon-message',path: 'FeedProcess'},
+             
+          ]
+        },
         {
           authName:"牛只管理", id:20, order:1,iconclass:'iconfont el-icon-s-order',
           children:[
-            {id:302,authName:"牛只信息",iconclass:'iconfont el-icon-message',path: 'CowInfo'},
-            // {id:203,authName:"角色列表",iconclass:'iconfont el-icon-message',path: 'roles1'},
-            // {id:204,authName:"权限列表",iconclass:'iconfont el-icon-message',path: 'rights'},
+            {id:201,authName:"牛只信息",iconclass:'iconfont el-icon-message',path: 'CowInfo'},
+            {id:202,authName:"事件记录",iconclass:'iconfont el-icon-message',path: 'EventRecord'},
+   
           ]
         },
         {
@@ -140,7 +147,10 @@ export default {
            {id:602,authName:"工单类型",iconclass:'iconfont el-icon-message',path: 'WorkOrderType'},
            {id:603,authName:"饲喂车管理",iconclass:'iconfont el-icon-message',path: 'FeedCarManagement'},
           //  {id:604,authName:"疾病类型",iconclass:'iconfont el-icon-message',path: 'DiseaseType'},
-          {id:605,authName:"预设饲喂模板",iconclass:'iconfont el-icon-message',path: 'FeedTemplate'},
+           {id:605,authName:"预设饲喂模板",iconclass:'iconfont el-icon-message',path: 'FeedTemplate'},
+
+           {id:606,authName:"默认标准参数",iconclass:'iconfont el-icon-message',path: 'DefaultPara'},
+           {id:607,authName:"饲料成本设置",iconclass:'iconfont el-icon-message',path: 'FeedCost'},
             
           ]
         },
@@ -148,9 +158,9 @@ export default {
         {
           authName:"系统管理", id:60, order:6,iconclass:'iconfont el-icon-s-order',
           children:[
-           {id:701,authName:"用户管理",iconclass:'iconfont el-icon-message',path: 'User'},
-
-            
+            {id:701,authName:"用户管理",iconclass:'iconfont el-icon-message',path: 'User'},
+            {id:702,authName:"角色管理",iconclass:'iconfont el-icon-message',path: 'Role'},
+              
           ]
         },
 

src/views/basicSettings/DefaultPara.vue

@@ -0,0 +1,425 @@
+<template>
+ 
+  <div>
+   待开发页面
+
+   
+
+ 
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+
+
+    
+ 
+  
+    return {
+
+ 
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/barn/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/barn/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/barn/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/barn/delete', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+
+      //接口 - 下拉框 列表 栏舍组
+      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        name: "",
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      //栏舍状态
+      statusList:[
+        {id: 1, value: '正常'},
+        {id: 2, value: '空栏'},
+        {id: 3, value: '损坏'},
+      ],
+
+    
+
+      //栏舍组下拉
+      barnGroupList:[
+         
+      ],
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        // name: [
+        //   { required: true, message: '类型必填', trigger: 'blur' },
+        // ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      // this.get_auto_buttons 
+     
+
+     //获取下拉框
+       //this.get_select_list1()
+
+      //表格 - 初始化 
+        //this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost(me.url_get_select2, { name: ""}).then(e => {
+          console.log("栏舍组下拉框：",e)
+
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.barnGroupList = []
+          } else {
+            me.barnGroupList = e.data.list
+          }
+
+         
+  
+        })
+
+
+        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+        //   console.log("牧场下拉框1：",e)
+
+        //   //打印请求成功结果
+        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+        //     me.pastureList = []
+        //   } else {
+        //     me.pastureList = e.data
+        //   }
+  
+        // })
+
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果：",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+      this.addForm.id = undefined
+      this.addForm.barn_group_id = undefined
+      this.addForm.number = ''
+       
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      this.reset_form()
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_table, send_data).then(e => {
+                console.log("新增结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+    
+              "id": me.addForm.id,
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+          }
+
+          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+          // console.log(name)
+
+           // 编辑保存
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数：", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+ 
+    form_export() {
+    //获取请求表格数据的参数
+    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+    //请求表格
+    // GetDataByName(this.download.getdataListParm).then(response => {
+    //     if (response.data.list !== null) {
+    //       this.download.list = response.data.list
+    //     } else {
+    //       this.download.list = []
+    //     }
+    //     var excelDatas = [
+    //       {
+    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+    //         tableDatas: this.download.list,
+    //         sheetName: 'Sheet1'
+    //       }
+    //     ]
+    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    // })
+
+    var excelDatas = [
+        {
+            tHeader: ['表头1', '表头2', '表头3', '表头4',],
+            filterVal: ['title1', 'title2', 'title3', 'title4'],
+            tableDatas: [ 
+                {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+            ],
+            sheetName: 'Sheet1'
+        }
+    ]
+    json2excel(excelDatas, '表格大标题', true, 'xlsx')
+}
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped，则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

src/views/basicSettings/FeedCost.vue

@@ -0,0 +1,425 @@
+<template>
+ 
+  <div>
+   待开发页面
+
+   
+
+ 
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+
+
+    
+ 
+  
+    return {
+
+ 
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/barn/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/barn/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/barn/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/barn/delete', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+
+      //接口 - 下拉框 列表 栏舍组
+      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        name: "",
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      //栏舍状态
+      statusList:[
+        {id: 1, value: '正常'},
+        {id: 2, value: '空栏'},
+        {id: 3, value: '损坏'},
+      ],
+
+    
+
+      //栏舍组下拉
+      barnGroupList:[
+         
+      ],
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        // name: [
+        //   { required: true, message: '类型必填', trigger: 'blur' },
+        // ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      // this.get_auto_buttons 
+     
+
+     //获取下拉框
+       //this.get_select_list1()
+
+      //表格 - 初始化 
+        //this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost(me.url_get_select2, { name: ""}).then(e => {
+          console.log("栏舍组下拉框：",e)
+
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.barnGroupList = []
+          } else {
+            me.barnGroupList = e.data.list
+          }
+
+         
+  
+        })
+
+
+        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+        //   console.log("牧场下拉框1：",e)
+
+        //   //打印请求成功结果
+        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+        //     me.pastureList = []
+        //   } else {
+        //     me.pastureList = e.data
+        //   }
+  
+        // })
+
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果：",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+      this.addForm.id = undefined
+      this.addForm.barn_group_id = undefined
+      this.addForm.number = ''
+       
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      this.reset_form()
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_table, send_data).then(e => {
+                console.log("新增结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+    
+              "id": me.addForm.id,
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+          }
+
+          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+          // console.log(name)
+
+           // 编辑保存
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数：", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+ 
+    form_export() {
+    //获取请求表格数据的参数
+    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+    //请求表格
+    // GetDataByName(this.download.getdataListParm).then(response => {
+    //     if (response.data.list !== null) {
+    //       this.download.list = response.data.list
+    //     } else {
+    //       this.download.list = []
+    //     }
+    //     var excelDatas = [
+    //       {
+    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+    //         tableDatas: this.download.list,
+    //         sheetName: 'Sheet1'
+    //       }
+    //     ]
+    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    // })
+
+    var excelDatas = [
+        {
+            tHeader: ['表头1', '表头2', '表头3', '表头4',],
+            filterVal: ['title1', 'title2', 'title3', 'title4'],
+            tableDatas: [ 
+                {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+            ],
+            sheetName: 'Sheet1'
+        }
+    ]
+    json2excel(excelDatas, '表格大标题', true, 'xlsx')
+}
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped，则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

src/views/cowManagement/EventRecord.vue

@@ -0,0 +1,425 @@
+<template>
+ 
+  <div>
+   待开发页面
+
+   
+
+ 
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+
+
+    
+ 
+  
+    return {
+
+ 
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/barn/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/barn/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/barn/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/barn/delete', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+
+      //接口 - 下拉框 列表 栏舍组
+      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        name: "",
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      //栏舍状态
+      statusList:[
+        {id: 1, value: '正常'},
+        {id: 2, value: '空栏'},
+        {id: 3, value: '损坏'},
+      ],
+
+    
+
+      //栏舍组下拉
+      barnGroupList:[
+         
+      ],
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        // name: [
+        //   { required: true, message: '类型必填', trigger: 'blur' },
+        // ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      // this.get_auto_buttons 
+     
+
+     //获取下拉框
+       //this.get_select_list1()
+
+      //表格 - 初始化 
+        //this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost(me.url_get_select2, { name: ""}).then(e => {
+          console.log("栏舍组下拉框：",e)
+
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.barnGroupList = []
+          } else {
+            me.barnGroupList = e.data.list
+          }
+
+         
+  
+        })
+
+
+        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+        //   console.log("牧场下拉框1：",e)
+
+        //   //打印请求成功结果
+        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+        //     me.pastureList = []
+        //   } else {
+        //     me.pastureList = e.data
+        //   }
+  
+        // })
+
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果：",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+      this.addForm.id = undefined
+      this.addForm.barn_group_id = undefined
+      this.addForm.number = ''
+       
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      this.reset_form()
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_table, send_data).then(e => {
+                console.log("新增结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+    
+              "id": me.addForm.id,
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+          }
+
+          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+          // console.log(name)
+
+           // 编辑保存
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数：", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+ 
+    form_export() {
+    //获取请求表格数据的参数
+    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+    //请求表格
+    // GetDataByName(this.download.getdataListParm).then(response => {
+    //     if (response.data.list !== null) {
+    //       this.download.list = response.data.list
+    //     } else {
+    //       this.download.list = []
+    //     }
+    //     var excelDatas = [
+    //       {
+    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+    //         tableDatas: this.download.list,
+    //         sheetName: 'Sheet1'
+    //       }
+    //     ]
+    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    // })
+
+    var excelDatas = [
+        {
+            tHeader: ['表头1', '表头2', '表头3', '表头4',],
+            filterVal: ['title1', 'title2', 'title3', 'title4'],
+            tableDatas: [ 
+                {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+            ],
+            sheetName: 'Sheet1'
+        }
+    ]
+    json2excel(excelDatas, '表格大标题', true, 'xlsx')
+}
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped，则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

src/views/dataStatistics/FeedProcess.vue

@@ -0,0 +1,425 @@
+<template>
+ 
+  <div>
+   待开发页面
+
+   
+
+ 
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+
+
+    
+ 
+  
+    return {
+
+ 
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/barn/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/barn/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/barn/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/barn/delete', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+
+      //接口 - 下拉框 列表 栏舍组
+      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        name: "",
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      //栏舍状态
+      statusList:[
+        {id: 1, value: '正常'},
+        {id: 2, value: '空栏'},
+        {id: 3, value: '损坏'},
+      ],
+
+    
+
+      //栏舍组下拉
+      barnGroupList:[
+         
+      ],
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        // name: [
+        //   { required: true, message: '类型必填', trigger: 'blur' },
+        // ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      // this.get_auto_buttons 
+     
+
+     //获取下拉框
+       //this.get_select_list1()
+
+      //表格 - 初始化 
+        //this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost(me.url_get_select2, { name: ""}).then(e => {
+          console.log("栏舍组下拉框：",e)
+
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.barnGroupList = []
+          } else {
+            me.barnGroupList = e.data.list
+          }
+
+         
+  
+        })
+
+
+        // ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+        //   console.log("牧场下拉框1：",e)
+
+        //   //打印请求成功结果
+        //   if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+        //     me.pastureList = []
+        //   } else {
+        //     me.pastureList = e.data
+        //   }
+  
+        // })
+
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果：",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+      this.addForm.id = undefined
+      this.addForm.barn_group_id = undefined
+      this.addForm.number = ''
+       
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      this.reset_form()
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_table, send_data).then(e => {
+                console.log("新增结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+    
+              "id": me.addForm.id,
+              "name": me.addForm.name,
+              "barn_group_id": me.addForm.barn_group_id,
+              "number": me.addForm.number,
+          }
+
+          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+          // console.log(name)
+
+           // 编辑保存
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数：", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+ 
+    form_export() {
+    //获取请求表格数据的参数
+    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+    //请求表格
+    // GetDataByName(this.download.getdataListParm).then(response => {
+    //     if (response.data.list !== null) {
+    //       this.download.list = response.data.list
+    //     } else {
+    //       this.download.list = []
+    //     }
+    //     var excelDatas = [
+    //       {
+    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+    //         tableDatas: this.download.list,
+    //         sheetName: 'Sheet1'
+    //       }
+    //     ]
+    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    // })
+
+    var excelDatas = [
+        {
+            tHeader: ['表头1', '表头2', '表头3', '表头4',],
+            filterVal: ['title1', 'title2', 'title3', 'title4'],
+            tableDatas: [ 
+                {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+            ],
+            sheetName: 'Sheet1'
+        }
+    ]
+    json2excel(excelDatas, '表格大标题', true, 'xlsx')
+}
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped，则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

src/views/formulaPlan/FeedPlan.vue

@@ -1,7 +1,8 @@
 <template>
  
   <div>
-
+ 接口未对接页面！
+ 
 
     <el-card class="box-card">
       <!-- 搜索区域 -->

src/views/systemManagement/Role.vue

@@ -0,0 +1,691 @@
+<template>
+ 
+  <div>
+   未开发，未对接，光明的页面暂时拿过来用
+ 
+
+    <!-- 卡片视图区域 -->
+    <el-card class="box-card">
+      <div class="search-bx1">
+          <el-input v-model="sendData.roleName" placeholder="角色"  style="width: 220px;" class="g-mr20" clearable />
+      
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <el-button type="primary"   v-if="isButtonEdit" @click="form_add">添加角色</el-button>
+      </div>
+
+
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"  stripe border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="角色" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.roleName }}</span>
+          </template>
+        </el-table-column>
+ 
+        <el-table-column label="角色说明" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.remark }}</span>
+          </template>
+        </el-table-column>
+    
+ 
+        <!-- <el-table-column  label="状态"  min-width="100px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.mg_state" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"   />
+          </template>
+        </el-table-column> -->
+        <el-table-column label="操作" align="center" width="400" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="scope">
+            <!-- 修改按钮 -->
+            <el-button  v-if="isButtonEdit" type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+            <!-- 删除按钮 -->
+            <el-button  v-if="isButtonEdit" type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
+            <!-- 分配角色 -->
+            <el-button  v-if="isButtonEdit" type="warning" size="mini" icon="el-icon-setting" @click="form_set(scope.row)">分配权限</el-button>
+
+            <el-button  v-if="isButtonEdit" type="warning" size="mini" icon="el-icon-setting" @click="form_set2(scope.row)">数据权限</el-button>
+
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="sendData.pageNum" :page-sizes="[1,5,10,20,30,50]"  :page-size="sendData.pageSize" layout="total, prev, pager, next" :total="sendData.total"/>
+    </el-card>
+
+
+    <!-- 弹窗 新增or修改 -->
+    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+      <div class="">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="70px"  style="width:50%;margin:0 auto 50px">
+            <el-form-item label="角色名" prop="roleName">
+                <el-input   v-model="addForm.roleName"  ></el-input>  
+            </el-form-item>
+            <el-form-item label="角色说明" prop="remark">
+                <el-input   v-model="addForm.remark"></el-input>  
+            </el-form-item>
+            
+            
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+          <el-button @click="addFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+
+     
+    <!-- 弹窗 分配 -->
+    <el-dialog  title="分配权限" :visible.sync="setFormShow" @close="set_dialog_close" width="50%">
+      <div class="">
+        <el-form  ref="setFormRef"    :model="setForm"  label-position="right" label-width="70px"  style="width:50%;margin:0 auto 50px">
+           
+           <!-- 树形控件 -->
+         <el-tree  ref="tree" :data="rightlist" :props="treeProps" show-checkbox   node-key="menuId"  default-expand-all :default-checked-keys="checkedIdArr" check-strictly    @check-change="change_check"> </el-tree>
+     
+            
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="set_dialog_save()">确认</el-button>
+          <el-button @click="setFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <el-dialog  title="数据权限" :visible.sync="setFormShow2" @close="set_dialog_close2" width="50%">
+      <div class="">
+        <el-form  ref="setFormRef2"    :model="setForm2"  label-position="right" label-width="70px"  style="width:50%;margin:0 auto 50px">
+           
+          <el-form-item label="数据权限" prop="datarole">
+            <el-radio-group v-model="setForm2.datarole">
+              <el-radio :label="1">全部数据</el-radio>
+              <el-radio :label="0">牧场数据</el-radio>
+         
+            </el-radio-group>
+          </el-form-item>
+    
+            
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="set_dialog_save2()">确认</el-button>
+          <el-button @click="setFormShow2 = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+ 
+  </div>
+
+
+</template> 
+
+<script>
+import { ajaxDataGet, ajaxDataPost, checkButtons} from '@/api/common'
+
+export default {
+  data() {
+
+    
+    
+    return {
+
+
+      
+      //接口 - 获取 - 表格
+      url_get_table:'/role/getAll',
+      //接口 - 新增 - 表格
+      url_add_table:'/role/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/role/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/role/delete', 
+      
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      sendData:{
+        "roleName": "",
+        "pageNum": 1,  //页码
+        "pageSize": 10,   //每页数量
+        "total":0,  //总页数
+        "pastureId": sessionStorage.getItem('g_pastureId')
+      },
+
+      tableLoading: false,
+      //表格内容
+      tableList:[
+         
+      ],
+
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改用户',  create: '新增用户' },
+      addForm:{
+        roleName:'',remark:'' 
+      },
+
+      addFormRules:{
+        roleName: [
+          { required: true, message: '用户名必填', trigger: 'blur' },
+          
+        ],
+        // password: [
+        //   { required: true, message: '密码必填', trigger: 'blur' },
+        //   { min: 3, max: 15, message: '长度3-15个字符之间', trigger: 'blur' },
+        // ],
+        // email: [
+        //   { required: true, message: '邮箱必填', trigger: 'blur' },
+        //   { validator: checkEmail, trigger: 'blur' },
+        // ],
+        // mobile: [
+        //   { required: true, message: '手机号必填', trigger: 'blur' },
+        //   { validator: checkMobile, trigger: 'blur' },
+        // ],
+
+      },
+
+
+      setFormShow:false,
+      setForm:{
+          username:'',password:'',email:'',mobile:'',roleList:[2,3]
+      },
+   
+       
+      //权限数据
+      rightlist: [
+        // { "menuName": "功能模块", "parentId": 0,  "sort": 1,  "path": null, "menuId": 208,
+        //     "children": [
+        //         {"menuName": "设备基础信息", "parentId": 208, "sort": 2, "path": null, "menuId": 209 },
+        //         {"menuName": "故障管理", "parentId": 208, "sort": 3,"path": null,"menuId": 210 },
+        //         {"menuName": "设备绑定",  "parentId": 208,"sort": 4, "path": null, "menuId": 211},
+        //         {"menuName": "备件管理","parentId": 208,"sort": 5,"path": null,"menuId": 212},
+        //         {"menuName": "盘点","parentId": 208,"sort": 6,"path": null,"menuId": 213},
+        //         {"menuName": "维修记录","parentId": 208,"sort": 7,"path": null,"menuId": 225}
+        //     ]
+        // },
+        // { "menuName": "工单模块","parentId": 0,"sort": 7,"path": null,"menuId": 214,
+        //     "children": [
+        //         {"menuName": "维修接单","parentId": 214,"sort": 8,"path": null,"menuId": 215},
+        //         {"menuName": "维修","parentId": 214,"sort": 9,"path": null,"menuId": 216},
+        //         {"menuName": "预防性维护","parentId": 214,"sort": 10,"path": null,"menuId": 217},
+        //         {"menuName": "工单跟踪","parentId": 214,"sort": 18, "path": null,"menuId": 226}
+        //     ]
+        // },
+        // {"menuName": "报修模块","parentId": 0,"sort": 11,"path": null,"menuId": 218,
+        //     "children": [
+        //         {"menuName": "报修","parentId": 218,"sort": 12, "path": null,"menuId": 219},
+        //         {"menuName": "派单","parentId": 218,"sort": 13,"path": null,"menuId": 220}
+        //     ]
+        // },
+        // {"menuName": "审核模块","parentId": 0,"sort": 14,"path": null,"menuId": 221,
+        //     "children": [
+        //         {"menuName": "维修审核","parentId": 221,"sort": 15, "path": null,"menuId": 222},
+        //         {"menuName": "领用审核", "parentId": 221,"sort": 16, "path": null,"menuId": 223},
+        //         {"menuName": "维护审核", "parentId": 221, "sort": 17,"path": null, "menuId": 224}
+        //     ]
+        // },
+        // {"menuName": "PC用户管理","parentId": 0,"sort": 30,"path": null,"menuId": 331,
+        //     "children": [
+        //         {"menuName": "用户管理","parentId": 331,"sort": 18, "path": null,"menuId": 332,
+        //           "children": [
+        //               {"menuName": "用户管理查看","parentId": 221,"sort": 15, "path": null,"menuId": 222},
+        //               {"menuName": "用户管理编辑","parentId": 221,"sort": 15, "path": null,"menuId": 222},
+        //           ]
+        //       },
+        //     ]
+        // },
+        // {"menuName": "PC权限管理","parentId": 0,"sort": 30,"path": null,"menuId": 331,
+        //     "children": [
+        //         {"menuName": "角色列表","parentId": 331,"sort": 18, "path": null,"menuId": 332,
+        //           "children": [
+        //               {"menuName": "角色列表查看","parentId": 221,"sort": 15, "path": null,"menuId": 222},
+        //               {"menuName": "角色列表编辑","parentId": 221,"sort": 15, "path": null,"menuId": 222},
+        //           ]
+        //       },
+        //     ]
+        // },
+        // {"menuName": "PC内容管理","parentId": 0,"sort": 30,"path": null,"menuId": 331,
+        //     "children": [
+        //         {"menuName": "工时","parentId": 331,"sort": 18, "path": null,"menuId": 332,
+        //           "children": [
+        //               {"menuName": "工时查看","parentId": 221,"sort": 15, "path": null,"menuId": 222},
+                     
+        //           ]
+        //       },
+        //     ]
+        // }
+    ],
+      
+      
+     
+
+      //树形控件的属性绑定对象
+      treeProps:{
+        label:'menuName',children:'children'
+      },
+
+      //树形默认选中的值
+      checkedIdArr:[],
+
+      setFormShow2:false,
+      setForm2:{
+        datarole:0 
+      },  
+       
+    }
+  },
+  created(){
+
+    
+
+
+      //表格 - 初始化 
+       // this.get_table_data()
+       //下拉框
+        // this.get_select_list1()
+
+
+       
+
+      //  console.log("this.$store.state.buttonsList==============",this.$store.state.buttonsList)
+ 
+
+      //  const isButtonEdit = checkButtons(this.$store.state.buttonsList, "角色列表编辑")
+      //  this.isButtonEdit = isButtonEdit
+      //  console.log('this.isButtonEdit==========',this.isButtonEdit)
+
+
+        
+  },
+  
+  methods:{
+
+ 
+    get_select_list1(){
+      var me = this
+      ajaxDataGet('/menu/tree', {"onlyMenu": false, "isPc":""}).then(e => {
+        console.log("下拉框1：",e)
+
+ 
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.rightlist = []
+          } else {
+            me.rightlist = e.data
+          }
+
+         
+  
+        })
+    },
+
+
+    form_search(){
+      var me = this
+      console.log('请求表格列表sendData',me.sendData)
+      this.get_table_data()
+
+    },
+
+    //获取 表格
+    get_table_data() {
+ 
+      var me = this
+
+      me.tableLoading = true
+      console.log("sendData======>", me.sendData)
+
+        ajaxDataGet(me.url_get_table,  me.sendData).then(e => {
+          console.log("表格请求结果：",e)
+            //打印请求成功结果
+            if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+              me.tableList = []
+            } else {
+              me.tableList = e.data
+              me.sendData.total = e.count;	// 总数
+              me.sendData.pageNum = e.pageNum;	//页码
+              me.sendData.pageSize = e.pageSize;	//每页数量
+            }
+
+            setTimeout(() => {
+              me.tableLoading = false
+            }, 100)
+
+          })
+
+        
+    },
+
+
+    //监听 pagesize 改变的事件
+    change_size_page(item){
+      console.log(item)
+ 
+    },
+
+    //监听 pagenum 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.sendData.pageNum = item
+       this.get_table_data()
+    },
+
+
+    form_add() {
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    form_edit(row) {
+      console.log('row', row)
+      this.addForm = Object.assign({}, row) // copy obj
+
+      this.addFormStatus = 'edit'
+
+
+
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //监听关闭对话框
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+
+    add_dialog_save() {
+      var me = this
+      
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+
+          console.log(me.addForm )
+          //发起请求
+
+          var send_data = {
+              "roleName": me.addForm.roleName,
+              "remark":  me.addForm.remark
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPost(me.url_add_table, send_data).then(e => {
+          console.log("新增结果：",e)
+            //打印请求成功结果
+            if(e.msg == "success"  ){
+              me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+              //关闭弹窗
+              me.addFormShow = false
+              me.get_table_data()
+            } else {
+              me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+            }
+          })
+          
+          
+        }
+      })
+
+
+
+    },
+
+    edit_dialog_save(){
+      var me = this
+      
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+
+          console.log(me.addForm )
+          //发起请求
+
+          var send_data = {
+              "roleName": me.addForm.roleName,
+              "remark":  me.addForm.remark,
+              "roleId":  me.addForm.roleId,
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送编辑保存
+          ajaxDataPost(me.url_edit_table, send_data).then(e => {
+           console.log("编辑结果：",e)
+            //打印请求成功结果
+            if(e.msg == "success"  ){
+              me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+              //关闭弹窗
+              me.addFormShow = false
+              me.get_table_data()
+            } else {
+              me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+            }
+          })
+          
+          
+        }
+      })
+    },
+
+    form_delete(row) {
+      var me = this
+
+      var send_data = {
+    
+              "roleId":  row.roleId
+          }
+
+       me.$confirm('是否删除该角色?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+
+           //加载 - 发送编辑保存
+           ajaxDataPost(me.url_delete_table, send_data).then(e => {
+            console.log("删除结果：",e)
+              //打印请求成功结果
+              if(e.msg == "success"  ){
+                me.$message({ type: 'success', message: '删除成功！'  , duration: 2000 })
+                //关闭弹窗
+                me.addFormShow = false
+                me.get_table_data()
+              } else {
+                me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+              }
+          })
+          // me.$message({
+          //   type: 'success',
+          //   message: '删除成功!'
+          // });
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+
+    
+    form_set(row) {
+
+
+      
+      console.log('row', row)
+      this.setForm = Object.assign({}, row) 
+
+      this.checkedIdArr = row.menuIdList
+      
+      this.setFormShow = true
+      this.$nextTick(() => {
+        this.$refs['setFormRef'].clearValidate()
+      })
+    },
+
+
+
+    //监听关闭对话框
+    set_dialog_close(){
+       //内容重置
+       this.$refs['setFormRef'].resetFields()
+       this.checkedIdArr = []
+       //清空树
+       this.$refs.tree.setCheckedKeys([]);
+    },
+
+    
+    change_check() {
+      var checkedKeys = this.$refs.tree.getCheckedKeys() // 所有被选中的节点的 key 所组成的数组数据
+      console.log(checkedKeys)
+      this.checkedIdArr = checkedKeys
+    },
+
+    set_dialog_save() {
+      var me = this
+      console.log(me.setForm)
+    
+      console.log(me.checkedIdArr)
+
+      
+ 
+
+      this.$refs['setFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+
+          console.log(me.addForm )
+          //发起请求
+
+          var send_data = {
+            "roleId": me.setForm.roleId,
+            "menuIdList": me.checkedIdArr
+ 
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送编辑保存
+         ajaxDataPost('/role/menu/updateRoleMenu', send_data).then(e => {
+          console.log("编辑结果：",e)
+            //打印请求成功结果
+            if(e.msg == "success"  ){
+              me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+              //关闭弹窗
+              me.setFormShow = false
+              me.get_table_data()
+            } else {
+              me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+            }
+          })
+          
+          
+        }
+      })
+
+
+    },
+
+
+    form_set2(row) {
+
+
+            
+      console.log('row', row)
+      this.setForm2 = Object.assign({}, row) 
+
+    
+      this.setFormShow2 = true
+      this.$nextTick(() => {
+        this.$refs['setFormRef2'].clearValidate()
+      })
+    },
+
+
+
+    //监听关闭对话框
+    set_dialog_close2(){
+      //内容重置
+      this.$refs['setFormRef2'].resetFields()
+ 
+    },
+
+    set_dialog_save2() {
+      var me = this
+      console.log(me.setForm2)
+    
+    
+
+      this.$refs['setFormRef2'].validate(valid => {
+        //验证成功
+        if (valid) {
+
+          console.log(me.setForm2 )
+          //发起请求
+
+          var send_data = {
+            "roleId": me.setForm2.roleId,
+            "datarole": me.setForm2.datarole
+ 
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送编辑保存
+         ajaxDataPost('/role/data/update', send_data).then(e => {
+          console.log("编辑结果：",e)
+            //打印请求成功结果
+            if(e.msg == "success"  ){
+              me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+              //关闭弹窗
+              me.setFormShow2 = false
+              me.get_table_data()
+            } else {
+              me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+            }
+          })
+          
+          
+        }
+      })
+
+
+    },
+
+
+  }
+}
+</script>
+<!-- 加了scoped，则是仅在此组件里生效 -->
+<style scoped> 
+</style>