Merge branch 'develop' of Epans/calf-feed-pc into master

.drone.yml

@@ -0,0 +1,42 @@
+kind: pipeline
+type: docker
+name: calf-feed-admin
+
+steps:
+  - name: build
+    image: plugins/docker
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      dockerfile: /drone/src/Dockerfile
+      username:
+        from_secret: aliyun_name
+      password:
+        from_secret: aliyun_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/calf-feed-admin
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tags: [ 1.0.0,latest ]
+
+trigger:
+  branch:
+    include:
+      - develop
+  event:
+    include:
+      - push
+
+volumes:
+  - name: host
+    host:
+      path: /etc/host
+  - name: docker-ca
+    host:
+      path: /ect/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock

.gitignore

@@ -20,4 +20,4 @@ pnpm-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?

Dockerfile

@@ -0,0 +1,16 @@
+FROM node:14.0.0 as builder
+WORKDIR /app/calf-feed-admin
+#拷贝源码
+COPY . .
+#安装依赖
+RUN npm config set sass_binary_site=https://npm.taobao.org/mirrors/node-sass
+RUN npm install
+
+# 开始构建
+RUN npm run build
+
+# 第二阶段构建
+FROM nginx:alpine
+COPY --from=builder /app/calf-feed-admin/dist/ /usr/share/nginx/html/
+COPY --from=builder /app/calf-feed-admin/default.conf.template /etc/nginx/templates/default.conf.template
+EXPOSE 80

default.conf.template

@@ -0,0 +1,53 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+   location / {
+        root /usr/share/nginx/html;
+        #index index.html;
+        try_files $uri $uri/ /index.html;
+   }
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # location /prod-api/ {
+    #    proxy_pass  ${BACKEND_HOST};
+    #    proxy_set_header Host $host;
+    #    proxy_set_header X-Real-IP $remote_addr;
+    #    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #    proxy_http_version 1.1;
+    #    proxy_set_header Connection "";
+    #}
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}

src/router/index.js

@@ -3,32 +3,44 @@ import Router from 'vue-router'
 import Login from '@/views/Login.vue'
 import Home from '@/views/Home.vue'
 import Welcome from '@/views/Welcome.vue'
-import Users from '@/views/user/Users.vue'
-import Rights from '@/views/power/Rights.vue'
-import Roles from '@/views/power/Roles.vue'
-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 WeightTrend from '@/views/dataStatistics/WeightTrend.vue'
+import FormulaEffect from '@/views/dataStatistics/FormulaEffect.vue'
+import GrowthRate from '@/views/dataStatistics/GrowthRate.vue'
+import FeedCost from '@/views/dataStatistics/FeedCost.vue'
+import DiseaseSituation from '@/views/dataStatistics/DiseaseSituation.vue'
+import SurvivalRate from '@/views/dataStatistics/SurvivalRate.vue'
+
+
+import WeightRecord from '@/views/cowManagement/WeightRecord.vue'
 import CowInfo from '@/views/cowManagement/CowInfo.vue'
 import EventRecord from '@/views/cowManagement/EventRecord.vue'
 
 
 
+
 import CowCowShed from '@/views/cowShedManagement/CowCowShed.vue'
 import CowShedGroup from '@/views/cowShedManagement/CowShedGroup.vue'
 
 import FeedPlan from '@/views/formulaPlan/FeedPlan.vue'
 import FormulaTemplate from '@/views/formulaPlan/FormulaTemplate.vue'
 
+import WorkTaskAssign from '@/views/workManagement/WorkTaskAssign.vue'
+import WorkTaskImplement from '@/views/workManagement/WorkTaskImplement.vue'
+
+
 import CalfType from '@/views/basicSettings/CalfType.vue'
 import WorkOrderType from '@/views/basicSettings/WorkOrderType.vue'
 import FeedCarManagement from '@/views/basicSettings/FeedCarManagement.vue'
+import DiseaseManagement from '@/views/basicSettings/DiseaseManagement.vue'
+import InfoRemind from '@/views/basicSettings/InfoRemind.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 FeedCostSet from '@/views/basicSettings/FeedCostSet.vue'
 
 import User from '@/views/systemManagement/User.vue'
 import Role from '@/views/systemManagement/Role.vue'
@@ -52,22 +64,23 @@ const router =  new Router({
       children:[
         { 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: '/FeedProcess', component: FeedProcess },
+        { path: '/WeightTrend', component: WeightTrend },
+        { path: '/FormulaEffect', component: FormulaEffect },
+        { path: '/GrowthRate', component: GrowthRate },
+        { path: '/FeedCost', component: FeedCost },
+        { path: '/DiseaseSituation', component: DiseaseSituation },
+        { path: '/SurvivalRate', component: SurvivalRate },
 
+        { path: '/WeightRecord', component: WeightRecord },
         { path: '/CowInfo', component: CowInfo },
         { path: '/EventRecord', component: EventRecord },
         
+        
 
         { path: '/CowCowShed', component: CowCowShed },
         { path: '/CowShedGroup', component: CowShedGroup },
@@ -75,23 +88,27 @@ const router =  new Router({
         { path: '/FeedPlan', component: FeedPlan },
         { path: '/FormulaTemplate', component: FormulaTemplate },
 
+        { path: '/WorkTaskAssign', component: WorkTaskAssign },
+        { path: '/WorkTaskImplement', component: WorkTaskImplement },
+        
+
         { path: '/CalfType', component: CalfType },
         { path: '/WorkOrderType', component: WorkOrderType },
         { path: '/FeedCarManagement', component: FeedCarManagement },
+        { path: '/DiseaseManagement', component: DiseaseManagement },
+        { path: '/InfoRemind', component: InfoRemind },
         { path: '/DiseaseType', component: DiseaseType },
         { path: '/FeedTemplate', component: FeedTemplate },
         { path: '/DefaultPara', component: DefaultPara },
-        { path: '/FeedCost', component: FeedCost },
-
- 
-
+        { path: '/FeedCostSet', component: FeedCostSet },
 
+  
         { path: '/User', component: User },
         { path: '/Role', component: Role },
         
 
  
-        
+ 
         
       ] 
     }

src/views/Login.vue

@@ -24,7 +24,7 @@
         <img src="@/assets/images/logo.png" alt="">
       </div>
       <div class="new-login-r">
-        <div class="title">用户登录</div>
+        <div class="title">用户登录：</div>
         <el-form ref="loginFormRef" :model="loginForm" :rules="loginFormRules" class="login-form" auto-complete="on" label-position="left">
           <el-form-item prop="user_name">
             <!-- <span class="svg-container">
@@ -76,8 +76,8 @@ export default {
   data() {
     return {
       loginForm:{
-        user_name:"admin",
-        password:"123456" 
+        user_name:"", //admin
+        password:""  //123456
  
       },
       //表单验证规则

src/views/basicSettings/DiseaseManagement.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/FeedCarManagement.vue

@@ -74,7 +74,7 @@
       <div class="">
         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
             <el-form-item label="饲喂车编号：" prop="number">
-                <el-input   v-model="addForm.number"  ></el-input>
+                <el-input   v-model="addForm.number" :disabled="addFormStatus=='edit'"  ></el-input>
             </el-form-item>
             <el-form-item label="饲喂车名称：" prop="name">
                 <el-input   v-model="addForm.name"  ></el-input>
@@ -458,7 +458,7 @@ export default {
           var send_data = {
               "name": me.addForm.name,
               "number": me.addForm.number,
-              "capacity": me.addForm.capacity,
+              "capacity": parseFloat(me.addForm.capacity),
 
           }
           console.log("弹窗参数：", send_data)

src/views/basicSettings/FeedTemplate.vue

@@ -598,54 +598,52 @@ export default {
     //清空弹窗表单信息
     reset_form2(){
       this.addForm2.name = ''
-      this.addForm2.id = ''
-      this.addForm2.class_first = ''
-      this.addForm2.class_second = ''
-      this.addForm2.class_third = ''
-      this.addForm2.class_fourth = ''
+      this.addForm2.id = undefined
+      this.addForm2.feed_temp = undefined
+      this.addForm2.allow_temp_diff = undefined
+ 
       this.addForm2.is_default = 2
 
-
+ 
     },
     //新增
-    form_add1() {
-      this.reset_form1()
-      this.addFormStatus1 = 'create'
-      this.addFormShow1 = true
+    form_add2() {
+      this.reset_form2()
+      this.addFormStatus2 = 'create'
+      this.addFormShow2 = true
       this.$nextTick(() => {
-        this.$refs['addFormRef1'].clearValidate()
+        this.$refs['addFormRef2'].clearValidate()
       })
     },
     //编辑
-    form_edit1(row) {
+    form_edit2(row) {
       console.log('行内容1row=========', row)
       //编辑行内容赋值
-      this.addForm1 = Object.assign({}, row)  
-      this.addFormStatus1 = 'edit'
-      this.addFormShow1 = true
+      this.addForm2 = Object.assign({}, row)  
+      this.addFormStatus2 = 'edit'
+      this.addFormShow2 = true
       this.$nextTick(() => {
-        this.$refs['addFormRef1'].clearValidate()
+        this.$refs['addFormRef2'].clearValidate()
       })
     },
     //新增关闭
-    add_dialog_close1(){
+    add_dialog_close2(){
       //内容重置
-      this.$refs['addFormRef1'].resetFields()
+      this.$refs['addFormRef2'].resetFields()
     },
     //新增 保存
-    add_dialog_save1() {
+    add_dialog_save2() {
       var me = this
-      this.$refs['addFormRef1'].validate(valid => {
+      this.$refs['addFormRef2'].validate(valid => {
         //验证成功
         if (valid) {
           //发起请求
           var send_data = {
-              "name": me.addForm1.name,
-              "class_first":parseFloat( me.addForm1.class_first),
-              "class_second": parseFloat(me.addForm1.class_second),
-              "class_third":parseFloat( me.addForm1.class_third),
-              "class_fourth": parseFloat(me.addForm1.class_fourth),
-              "is_default": me.addForm1.is_default,
+              "name": me.addForm2.name,
+              "feed_temp":parseFloat( me.addForm2.feed_temp),
+              "allow_temp_diff": parseFloat(me.addForm2.allow_temp_diff),
+   
+              "is_default": me.addForm2.is_default,
           }
         
           console.log("弹窗参数：", send_data)
@@ -653,14 +651,14 @@ export default {
           //关闭弹窗
           // me.addFormShow = false
         //加载 - 发送新增保存
-          ajaxDataPost(me.url_add_table1, send_data).then(e => {
+          ajaxDataPost(me.url_add_table2, send_data).then(e => {
                 console.log("新增结果：",e)
                 //打印请求成功结果
                 if(e.code == 200  ){
                   me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
                   //关闭弹窗
-                  me.addFormShow1 = false
-                  me.get_table_data1()
+                  me.addFormShow2 = false
+                  me.get_table_data2()
                 } else {
                   me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
                 }
@@ -670,20 +668,19 @@ export default {
       })
     },
     //编辑 保存
-    edit_dialog_save1(){
+    edit_dialog_save2(){
       var me = this
-      this.$refs['addFormRef1'].validate(valid => {
+      this.$refs['addFormRef2'].validate(valid => {
         //验证成功
         if (valid) {
           //发起请求
           var send_data = {
-            "name": me.addForm1.name,
-              "class_first":parseFloat( me.addForm1.class_first),
-              "class_second": parseFloat(me.addForm1.class_second),
-              "class_third":parseFloat( me.addForm1.class_third),
-              "class_fourth": parseFloat(me.addForm1.class_fourth),
-              "is_default": me.addForm1.is_default,
-              "id": me.addForm1.id,
+            
+            "name": me.addForm2.name,
+              "feed_temp":parseFloat( me.addForm2.feed_temp),
+              "allow_temp_diff": parseFloat(me.addForm2.allow_temp_diff),
+              "is_default": me.addForm2.is_default,
+              "id": me.addForm2.id,
           }
           
           console.log("弹窗参数：", send_data)
@@ -691,14 +688,14 @@ export default {
           //关闭弹窗
           // me.addFormShow = false
         //加载 - 发送新增保存
-        ajaxDataPut(me.url_edit_table1, send_data).then(e => {
+        ajaxDataPut(me.url_edit_table2, send_data).then(e => {
                 console.log("编辑结果：",e)
                 //打印请求成功结果
                 if(e.code == 200  ){
                   me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
                   //关闭弹窗
-                  me.addFormShow1 = false
-                  me.get_table_data1()
+                  me.addFormShow2 = false
+                  me.get_table_data2()
                 } else {
                   me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
                 }
@@ -708,7 +705,7 @@ export default {
       })
     },
     //删除
-    form_delete1(row) {
+    form_delete2(row) {
       var me = this
       me.$confirm('是否删除此条内容?', '提示', {
           confirmButtonText: '确定',
@@ -717,7 +714,7 @@ export default {
         }).then(() => {
             console.log("删除的ID参数：", row.id)
             //加载 - 发送新增保存
-            ajaxDataDelete(me.url_delete_table1 + '/' +row.id, {}).then(e => {
+            ajaxDataDelete(me.url_delete_table2 + '/' +row.id, {}).then(e => {
                 console.log("编辑结果：",e)
                 //打印请求成功结果
                 if(e.code == 200  ){
@@ -742,7 +739,7 @@ export default {
       
     },
     //设置 默认
-    change_enable1(row){
+    change_enable2(row){
       var me = this
       console.log(row)
       //加载 - 保存

src/views/basicSettings/InfoRemind.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/WorkOrderType.vue

@@ -1,74 +1,7 @@
 <template>
  
   <div>
-
-
-    <el-card class="box-card">
-      <!-- 搜索区域 -->
-      <div class="search-bx1">
-          <el-input v-model="searchData.name" placeholder="工单类型"  style="width: 220px;" class="g-mr20" clearable />
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <el-button type="primary"   @click="form_clear">重置</el-button>
-          <el-button type="primary"   @click="form_add">添加</el-button>
-           <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
-      </div>
-
- 
-      <!-- 表格 -->
-      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
-        <el-table-column label="序号"  width="50px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.id }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="类型名称" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.name }}</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="300" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="scope">
-             <!-- 修改按钮 -->
-             <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-             <!-- 删除按钮 -->
-             <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.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="100px"  style="width:50%;margin:0 auto 50px">
-            <el-form-item label="类型名称：" prop="name">
-                <el-input   v-model="addForm.name"  ></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>
-
- 
-    
+        1.1版本页面，待开发
   </div>
 
 
@@ -89,13 +22,13 @@ export default {
  
 
       //接口 - 获取 - 表格
-      url_get_table:'/api/v1/ops/base_setting/category_table/list',
+      url_get_table:'/api/v1/ops/base_setting/calf_type/list',
       //接口 - 新增 - 表格
-      url_add_table:'/api/v1/ops/base_setting/category_table/add',  
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
       //接口 - 修改 - 表格
-      url_edit_table:'/api/v1/ops/base_setting/category_table/update', 
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
       //接口 - 删除 - 表格
-      url_delete_table:'/api/v1/ops/base_setting/category_table/is_show', 
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
       
       //接口 - 下拉框 列表 
       url_get_select1:'/role/getAll',
@@ -147,9 +80,7 @@ export default {
       },
 
       addFormRules:{
-        name: [
-          { required: true, message: '类型必填', trigger: 'blur' },
-        ],
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
    
 
       },
@@ -159,15 +90,17 @@ export default {
     }
   },
   created(){
-      //获取按钮权限
-      // this.get_auto_buttons 
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
      
 
-     //获取下拉框
-     // this.get_select_list1()
+    //  获取下拉框
+    //  this.get_select_list1()
 
-      //表格 - 初始化 
-      this.get_table_data()
+    //   //表格 - 初始化 
+    //   this.get_table_data()
 
      
 
@@ -319,7 +252,6 @@ export default {
           //发起请求
           var send_data = {
               "name": me.addForm.name,
-              "category_type":1  //0 无效 1 工单类型
           }
           console.log("弹窗参数：", send_data)
 
@@ -384,7 +316,7 @@ export default {
     form_delete(row) {
       var me = this
 
-       me.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+       me.$confirm('是否删除此条内容?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

src/views/basicSettings/WorkOrderType2.vue

@@ -0,0 +1,464 @@
+<template>
+ 
+  <div>
+
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+          <el-input v-model="searchData.name" placeholder="工单类型"  style="width: 220px;" class="g-mr20" clearable />
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <el-button type="primary"   @click="form_clear">重置</el-button>
+          <el-button type="primary"   @click="form_add">添加</el-button>
+           <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
+      </div>
+
+ 
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型名称" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</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="300" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="scope">
+             <!-- 修改按钮 -->
+             <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+             <!-- 删除按钮 -->
+             <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.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="100px"  style="width:50%;margin:0 auto 50px">
+            <el-form-item label="类型名称：" prop="name">
+                <el-input   v-model="addForm.name"  ></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>
+
+ 
+    
+  </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/base_setting/category_table/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/category_table/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/category_table/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/category_table/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+              "category_type":1  //0 无效 1 工单类型
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/CowInfo.vue

@@ -49,6 +49,11 @@
             <span>{{ scope.row.calf_code }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="耳号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ear_number }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="栏舍" min-width="150px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.barn_name }}</span>
@@ -108,7 +113,11 @@
         </el-table-column>
         <el-table-column label="状态" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.leave_barn_date_format }}</span>
+            <span v-if="scope.row.status == 1" style="color:#67c23a;font-weight:bold">健康</span>
+            <span v-if="scope.row.status == 2" style="color:#ff9100;font-weight:bold">疾病</span>
+            <span v-if="scope.row.status == 3" style="color:#dec40d;font-weight:bold">出栏</span>
+            <span v-if="scope.row.status == 4" style="color:#ff0000;font-weight:bold">死亡</span>
+            <span v-if="scope.row.status == 5" style="color:#fa00ff;font-weight:bold">淘汰</span>
           </template>
         </el-table-column>
 
@@ -137,8 +146,14 @@
               </el-select>
             </el-form-item> 
             <el-form-item label="犊牛编号：" prop="calf_code">
-                <el-input   v-model="addForm.calf_code"  placeholder=""  ></el-input>  
+                <el-input   v-model="addForm.calf_code"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
+            </el-form-item>
+            <el-form-item label="耳号：" prop="ear_number">
+                <el-input   v-model="addForm.ear_number"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
             </el-form-item>
+
+            
+
             <el-form-item label="犊牛类型：" prop="calf_category_id">
               <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择"   style="width: 100%;" >
                 <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
@@ -289,15 +304,16 @@ export default {
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        barn_id:undefined,calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
+        barn_id:undefined,ear_number:'',calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
       },
 
       addFormRules:{
-        barn_id: [ { required: true, message: '栏舍必选', trigger: 'blur' },  ],
+        barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
         calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
-        calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'blur' },  ],
+        ear_number: [ { required: true, message: '耳号必填', trigger: 'blur' },  ],
+        calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'change' },  ],
         birth_date_format: [ { required: true, message: '出生日期必填', trigger: 'blur' },  ],
-        genders: [ { required: true, message: '性别必选', trigger: 'blur' },  ],
+        genders: [ { required: true, message: '性别必选', trigger: 'change' },  ],
         birth_weight: [ { required: true, message: '出生体重必填', trigger: 'blur' },  ],
         current_weight: [ { required: true, message: '当前体重必填', trigger: 'blur' },  ],
         mother_code: [ { required: true, message: '母号必填', trigger: 'blur' },  ],
@@ -476,10 +492,22 @@ export default {
 
     //清空弹窗表单信息
     reset_form(){
+      this.addForm.calf_code = ''
+      this.addForm.ear_number = ''
       this.addForm.name = ''
+      this.addForm.barn_id = undefined
+      this.addForm.calf_category_id = undefined
       this.addForm.id = undefined
-      this.addForm.barn_group_id = undefined
-      this.addForm.number = ''
+      this.addForm.genders = undefined
+      this.addForm.birth_weight = undefined
+      this.addForm.current_weight = undefined
+      this.addForm.mother_code = ''
+      this.addForm.remark = ''
+ 
+      this.addForm.birth_date_format = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+
+
+    
        
     },
 
@@ -527,6 +555,8 @@ export default {
           var send_data = {
               "barn_id": me.addForm.barn_id,
               "calf_code": me.addForm.calf_code,
+              "ear_number": me.addForm.ear_number,
+              
               "calf_category_id": me.addForm.calf_category_id,
               "birth_weight": parseFloat(me.addForm.birth_weight) ,
               "genders": me.addForm.genders,
@@ -575,6 +605,7 @@ export default {
               "id": me.addForm.id,
               "barn_id": me.addForm.barn_id,
               "calf_code": me.addForm.calf_code,
+              "ear_number": me.addForm.ear_number,
               "calf_category_id": me.addForm.calf_category_id,
               "birth_weight": parseFloat(me.addForm.birth_weight) ,
               "genders": me.addForm.genders,

src/views/cowManagement/EventRecord.vue

@@ -107,7 +107,7 @@
     <!-- 弹窗 新增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="100px"  style="width:50%;margin:0 auto 50px">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="170px"  style="width:50%;margin:0 auto 50px">
              
 
             <el-row>
@@ -535,14 +535,19 @@ export default {
 
     //清空弹窗表单信息
     reset_form(){
-      this.addForm.name = ''
+      this.addForm.calf_code = ''
+      this.addForm.id = ''
+      this.addForm.event_kind = undefined
+      this.addForm.remark = ''
+
+ 
     },
 
     //监听 - 更改牛号
     change_cow(value){
       var me = this 
       console.log("更改牛号Id",value)
-      var item  = me.cowNameList.find(obj => obj.id == value)
+      var item  = me.cowNameList.find(obj => obj.calf_code == value)
       console.log("更改牛号当前的内容",item)
       me.addForm.calf_code = item.calf_code
       me.addForm.calf_category_id = item.calf_category_id

src/views/cowManagement/WeightRecord.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/cowShedManagement/CowCowShed.vue

@@ -45,12 +45,21 @@
         </el-table-column>
         <el-table-column label="栏舍状态" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.status }}</span>
+            <span v-if ="scope.row.status == 1">正常</span>
+            <span v-if ="scope.row.status == 2">疾病</span>
+            <span v-if ="scope.row.status == 3">断奶</span>
+            <span v-if ="scope.row.status == 4">空栏</span>
+ 
           </template>
         </el-table-column>
+   
         <el-table-column label="犊牛状态" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.number }}</span>
+            <span v-if="scope.row.status == 1">健康</span>
+            <span v-if="scope.row.status == 2">疾病</span>
+            <span v-if="scope.row.status == 3">出栏</span>
+            <span v-if="scope.row.status == 4">死亡</span>
+            <span v-if="scope.row.status == 5">淘汰</span>
           </template>
         </el-table-column>
  
@@ -77,7 +86,7 @@
             <el-form-item label="身份卡ID：" prop="number">
                 <el-input   v-model="addForm.number"  placeholder="用于加奶枪识别牛只信息及饲喂量"  ></el-input>  
             </el-form-item>
-            <el-form-item label="类型名称：" prop="name">
+            <el-form-item label="栏舍名称：" prop="name">
                 <el-input   v-model="addForm.name"    ></el-input>  
             </el-form-item>       
             <el-form-item label="栏舍组：" prop="barn_group_id">
@@ -165,8 +174,9 @@ export default {
       //栏舍状态
       statusList:[
         {id: 1, value: '正常'},
-        {id: 2, value: '空栏'},
-        {id: 3, value: '损坏'},
+        {id: 2, value: '疾病'},
+        {id: 3, value: '断奶'},
+        {id: 4, value: '空栏'},
       ],
 
     

src/views/cowShedManagement/CowShedGroup.vue

@@ -208,9 +208,9 @@ export default {
     get_select_list1(){
         var me = this
 
-        var send_url = me.url_get_select1 + '?page=1&page_size=1000'
+ 
 
-        ajaxDataPost(send_url, {name:"",barn_group_name:"",status:undefined}).then(e => {
+        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
           console.log("穿梭框1：",e)
 
           //打印请求成功结果

src/views/dataStatistics/DiseaseSituation.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/FeedCost.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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

@@ -12,17 +12,27 @@
               <el-date-picker v-model="searchData.date"  type="date"  placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"  :clearable="false" style="width: 180px;"  class="g-mr20  g-mb20" />
  
 
-              <el-select v-model="searchData.feed_plan_id" filterable placeholder="饲喂计划" class="g-mr20" style="width: 180px;" clearable>
+              <el-select v-model="searchData.feed_plan_id" filterable placeholder="饲喂计划" class="g-mr20" style="width: 180px;"   @change="change_plan">
                 <el-option v-for="item in feedPlanList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
-              <el-select v-model="searchData.class_number" filterable placeholder="班次" class="g-mr20  g-mb20" style="width: 180px;" clearable>
+
+              <span>班次：</span>
+              <el-input v-model="searchData.class_number_name" placeholder=""  style="width: 180px;" disabled />
+
+              <span>饲喂车：</span>
+              <el-input v-model="searchData.feed_vehicle_name" placeholder=""  style="width: 180px;" disabled />
+
+
+         
+
+              <!-- <el-select v-model="searchData.class_number" filterable placeholder="班次" class="g-mr20  g-mb20" style="width: 180px;" clearable>
                 <el-option v-for="item in classList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
               <el-select v-model="searchData.feed_vehicle_id" filterable placeholder="饲喂车" class="g-mr20" style="width: 180px;" clearable  @change="change_car">
                 <el-option v-for="item in feedCarList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
+              </el-select> -->
               <span>饲喂车编号：</span>
-              <el-input v-model="searchData.carNum" placeholder=""  style="width: 180px;" disabled />
+              <el-input v-model="searchData.feed_vehicle_number" placeholder=""  style="width: 180px;" disabled />
             </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -110,6 +120,11 @@
                     <span>{{ scope.row.process_time  }}</span>
                   </template>
                 </el-table-column>
+                <el-table-column label="上报时间" min-width="120px" align="center" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.created_at_format  }}</span>
+                  </template>
+                </el-table-column>
 
       </el-table>
 
@@ -215,8 +230,7 @@ export default {
      //获取下拉框
       this.get_select_list1()
 
-      //表格 - 初始化 
-      this.get_table_data()
+      
 
      
 
@@ -243,6 +257,36 @@ export default {
           } else {
             me.feedPlanList = []
           }
+
+           
+          var plan_item = e.data.list[0]
+          console.log("plan_item", plan_item)
+
+          var feed_plan_id = plan_item.id
+          me.searchData.feed_plan_id = feed_plan_id
+
+          var class_number = plan_item.class_number
+          me.searchData.class_number = class_number
+
+          if(class_number == 1){  me.searchData.class_number_name = '第一班' }
+          if(class_number == 2){  me.searchData.class_number_name = '第二班' }
+          if(class_number == 3){  me.searchData.class_number_name = '第三班' }
+          if(class_number == 4){  me.searchData.class_number_name = '第四班' }
+
+          var feed_vehicle_id = plan_item.feed_vehicle_id
+          me.searchData.feed_vehicle_id = feed_vehicle_id
+
+          var feed_vehicle_name = plan_item.feed_vehicle_name
+          me.searchData.feed_vehicle_name = feed_vehicle_name
+
+          var feed_vehicle_number = plan_item.feed_vehicle_number
+          me.searchData.feed_vehicle_number = feed_vehicle_number
+
+          
+
+
+          //表格 - 初始化 
+          me.get_table_data()
  
         })
 
@@ -274,7 +318,35 @@ export default {
 
     
     },
+   
+ 
+
+    change_plan(item){
+      var me = this
+      console.log(item)
+      var plan_item = me.feedPlanList.find(obj => obj.id == item) 
+      console.log("plan_item", plan_item)
+
+      var class_number = plan_item.class_number
+      me.searchData.class_number = class_number
 
+      if(class_number == 1){  me.searchData.class_number_name = '第一班' }
+      if(class_number == 2){  me.searchData.class_number_name = '第二班' }
+      if(class_number == 3){  me.searchData.class_number_name = '第三班' }
+      if(class_number == 4){  me.searchData.class_number_name = '第四班' }
+
+      var feed_vehicle_id = plan_item.feed_vehicle_id
+      me.searchData.feed_vehicle_id = feed_vehicle_id
+
+      var feed_vehicle_name = plan_item.feed_vehicle_name
+      me.searchData.feed_vehicle_name = feed_vehicle_name
+
+      var feed_vehicle_number = plan_item.feed_vehicle_number
+          me.searchData.feed_vehicle_number = feed_vehicle_number
+
+      
+     
+    },
     change_car(item){
       var me = this
       console.log(item)
@@ -291,9 +363,7 @@ export default {
      console.log("searchData======>", me.searchData)
 
  
-      if( me.searchData.feed_plan_id == ""){
-        me.searchData.feed_plan_id = undefined
-      }
+     
       if( me.searchData.class_number == ""){
         me.searchData.class_number = undefined
       }
@@ -336,12 +406,12 @@ export default {
     //重置 表格
     form_clear(){
       var me = this
-      me.searchData.date = ""
+      // me.searchData.date = ""
       me.searchData.barn_name = ""
       me.searchData.barn_group_name = ""
-      me.searchData.feed_plan_id = undefined
-      me.searchData.class_number = undefined
-      me.searchData.feed_vehicle_id = undefined
+      // me.searchData.feed_plan_id = undefined
+      // me.searchData.class_number = undefined
+      // me.searchData.feed_vehicle_id = undefined
       me.searchData.min_accurate_ratio = undefined
       me.searchData.max_accurate_ratio = undefined
       me.searchData.min_temp = undefined

src/views/dataStatistics/FormulaEffect.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/GrowthRate.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/SurvivalRate.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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/WeightTrend.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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

@@ -47,7 +47,7 @@
         </el-table-column>
         <el-table-column label="容量(kg)" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.birth_date_format }}</span>
+            <span>{{ scope.row.capacity }}</span>
           </template>
         </el-table-column>
 
@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column label="犊牛数量" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.mother_code }}</span>
+            <span>{{ scope.row.calf_count }}</span>
           </template>
         </el-table-column>
         <el-table-column label="计划饲喂量(kg)" min-width="150px" align="center">
@@ -160,8 +160,8 @@
                   </el-table-column>
                   <el-table-column label="犊牛数量" min-width="150px" align="center">
                     <template slot-scope="scope">
-                      <span v-if ="scope.row.status == 4">0</span>
-                      <span v-else>1</span>
+                      <span >{{scope.row.number}}</span>
+          
                     </template>
                   </el-table-column>
                 </el-table>
@@ -176,8 +176,12 @@
                     </template>
                   </el-table-column>
                   <el-table-column label="犊牛数量" min-width="150px" align="center">
+                    
                     <template slot-scope="scope">
-                      <span>{{ 1 }}</span>
+
+                      <span v-if ="scope.row.status == 4">0</span>
+                      <span v-else>1</span>
+                      <!-- <span>{{ 1 }}</span> -->
                     </template>
                   </el-table-column>
                 </el-table>
@@ -358,6 +362,8 @@ export default {
         feed_time: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
       },
 
+      
+
       addFormRules:{
         name: [ { required: true, message: '饲喂计划名称必填', trigger: 'blur' },  ],
         formula_id: [ { required: true, message: '配方模板必填', trigger: 'blur' },  ],
@@ -531,9 +537,18 @@ export default {
     reset_form(){
       this.addForm.name = ''
       this.addForm.id = undefined
-      this.addForm.barn_group_id = undefined
+      this.addForm.formula_id = undefined
+      this.addForm.class_number = undefined
+      this.addForm.feed_vehicle_id = undefined
+      this.addForm.status = undefined
+      this.addForm.feed_time = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
+
       this.addForm.number = ''
 
+
+
+     
+
       
     },
 
@@ -580,6 +595,7 @@ export default {
 
       this.addFormStatus = 'create'
       this.addFormShow = true
+
       this.$nextTick(() => {
         this.$refs['addFormRef'].clearValidate()
         this.$refs.multipleTable1.clearSelection()
@@ -614,11 +630,7 @@ export default {
 
  
      
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-        this.$refs.multipleTable1.clearSelection()
-         this.$refs.multipleTable2.clearSelection()
-      })
+      
 
 
     
@@ -637,50 +649,86 @@ export default {
 
       me.barnGroupIdsArr = barnGroupIdsArr
       me.barnIdsArr = barnIdsArr
-
+      me.addFormStatus = 'edit'
+      me.addFormShow = true
       
 
+
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+        // this.$refs.multipleTable1.clearSelection()
+        //  this.$refs.multipleTable2.clearSelection()
+      })
+      console.log('  me.barnGroupTableList==========',me.barnGroupTableList)
+      console.log('  barnGroupIdsArr==========',barnGroupIdsArr)    
        // 查询栏舍组下的所有栏舍数据
        if(barnGroupIdsArr.length > 0) {
-          this.$nextTick(() => {
+          me.$nextTick(() => {
 
-            for(let i = 0; i<me.barnGroupTableList.length;i++){
-              for(let j = 0; i<barnGroupIdsArr.length;i++){
-                if(me.barnGroupTableList[i].id == barnGroupIdsArr[i]){
-                  me.$refs['multipleTable1'].toggleRowSelection(me.barnGroupTableList[i])
+                for(let i = 0; i<me.barnGroupTableList.length;i++){
+                  for(let j = 0; i<barnGroupIdsArr.length;i++){
+                    if(me.barnGroupTableList[i].id == barnGroupIdsArr[i]){
+                      me.$refs['multipleTable1'].toggleRowSelection(me.barnGroupTableList[i])
+                    }
+                  }
                 }
-              }
-            }
+
+                ajaxDataPost('/api/v1/ops/barn/list/ids',{ids:barnGroupIdsArr}).then(e => {
+                    if(e.code === 200) {
+                      // me.barnTableList = e.data.list
+                      console.log('  me.barnTableList==========',me.barnTableList)
+
+                      setTimeout(() => {
+                        me.barnTableList = e.data.list
+
+                          for(let i = 0; i<me.barnTableList.length;i++){
+                              for(let j = 0; i< barnIdsArr.length;i++){
+                                if(me.barnTableList[i].id ==  barnIdsArr[i]){
+                                    me.$refs['multipleTable2'].toggleRowSelection(me.barnTableList[i])
+                                  
+                                    
+                                }
+                              }
+                          }
+
+                      }, 800)
+                      
+                       
+                       
+
+                        
+          
+                    }
+                })
+
+
         
           })
           
 
-          ajaxDataPost('/api/v1/ops/barn/list/ids',{ids:barnGroupIdsArr}).then(e => {
-            if(e.code === 200) {
-              me.barnTableList = e.data.list
-                for(let i = 0; i<me.barnTableList.length;i++){
-                    for(let j = 0; i< barnIdsArr.length;i++){
-                      if(me.barnTableList[i].id ==  barnIdsArr[i]){
-                        me.$refs['multipleTable2'].toggleRowSelection(me.barnTableList[i])
-                      }
-                    }
-                  }
-  
-            }
-          })
+          
+
+         
       }
 
      
-          
-      this.addFormStatus = 'edit'
-      this.addFormShow = true
+     
+      
      
     },
 
     //新增关闭
     add_dialog_close(){
        //内容重置
-       this.$refs['addFormRef'].resetFields()
+ 
+
+      var me = this
+      me.$nextTick(() => {
+        me.$refs['addFormRef'].clearValidate()
+        me.$refs.multipleTable1.clearSelection()
+        me.$refs.multipleTable2.clearSelection()
+      })
+
     },
 
     //新增 保存

src/views/formulaPlan/FormulaTemplate.vue

@@ -630,8 +630,13 @@ export default {
     reset_form(){
       this.addForm.name = ''
       this.addForm.id = undefined
-      this.addForm.barn_group_id = undefined
+      this.addForm.calf_category_id = undefined
+      this.addForm.male_calf_daily_weight = undefined
+      this.addForm.female_calf_daily_weight = undefined
       this.addForm.number = ''
+
+ 
+      this.tableListStep = []
        
     },
 

src/views/goods/Cate.vue

@@ -1,370 +0,0 @@
-<template>
- 
-  <div>
- 
-    <!-- 面包屑导航 -->
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>商品管理</el-breadcrumb-item>
-      <el-breadcrumb-item>商品分类</el-breadcrumb-item>
-    </el-breadcrumb>
-
-
-    <!-- 卡片视图区域 -->
-    <el-card class="box-card">
-      <!-- 添加 区域 -->
-      <el-row :gutter="20">
-        <el-col >
-          <el-button type="primary"   @click="form_add">添加角色</el-button>
-        </el-col>
-      </el-row>
-
-      <!-- 角色列表区域 -->
-      <el-table   :data="rolelist"  stripe border>
-        
-        <!-- 展开列 -->
-        <el-table-column   type = 'expand'>
-          <template slot-scope="scope">
-            <el-row :class="['bdbottom', i1 === 0 ? 'bdtop': '']" v-for="(item1, i1) in scope.row.children" :key="item1.id">
-              <!-- 渲染一级权限 -->
-              <el-col :span="5">
-                  <el-tag>{{item1.authName}}</el-tag>
-                  <i class="el-icon-caret-right"></i>
-              </el-col>
-              <!-- 渲染二级和三级权限 -->
-              <el-col :span="19">
-                  <el-row :class="[i2 === 0 ? 'bdtop': '']" v-for="(item2, i2) in item1.children" :key="item2.id">
-                    <el-col  :span="6">
-                      <el-tag type="success">{{item2.authName}}</el-tag>
-                      <i class="el-icon-caret-right"></i>
-                    </el-col>
-                    <el-col  :span="18">
-                      <el-tag  type="warning" v-for="(item3, i3) in item2.children" :key="item3.id" closable @close="removeRightById">{{item3.authName}}</el-tag>
-                    </el-col>
-                 </el-row>
-              </el-col>
-
-            </el-row>
-          </template>
-
-        </el-table-column>
-
-        <!--索引列 -->
-        <el-table-column  type = 'index'></el-table-column>
-        <el-table-column   label="角色名称" prop="roleName"></el-table-column>
-        <el-table-column   label="角色描述" prop="roleDesc"></el-table-column>
-
-
-        <el-table-column  label="状态" >
-          <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="操作" width="300px"  >
-          <template slot-scope="scope">
-            <!-- 修改按钮 -->
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-            <!-- 删除按钮 -->
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-            <!-- 分配角色 -->
-            <el-button type="warning" size="mini" icon="el-icon-setting" @click="show_setting(scope.row)">分配角色</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="handleSizeChange"  @current-change="handleCurrentChange"  :current-page="queryInfo.pagenum" :page-sizes="[1,5,10,20,30,50]"  :page-size="queryInfo.pagesize" layout="total, prev, pager, next" :total="total"/>
-   
-
-
-    </el-card>
-
-
-    <!-- 弹出层新增or修改 -->
-    <el-dialog  :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="add_dialog_close" width="50%">
-      <div class="content-add">
-        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="70px" >
-            <el-form-item label="用户名" prop="username">
-                <el-input   v-model="addForm.username"  :disabled="dialogStatus==='edit'"></el-input>  
-            </el-form-item>
-            <el-form-item label="密码" prop="password">
-                <el-input   v-model="addForm.password"></el-input>  
-            </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-                <el-input   v-model="addForm.email"></el-input>  
-            </el-form-item>
-            <el-form-item label="手机" prop="mobile">
-                <el-input   v-model="addForm.mobile"></el-input>  
-            </el-form-item>
-            
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
-          <el-button @click="dialogFormVisible = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-
-    <!-- 分配权限 -->
-    <el-dialog   title="分配权限" :visible.sync="dialogFormVisibleSetting" @close="dialogFormVisibleSetting = false" width="50%">
-      <div class="content-add">
-
-
-         <!-- 树形控件 -->
-        <el-tree   :data="rightlist" :props="treeProps" show-checkbox   node-key="id"  default-expand-all :default-checked-keys="defKeys"> </el-tree>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="dialogFormVisibleSetting = false">确认</el-button>
-          <el-button @click="dialogFormVisibleSetting = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-  </div>
-
-
-</template> 
-
-<script>
-import { GetDataByName, PostDataByName, ajaxData } from '@/api/common'
-
-export default {
-  data() {
-
-    
-    
-    return {
-      //获取用户列表的参数对象
-      queryInfo:{
-        query:'',
-        pagenum:1,  //当前页数
-        pagesize:10,  //每页显示多少条数据
-      },
-      rolelist:[
-        {
-          id:1, roleName:"主管", roleDesc:"技术负责人", 
-          children: [
-            { 
-              authName: "商品管理" ,id: 11,
-              children:[
-                {
-                  authName: "商品列表" ,id: 111,
-                  children:[{ authName: "添加商品" ,id: 1111}, { authName: "编辑商品" ,id: 1112}, { authName: "删除商品" ,id: 1113}]
-                },
-                {
-                  authName: "商品分类" ,id: 112,
-                  children:[{ authName: "添加分类" ,id: 1121},  { authName: "编辑分类" ,id: 1122},  { authName: "删除分类" ,id: 1123}]
-                },
-              ]
-            }, 
-            { 
-              authName: "订单管理" ,id: 12,
-              children:[
-                {
-                  authName: "订单列表" ,id: 121,
-                  children:[ { authName: "添加订单" ,id: 1211}, { authName: "编辑订单" ,id: 1212},  { authName: "删除订单" ,id: 1113}]
-                },
-              ]
-            }, 
-
-             
-          ]
-        },
-
- 
-      ],
-       
-    
-      total:0,
-      // 弹窗显示
-
-
-      dialogFormVisible:false,
-      dialogFormVisibleSetting:false,
-
-      //权限数据
-      rightlist:[
-        {
-          id:1, authName:"商品管理", roleDesc:"技术负责人", 
-          children: [
-            { 
-              authName: "商品管理" ,id: 11,
-              children:[
-                {
-                  authName: "商品列表" ,id: 111,
-                  children:[{ authName: "添加商品" ,id: 1111}, { authName: "编辑商品" ,id: 1112}, { authName: "删除商品" ,id: 1113}]
-                },
-                {
-                  authName: "商品分类" ,id: 112,
-                  children:[{ authName: "添加分类" ,id: 1121},  { authName: "编辑分类" ,id: 1122},  { authName: "删除分类" ,id: 1123}]
-                },
-              ]
-            }, 
-            { 
-              authName: "订单管理" ,id: 12,
-              children:[
-                {
-                  authName: "订单列表" ,id: 121,
-                  children:[ { authName: "添加订单" ,id: 1211}, { authName: "编辑订单" ,id: 1212},  { authName: "删除订单" ,id: 1113}]
-                },
-              ]
-            }, 
-
-             
-          ]
-        },
-
- 
-      ],
-
-      //树形控件的属性绑定对象
-      treeProps:{
-        label:'authName',children:'children'
-      },
-
-      //树形默认选中的值
-      defKeys:[1,11],
-
-      dialogStatus: '',
-      textMap: {
-        edit: '修改用户',
-        create: '新增用户'
-      },
-
-      addForm:{
-        username:'',password:'',email:'',mobile:''
-      },
-
-
-      
-      addFormRules:{
-        username: [
-          { required: true, message: '用户名必填', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度3-5个字符之间', trigger: 'blur' },
-        ],
-        password: [
-          { required: true, message: '密码必填', trigger: 'blur' },
-          { min: 3, max: 15, message: '长度3-15个字符之间', trigger: 'blur' },
-        ],
-        
-
-        
-      },
-       
-    }
-  },
-  created(){
- 
-  },
-  methods:{
-
- 
-
-    removeRightById(){
-
-    },
-
-
-    //监听 pagesize 改变的事件
-    handleSizeChange(item){
-       this.queryInfo.pagesize = item
-       this.getUserList()
-    },
-
-    //监听 pagenum 改变的事件
-    handleCurrentChange(item){
-       this.queryInfo.pagenum = item
-       this.getUserList()
-    },
-
-
-    show_setting() {
-      this.dialogFormVisibleSetting = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-
-    form_add() {
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    form_edit(row) {
-      console.log('row', row)
-      this.addForm = Object.assign({}, row) // copy obj
-      this.dialogStatus = 'edit'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    //监听关闭对话框
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-
-    add_dialog_save() {
-      
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-
-          //关闭弹窗
-          this.$message({ type: 'success', message: '请求成功', duration: 2000 })
-          this.dialogFormVisible = false
-        }
-      })
-    },
-
-    edit_dialog_save(){
-      this.dialogFormVisible = false
-    },
-
-    form_delete(row) {
-
-       this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
-     
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped>
- .el-tag{margin:7px;}
-
- .bdtop{border-top:1px solid #eee}
- .bdbottom{border-bottom:1px solid #eee}
-.vcenter{display:flex;align-items:center;}
-</style>

src/views/goods/Time.vue

@@ -1,516 +0,0 @@
-<template>
- 
-  <div>
-    <!-- <h3>用户列表组件</h3> -->
-    <!-- 面包屑导航 -->
-    <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>用户管理</el-breadcrumb-item>
-      <el-breadcrumb-item>用户列表</el-breadcrumb-item>
-    </el-breadcrumb> -->
-
-
-    <el-card class="box-card">
-      <!-- 添加与搜索区域 -->
-      <div class="search-bx1">
-
-
-        
-          <el-select v-model="sendData.pastureId" filterable placeholder="单位" style="width: 240px;" class="g-mr20">
-            <el-option   v-for="item in pastureList"  :key="item.id"   :label="item.name"     :value="item.id"
-            />
-          </el-select>
-          <el-input v-model="sendData.eqName" placeholder="设备名称"  style="width: 220px;margin-bottom: 10px;" class="g-mr20" clearable />
-        
-          <el-input v-model="sendData.repairPerson" placeholder="维修人"  style="width: 220px;margin-bottom: 10px;" class="g-mr20" clearable />
-
-          <el-date-picker ref="inputDatetime1" v-model="inputDatetime1" class="g-mr20" type="datetimerange" style="width: 250px; " format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="报修日期" end-placeholder="报修日期" />
-
-          <el-date-picker ref="inputDatetime2" v-model="inputDatetime2" class="g-mr20" type="datetimerange" style="width: 250px; " format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="接单日期" end-placeholder="接单日期" />
-
-          <el-date-picker ref="inputDatetime3" v-model="inputDatetime3" class="g-mr20" type="datetimerange" style="width: 250px; " format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="完成日期" end-placeholder="完成日期" />
-
-          <el-date-picker ref="inputDatetime4" v-model="inputDatetime4" class="g-mr20" type="datetimerange" style="width: 250px; " format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="审核日期" end-placeholder="审核日期" />
-
-           
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <el-button type="primary"   @click="form_export">导出</el-button>
-          <!-- <el-button type="primary"   @click="form_add">添加用户</el-button>
-         -->
-      </div>
-
-      <div class="el-icon-info" style="font-size: 30px;float: right;color: #009C69;" @click="form_tip" />
-      <!-- 表格 -->
-      <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.pastureName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="报修单号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.code }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="设备名称" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.eqName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="设备编号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.eqCode }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="维修人" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.repairPerson }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="报修日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.date }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="接单日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.pickTime }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="完成维修日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.completionTime }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="审核日期" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.oneAuditTime }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="工时/h" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.gsTime }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="维修时间" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.wxTime }}</span>
-          </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>
-
-
-    <!-- 弹窗 提示-->
-    <el-dialog  title="算法说明" :visible.sync="tipFormShow" @close="tip_dialog_close" width="40%">
-      <div class="">
-        <div class="content">
-          1、工时按照结束单据时间减去接单时间（暂停就减去）。
-          <br/>
-          <br/>
-          2、维修时间按结束单据时间减报修时间（暂停就减去）。
-          <br>
-          
-        </div>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="tipFormShow = false">关闭</el-button>
-        </div>
-        
-      </div>
-    </el-dialog>
-
-  
-    
-  </div>
-
-
-</template> 
-
-<script>
-import {  ajaxDataGet, ajaxDataPost } from '@/api/common'
-import { parseTime, json2excel } from '@/utils/index.js'
-export default {
-  data() {
-
-    return {
-      //接口 - 获取 - 表格
-      url_get_table:'/authdata/audit/manhour/list',
-      //接口 - 下拉框 列表 
-      url_get_select1:'/authdata/pasture',
-
-
-      inputDatetime1: '',
-      inputDatetime2: '',
-      inputDatetime3: '',
-      inputDatetime4: '',
-
-
-      //获取 - 表格数据 - 参数
-      sendData: {
-   
-          eqName: '',
-          repairPerson:'',
-          startTime: '',
-          endTime: '',
-          startPick: '',
-          endPick: '',
-          startCompletion: '',
-          endCompletion: '',
-          startAudit: '',
-          endAudit: '', 
-          pageNum: 1,  //页码
-          pageSize: 10,   //每页数量
-          total: 0,  //总页数
-          pastureId: ''//parseFloat(sessionStorage.getItem('g_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' },
-      ],
-
-
-     
-      pastureList:[
-    
-      ],
-
-
-      tipFormShow:false,
-
-       
-    }
-  },
-  created(){
-     //表格 - 初始化 
-      this.get_table_data()
-
-      this.get_select_list1()
-  },
-  methods:{
-
- 
-    form_search(){
-      var me = this
-      if (this.sendData.inputDatetime1 === null) {
-        this.sendData.inputDatetime1 = ''
-      }
-      console.log('请求表格列表sendData1',me.sendData)
-      this.get_table_data()
-
-    },
-  
-    get_select_list1(){
-      var me = this
-      ajaxDataGet(me.url_get_select1, {  "pageNum": 1,   "pageSize": 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
-
-
-    if (me.inputDatetime1 == null) {
-      me.inputDatetime1 = ''
-      me.sendData.startTime = ''
-      me.sendData.endTime = ''
-    } else {
-      me.sendData.startTime = me.inputDatetime1[0]
-      me.sendData.endTime = me.inputDatetime1[1]
-    }
-
-
-    if (me.inputDatetime2 == null) {
-      me.inputDatetime2 = ''
-      me.sendData.startPick = ''
-        me.sendData.endPick = ''
-    } else {
-      me.sendData.startPick = me.inputDatetime2[0]
-      me.sendData.endPick = me.inputDatetime2[1]
-    }
-
-    if (me.inputDatetime3 == null) {
-      me.inputDatetime3 = ''
-      me.sendData.startCompletion = ''
-      me.sendData.endCompletion = ''
-    } else {
-      me.sendData.startCompletion = me.inputDatetime3[0]
-        me.sendData.endCompletion = me.inputDatetime3[1]
-    }
-
-
-    if (me.inputDatetime4 == null) {
-      me.inputDatetime4 = ''
-      me.sendData.startAudit = ''
-      me.sendData.endAudit = ''
-    } else {
-      me.sendData.startAudit = me.inputDatetime4[0]
-      me.sendData.endAudit = me.inputDatetime4[1]
-    }
- 
-    
-     
-     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)
-     // this.sendData.pageSize = item
-      //  this.getUserList()
-    },
-
-    //监听 pagenum 改变的事件
-    change_current_page(item){
-      console.log(item)
-       this.sendData.pageNum = item
-       this.get_table_data()
-    },
-
-
-    form_tip() {
- 
-      this.tipFormShow = true
-     
-    },
-
-    tip_dialog_close(){
-      this.tipFormShow = false
-    },
-
-    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() {
-      
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-
-          //关闭弹窗
-          this.$message({ type: 'success', message: '请求成功', duration: 2000 })
-          this.addFormShow = false
-        }
-      })
-    },
-
-    edit_dialog_save(){
-      this.addFormShow = false
-    },
-
-    form_delete(row) {
-      var me = this
-
-       me.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          me.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-        }).catch(() => {
-          me.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
-
-    form_set(row) {
-      var me = this 
-      console.log('row', row)
-      this.setForm = Object.assign({}, row) // copy obj
-      var roleList = row.
-
-
-      roleIdList
-      me.setFormShow = true
-      me.$nextTick(() => {
-        me.$refs['setFormRef'].clearValidate()
-      })
-    },
-
-
-
-    //监听关闭对话框
-    set_dialog_close(){
-       //内容重置
-       this.$refs['setFormRef'].resetFields()
-    },
-
-
-    set_dialog_save() {
-      var me = this
-      console.log(me.setForm)
-      
-      this.$refs['setFormRef'].validate(valid => {
-        //验证成功
-        // if (valid) {
-        //   //发起请求
-
-        //   //关闭弹窗
-        //   this.$message({ type: 'success', message: '请求成功', duration: 2000 })
-        //   this.setFormShow = false
-        // }
-      })
-    },
-
-
-
-  form_export() {
-    var me = this
- 
-    
-    // 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'
-    //     }
-    // ]
-
- 
-    var  download = me.sendData
-    download.pageSize = 1000
-
-    ajaxDataGet(me.url_get_table, download).then(e => {
-          console.log("表格请求结果：",e)
-            //打印请求成功结果
-            if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-
-              var tableList = []
-              
-            } else {
-
-              var tableList = e.data
-      
-            }
-
-            var excelDatas = [
-              { 
-                tHeader: ['序号', '单位', '报修单号', '设备名称', '设备编号','维修人','报修日期','接单日期','审核日期','工时/h','维修时间'],
-                filterVal: ['number', 'pastureName', 'code', 'eqName', 'eqCode','repairPerson',  'date', 'pickTime', 'oneAuditTime', 'gsTime', 'wxTime' ],
-                tableDatas: tableList,
-                sheetName: 'Sheet1'
-              }
-            ]
-            json2excel(excelDatas, '工时表格', true, 'xlsx')
-    
-    })
-
-
-   
-
-    
-}
-
-     
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style   scoped>
-
-  .content{
-      display:flex;
-    }
-</style>

src/views/power/Rights.vue

@@ -1,265 +0,0 @@
-<template>
- 
-  <div>
-
-    <h3>权限列表组件</h3>
-
-    <!-- 面包屑导航 -->
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>权限管理</el-breadcrumb-item>
-      <el-breadcrumb-item>权限列表</el-breadcrumb-item>
-    </el-breadcrumb>
-
-
-    <!-- 卡片视图区域 -->
-    <el-card class="box-card">
-      <!-- 添加与搜索区域 -->
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-input v-model="queryInfo.query" clearable placeholder="请输入内容" @clear="getUserList">
-            <el-button slot="append" icon="el-icon-search" @click="getUserList"></el-button>
-          </el-input>  
-        </el-col>
-        <el-col :span="4">
-          <el-button type="primary"   @click="form_add">添加用户</el-button>
-        </el-col>
-      </el-row>
-
-      <!-- 用户列表区域 -->
-      <el-table   :data="userlist"  stripe border>
-        <el-table-column  type = 'index'></el-table-column>
-        <el-table-column   label="姓名" prop="username"></el-table-column>
-        <el-table-column   label="部门" prop="dept"></el-table-column>
-        <el-table-column   label="电话" prop="mobile"></el-table-column>
-        <el-table-column   label="角色" prop="role_name"></el-table-column>
-        <el-table-column  label="状态" >
-          <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="操作"  >
-          <template slot-scope="scope">
-            <!-- 修改按钮 -->
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-            <!-- 删除按钮 -->
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-            <!-- 分配角色 -->
-            <el-button type="warning" size="mini" icon="el-icon-setting" @click="form_see(scope.row)">分配角色</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="handleSizeChange"  @current-change="handleCurrentChange"  :current-page="queryInfo.pagenum" :page-sizes="[1,5,10,20,30,50]"  :page-size="queryInfo.pagesize" layout="total, prev, pager, next" :total="total"/>
-   
-
-
-    </el-card>
-
-
-    <!-- 弹出层新增or修改 -->
-    <el-dialog  :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="add_dialog_close" width="50%">
-      <div class="content-add">
-        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="70px" >
-            <el-form-item label="用户名" prop="username">
-                <el-input   v-model="addForm.username"  :disabled="dialogStatus==='edit'"></el-input>  
-            </el-form-item>
-            <el-form-item label="密码" prop="password">
-                <el-input   v-model="addForm.password"></el-input>  
-            </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-                <el-input   v-model="addForm.email"></el-input>  
-            </el-form-item>
-            <el-form-item label="手机" prop="mobile">
-                <el-input   v-model="addForm.mobile"></el-input>  
-            </el-form-item>
-            
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
-          <el-button @click="dialogFormVisible = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-  </div>
-
-
-</template> 
-
-<script>
-import { GetDataByName, PostDataByName, ajaxData } from '@/api/common'
-
-export default {
-  data() {
-
-    
-    
-    return {
-      //获取用户列表的参数对象
-      queryInfo:{
-        query:'',
-        pagenum:1,  //当前页数
-        pagesize:10,  //每页显示多少条数据
-      },
-      rightlist:[
-        { authName:"admin", id:100, level:"0", path:null   },
-        { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
-        { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
-      ],
-   
-      tableData: [
-        {id: 1,dept: '销售部',username: '王小虎',role_name: '场长'}, 
-        {id: 2, dept: '销售部', username: '王小虎', role_name: '场长' }, 
-        {id: 3,dept: '销售部',  username: '王小虎',  role_name: '场长', },
-        {id: 3,dept: '销售部',  username: '王小虎',  role_name: '场长', },
-      ],
-      total:0,
-      // 弹窗显示
-
-
-      dialogFormVisible:false,
-      dialogStatus: '',
-      textMap: {
-        edit: '修改用户',
-        create: '新增用户'
-      },
-
-      addForm:{
-        username:'',password:'',email:'',mobile:''
-      },
-
-
-      
-      addFormRules:{
-        username: [
-          { required: true, message: '用户名必填', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度3-5个字符之间', trigger: 'blur' },
-        ],
-        password: [
-          { required: true, message: '密码必填', trigger: 'blur' },
-          { min: 3, max: 15, message: '长度3-15个字符之间', trigger: 'blur' },
-        ],
-        
-
-        
-      },
-       
-    }
-  },
-  created(){
-     //请求列表数据
-    // this.getUserList()
-  },
-  methods:{
-
-
-    async getUserList(){
-      const res  = await this.$http.post('/test', {
-        //queryInfo为当前请求的参数
-        params:this.queryInfo
-      })
-
-
-      console.log('res==============',res)
-      if(res.status !== 200){
-        return this.$message.error('获取用户列表失败')
-      }
-       this.userlist = res.data.userlist
-
-      
-    },
-
- 
-
-
-    //监听 pagesize 改变的事件
-    handleSizeChange(item){
-       this.queryInfo.pagesize = item
-       this.getUserList()
-    },
-
-    //监听 pagenum 改变的事件
-    handleCurrentChange(item){
-       this.queryInfo.pagenum = item
-       this.getUserList()
-    },
-
-
-    form_add() {
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    form_edit(row) {
-      console.log('row', row)
-      this.addForm = Object.assign({}, row) // copy obj
-      this.dialogStatus = 'edit'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    //监听关闭对话框
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-
-    add_dialog_save() {
-      
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-
-          //关闭弹窗
-          this.$message({ type: 'success', message: '请求成功', duration: 2000 })
-          this.dialogFormVisible = false
-        }
-      })
-    },
-
-    edit_dialog_save(){
-      this.dialogFormVisible = false
-    },
-
-    form_delete(row) {
-
-       this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
-     
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped>
- 
-</style>

src/views/power/Roles.vue

@@ -1,591 +0,0 @@
-<template>
- 
-  <div>
- 
-    <!-- 面包屑导航 -->
-    <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>角色管理</el-breadcrumb-item>
-      <el-breadcrumb-item>角色列表</el-breadcrumb-item>
-    </el-breadcrumb> -->
-
-
-    <!-- 卡片视图区域 -->
-    <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"   @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="300" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="scope">
-            <!-- 修改按钮 -->
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-            <!-- 删除按钮 -->
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-            <!-- 分配角色 -->
-            <el-button type="warning" size="mini" icon="el-icon-setting" @click="form_set(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-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>
-
-    
-
- 
-  </div>
-
-
-</template> 
-
-<script>
-import { ajaxDataGet, ajaxDataPost } 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', 
-      
-
-
-      //获取 - 表格数据 - 参数
-      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:[
-        // {
-        //   id:1, menuName:"功能模块", 
-        //   children: [
-        //     { 
-        //       menuName: "设备基础信息" ,id: 11,
-        //       children:[
-        //         // {
-        //         //   menuName: "商品列表" ,id: 111,
-        //         //   children:[{ menuName: "添加商品" ,id: 1111}, { menuName: "编辑商品" ,id: 1112}, { menuName: "删除商品" ,id: 1113}]
-        //         // },
-        //       ]
-        //     }, 
-        //     { 
-        //       menuName: "故障管理" ,id: 12,  children:[]
-        //     }, 
-        //     { 
-        //       menuName: "设备绑定" ,id: 13,  children:[]
-        //     }, 
-        //     { 
-        //       menuName: "备件管理" ,id: 14,  children:[]
-        //     }, 
-        //     { 
-        //       menuName: "盘点" ,id: 15,  children:[]
-        //     },   
-        //   ]
-        // },
-        // {
-        //   id:2, menuName:"工单", 
-        //   children: [
-        //     { 
-        //       menuName: "维修接单" ,id: 21,  children:[ ]
-        //     }, 
-        //     { 
-        //       menuName: "维修" ,id: 22,  children:[]
-        //     }, 
-        //     { 
-        //       menuName: "预防性维护" ,id: 23,  children:[]
-        //     },  
-        //   ]
-        // },
-        // {
-        //   id:3, menuName:"报修", 
-        //   children: [
-        //     { 
-        //       menuName: "报修" ,id: 31,  children:[ ]
-        //     }, 
-        //     { 
-        //       menuName: "派单" ,id: 32,  children:[]
-        //     }, 
-        //   ]
-        // },
-        // {
-        //   id:4, menuName:"审核", 
-        //   children: [
-        //     { 
-        //       menuName: "维修审核" ,id: 41,  children:[ ]
-        //     }, 
-        //     { 
-        //       menuName: "领用审核" ,id: 41,  children:[ ]
-        //     }, 
-        //     { 
-        //       menuName: "保养审核" ,id: 41,  children:[ ]
-        //     }, 
-       
-        //   ]
-        // },
-
- 
-      ],
-
-      //树形控件的属性绑定对象
-      treeProps:{
-        label:'menuName',children:'children'
-      },
-
-      //树形默认选中的值
-      checkedIdArr:[],
-
-       
-       
-    }
-  },
-  created(){
-      //表格 - 初始化 
-      this.get_table_data()
-       //下拉框
-      this.get_select_list1()
-  },
-  methods:{
-
- 
-    get_select_list1(){
-      var me = this
-      ajaxDataGet('/menu/tree', {"onlyMenu": false,}).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 })
-            }
-          })
-          
-          
-        }
-      })
-
-
-    },
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped> 
-</style>

src/views/power/Roles1.vue

@@ -1,430 +0,0 @@
-<template>
- 
-  <div>
- 
-    <!-- 面包屑导航 -->
-    <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>角色管理</el-breadcrumb-item>
-      <el-breadcrumb-item>角色列表</el-breadcrumb-item>
-    </el-breadcrumb>
-
-
-    <!-- 卡片视图区域 -->
-    <el-card class="box-card">
-      <!-- 添加 区域 -->
-      <el-row :gutter="20">
-        <el-col >
-          <el-button type="primary"   @click="form_add">添加角色</el-button>
-        </el-col>
-      </el-row>
-
-      <!-- 角色列表区域 -->
-      <el-table   :data="rolelist"  stripe border>
-        
-        <!-- 展开列 -->
-        <el-table-column   type = 'expand'>
-          <template slot-scope="scope">
-            <el-row :class="['bdbottom', i1 === 0 ? 'bdtop': '']" v-for="(item1, i1) in scope.row.children" :key="item1.id">
-              <!-- 渲染一级权限 -->
-              <el-col :span="5">
-                  <el-tag>{{item1.authName}}</el-tag>
-                  <i class="el-icon-caret-right"></i>
-              </el-col>
-              <!-- 渲染二级和三级权限 -->
-              <el-col :span="19">
-                  <el-row :class="[i2 === 0 ? 'bdtop': '']" v-for="(item2, i2) in item1.children" :key="item2.id">
-                    <el-col  :span="6">
-                      <el-tag type="success">{{item2.authName}}</el-tag>
-                      <i class="el-icon-caret-right"></i>
-                    </el-col>
-                    <el-col  :span="18">
-                      <el-tag  type="warning" v-for="(item3, i3) in item2.children" :key="item3.id" closable @close="removeRightById">{{item3.authName}}</el-tag>
-                    </el-col>
-                 </el-row>
-              </el-col>
-
-            </el-row>
-          </template>
-
-        </el-table-column>
-
-        <!--索引列 -->
-        <el-table-column  type = 'index'></el-table-column>
-        <el-table-column   label="角色名称" prop="roleName"></el-table-column>
-        <el-table-column   label="角色描述" prop="roleDesc"></el-table-column>
-
-
-        <el-table-column  label="状态" >
-          <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="操作" width="300px"  >
-          <template slot-scope="scope">
-            <!-- 修改按钮 -->
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-            <!-- 删除按钮 -->
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-            <!-- 分配角色 -->
-            <el-button type="warning" size="mini" icon="el-icon-setting" @click="show_setting(scope.row)">分配权限</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="handleSizeChange"  @current-change="handleCurrentChange"  :current-page="queryInfo.pagenum" :page-sizes="[1,5,10,20,30,50]"  :page-size="queryInfo.pagesize" layout="total, prev, pager, next" :total="total"/>
-   
-
-
-    </el-card>
-
-
-    <!-- 弹出层新增or修改 -->
-    <el-dialog  :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="add_dialog_close" width="50%">
-      <div class="content-add">
-        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="70px" >
-            <el-form-item label="用户名" prop="username">
-                <el-input   v-model="addForm.username"  :disabled="dialogStatus==='edit'"></el-input>  
-            </el-form-item>
-            <el-form-item label="密码" prop="password">
-                <el-input   v-model="addForm.password"></el-input>  
-            </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-                <el-input   v-model="addForm.email"></el-input>  
-            </el-form-item>
-            <el-form-item label="手机" prop="mobile">
-                <el-input   v-model="addForm.mobile"></el-input>  
-            </el-form-item>
-            
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
-          <el-button @click="dialogFormVisible = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-
-    <!-- 分配权限 -->
-    <el-dialog   title="分配权限" :visible.sync="dialogFormVisibleSetting" @close="dialogFormVisibleSetting = false" width="50%">
-      <div class="content-add">
-
-
-         <!-- 树形控件 -->
-        <el-tree   :data="rightlist" :props="treeProps" show-checkbox   node-key="id"  default-expand-all :default-checked-keys="defKeys"> </el-tree>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="dialogFormVisibleSetting = false">确认</el-button>
-          <el-button @click="dialogFormVisibleSetting = false">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-  </div>
-
-
-</template> 
-
-<script>
-import { GetDataByName, PostDataByName, ajaxData } from '@/api/common'
-
-export default {
-  data() {
-
-    
-    
-    return {
-      //获取用户列表的参数对象
-      queryInfo:{
-        query:'',
-        pagenum:1,  //当前页数
-        pagesize:10,  //每页显示多少条数据
-      },
-      rolelist:[
-        {
-          id:1, roleName:"主管", roleDesc:"技术负责人", 
-          children: [
-            { 
-              authName: "商品管理" ,id: 11,
-              children:[
-                {
-                  authName: "商品列表" ,id: 111,
-                  children:[{ authName: "添加商品" ,id: 1111}, { authName: "编辑商品" ,id: 1112}, { authName: "删除商品" ,id: 1113}]
-                },
-                {
-                  authName: "商品分类" ,id: 112,
-                  children:[{ authName: "添加分类" ,id: 1121},  { authName: "编辑分类" ,id: 1122},  { authName: "删除分类" ,id: 1123}]
-                },
-              ]
-            }, 
-            { 
-              authName: "订单管理" ,id: 12,
-              children:[
-                {
-                  authName: "订单列表" ,id: 121,
-                  children:[ { authName: "添加订单" ,id: 1211}, { authName: "编辑订单" ,id: 1212},  { authName: "删除订单" ,id: 1113}]
-                },
-              ]
-            }, 
-
-             
-          ]
-        },
-        {
-          id:1, roleName:"主管", roleDesc:"技术负责人", 
-          children: [
-            { 
-              authName: "商品管理" ,id: 11,
-              children:[
-                {
-                  authName: "商品列表" ,id: 111,
-                  children:[{ authName: "添加商品" ,id: 1111}, { authName: "编辑商品" ,id: 1112}, { authName: "删除商品" ,id: 1113}]
-                },
-                {
-                  authName: "商品分类" ,id: 112,
-                  children:[{ authName: "添加分类" ,id: 1121},  { authName: "编辑分类" ,id: 1122},  { authName: "删除分类" ,id: 1123}]
-                },
-              ]
-            }, 
-            { 
-              authName: "订单管理" ,id: 12,
-              children:[
-                {
-                  authName: "订单列表" ,id: 121,
-                  children:[ { authName: "添加订单" ,id: 1211}, { authName: "编辑订单" ,id: 1212},  { authName: "删除订单" ,id: 1113}]
-                },
-              ]
-            }, 
-
-             
-          ]
-        },
-        
-
- 
-      ],
-       
-    
-      total:0,
-      // 弹窗显示
-
-
-      dialogFormVisible:false,
-      dialogFormVisibleSetting:false,
-
-      //权限数据
-      rightlist:[
-        {
-          id:1, authName:"功能模块", 
-          children: [
-            { 
-              authName: "设备基础信息" ,id: 11,
-              children:[
-                // {
-                //   authName: "商品列表" ,id: 111,
-                //   children:[{ authName: "添加商品" ,id: 1111}, { authName: "编辑商品" ,id: 1112}, { authName: "删除商品" ,id: 1113}]
-                // },
-              ]
-            }, 
-            { 
-              authName: "故障管理" ,id: 12,  children:[]
-            }, 
-            { 
-              authName: "设备绑定" ,id: 13,  children:[]
-            }, 
-            { 
-              authName: "备件管理" ,id: 14,  children:[]
-            }, 
-            { 
-              authName: "盘点" ,id: 15,  children:[]
-            },   
-          ]
-        },
-        {
-          id:2, authName:"工单", 
-          children: [
-            { 
-              authName: "维修接单" ,id: 21,  children:[ ]
-            }, 
-            { 
-              authName: "维修" ,id: 22,  children:[]
-            }, 
-            { 
-              authName: "预防性维护" ,id: 23,  children:[]
-            },  
-          ]
-        },
-        {
-          id:3, authName:"报修", 
-          children: [
-            { 
-              authName: "报修" ,id: 31,  children:[ ]
-            }, 
-            { 
-              authName: "派单" ,id: 32,  children:[]
-            }, 
-          ]
-        },
-        {
-          id:4, authName:"审核", 
-          children: [
-            { 
-              authName: "待办" ,id: 41,  children:[ ]
-            }, 
-          ]
-        },
-
- 
-      ],
-
-      //树形控件的属性绑定对象
-      treeProps:{
-        label:'authName',children:'children'
-      },
-
-      //树形默认选中的值
-      defKeys:[1,11],
-
-      dialogStatus: '',
-      textMap: {
-        edit: '修改用户',
-        create: '新增用户'
-      },
-
-      addForm:{
-        username:'',password:'',email:'',mobile:''
-      },
-
-
-      
-      addFormRules:{
-        username: [
-          { required: true, message: '用户名必填', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度3-5个字符之间', trigger: 'blur' },
-        ],
-        password: [
-          { required: true, message: '密码必填', trigger: 'blur' },
-          { min: 3, max: 15, message: '长度3-15个字符之间', trigger: 'blur' },
-        ],
-        
-
-        
-      },
-       
-    }
-  },
-  created(){
- 
-  },
-  methods:{
-
- 
-
-    removeRightById(){
-
-    },
-
-
-    //监听 pagesize 改变的事件
-    handleSizeChange(item){
-       this.queryInfo.pagesize = item
-       this.getUserList()
-    },
-
-    //监听 pagenum 改变的事件
-    handleCurrentChange(item){
-       this.queryInfo.pagenum = item
-       this.getUserList()
-    },
-
-
-    show_setting() {
-      this.dialogFormVisibleSetting = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-
-    form_add() {
-      this.dialogStatus = 'create'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    form_edit(row) {
-      console.log('row', row)
-      this.addForm = Object.assign({}, row) // copy obj
-      this.dialogStatus = 'edit'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-
-    //监听关闭对话框
-    add_dialog_close(){
-       //内容重置
-       this.$refs['addFormRef'].resetFields()
-    },
-
-
-    add_dialog_save() {
-      
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-
-          //关闭弹窗
-          this.$message({ type: 'success', message: '请求成功', duration: 2000 })
-          this.dialogFormVisible = false
-        }
-      })
-    },
-
-    edit_dialog_save(){
-      this.dialogFormVisible = false
-    },
-
-    form_delete(row) {
-
-       this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
-     
-
-  }
-}
-</script>
-<!-- 加了scoped，则是仅在此组件里生效 -->
-<style scoped>
- .el-tag{margin:7px;}
-
- .bdtop{border-top:1px solid #eee}
- .bdbottom{border-bottom:1px solid #eee}
-.vcenter{display:flex;align-items:center;}
-</style>

src/views/systemManagement/User.vue

@@ -176,13 +176,15 @@ export default {
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        name:'',id:'' ,rolesId:undefined,
+        name:'',id:'' ,employee_name:'', phone:'',rolesId:undefined,
       },
 
+ 
+
       addFormRules:{
-        // name: [
-        //   { required: true, message: '类型必填', trigger: 'blur' },
-        // ],
+        name: [
+          { required: true, message: '类型必填', trigger: 'blur' },
+        ],
    
 
       },
@@ -308,7 +310,12 @@ export default {
     //清空弹窗表单信息
     reset_form(){
       this.addForm.name = ''
+   
+      this.addForm.employee_name = ''
+      this.addForm.phone = ''
       this.addForm.rolesId = undefined
+
+ 
     },
 
     //新增

src/views/user/Users.vue

@@ -1,594 +0,0 @@
-<template>
- 
-  <div>
-    <!-- <h3>用户列表组件</h3> -->
-    <!-- 面包屑导航 -->
-    <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>用户管理</el-breadcrumb-item>
-      <el-breadcrumb-item>用户列表</el-breadcrumb-item>
-    </el-breadcrumb> -->
-
-
-    <el-card class="box-card">
-      <!-- 添加与搜索区域 -->
-      <div class="search-bx1">
-          <el-select v-model="sendData.pastureId" filterable placeholder="单位" style="width: 240px;" class="g-mr20">
-            <el-option   v-for="item in pastureList"  :key="item.id"   :label="item.name"     :value="item.id"
-            />
-          </el-select>
-
-  
-          <el-select v-model="sendData.roleId" filterable placeholder="角色" style="width: 240px;" class="g-mr20">
-            <el-option   v-for="item in roleSelectList"  :key="item.roleId"   :label="item.roleName"     :value="item.roleId"
-            />
-          </el-select>
-          
-          <el-input v-model="sendData.nameOrLoginName" placeholder="姓名"  style="width: 220px;" class="g-mr20" clearable />
-         
-          <el-input v-model="sendData.loginName" placeholder="工号"  style="width: 220px;" class="g-mr20" clearable />
-           
- 
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <!-- <el-button type="primary"   @click="form_add">添加用户</el-button>
-          <el-button type="primary"   @click="form_export">导出</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.pastureName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="姓名" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.actualName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="工号" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.loginName }}</span>
-          </template>
-        </el-table-column>
- 
-        <el-table-column label="电话" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.phone }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="角色" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.roleNameList  }}</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="300" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="scope">
-            <!-- 修改按钮 -->
-            <!-- <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>-->
-            <!-- 删除按钮 -->
-             <!-- <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button> -->
-            <!-- 分配角色 -->
-            <el-button type="warning" size="mini" icon="el-icon-setting" @click="form_set(scope.row)">分配角色</el-button>
-            
-            <el-button type="warning" size="mini"   @click="reset_password(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="username">
-                <el-input   v-model="addForm.username"  :disabled="addFormStatus==='edit'"></el-input>  
-            </el-form-item>
-            <el-form-item label="密码" prop="password">
-                <el-input   v-model="addForm.password"></el-input>  
-            </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-                <el-input   v-model="addForm.email"></el-input>  
-            </el-form-item>
-            <el-form-item label="手机" prop="mobile">
-                <el-input   v-model="addForm.mobile"></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-form-item label="用户名" prop="username">
-                <el-input   v-model="setForm.username"  disabled ></el-input>  
-            </el-form-item> -->
-        
-            <el-form-item   label="角色" prop="roleList">
-            <el-select v-model="setForm.roleIdList" style="width:400px;" multiple placeholder="角色">
-              <el-option v-for="item in roleList" :key="item.roleId" :label="item.roleName" :value="item.roleId" />
-            </el-select>
-          </el-form-item>
-     
-            
-        </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>
-
-    
-  </div>
-
-
-</template> 
-
-<script>
-import {  ajaxDataGet, ajaxDataPost } from '@/api/common'
-import { parseTime, json2excel } from '@/utils/index.js'
-export default {
-  data() {
-
-
-    
-
-    //自定义的验证邮箱规则
-    var checkEmail = (rule, value, cb) => {
-        const regEmail = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/
-
-        if(regEmail.test(value)){
-          //合法的邮箱
-          return cb()
-        }
-
-        cb(new Error('请输入合法的邮箱'))
-      
-    }
-    //自定义的验证手机号规则
-    var checkMobile = (rule, value, cb) => {
-        const regMobile= /^(0|86|17951)?(13[0-9]|15[0123456789]|17[678]|18[0-9]|14[57]|)[0-9]{8}$/
- 
-        if(regMobile.test(value)){
-          return cb()
-        }
-
-        cb(new Error('请输入合法的手机号'))
-      
-    }
-    return {
-
- 
-
-      //接口 - 获取 - 表格
-      url_get_table:'/role/employee/getRoles',
-      //接口 - 新增 - 表格
-      url_add_table:'//',  
-      //接口 - 修改 - 表格
-      url_edit_table:'//', 
-      //接口 - 删除 - 表格
-      url_delete_table:'//', 
-      
-      //接口 - 下拉框 列表 
-      url_get_select1:'/role/getAll',
-
-
-      //获取 - 表格数据 - 参数
-      sendData:{
-        pastureName: "",
-        nameOrLoginName: "", 
-        loginName: "",
-        roleId: "",
-      
-        pageNum: 1,  //页码
-        pageSize: 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' },
-      ],
-
-
-      
-      pastureList:[
-    
-      ],
-
-      roleSelectList:[
-
-      ],
-
-
- 
-
-
-      addFormShow:false,
-      addFormStatus: '',
-      addFormTxt: {  edit: '修改用户',  create: '新增用户' },
-      addForm:{
-        username:'',password:'',email:'',mobile:''
-      },
-
-      addFormRules:{
-        // username: [
-        //   { required: true, message: '用户名必填', trigger: 'blur' },
-        //   { min: 3, max: 5, message: '长度3-5个字符之间', 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:{
-        roleIdList:[]
-      },
-
-      roleList:[
-        { "roleId": 1,   "roleName": "厂长",   "remark": ""  },
-        {  "roleId": 34, "roleName": "副厂长",   "remark": ""  },
-        {  "roleId": 35,  "roleName": "设备主管",   "remark": ""  },
-        {  "roleId": 36,  "roleName": "维修工",   "remark": ""   },
-      ]
-       
-    }
-  },
-  created(){
-     //表格 - 初始化 
-     // this.get_table_data()
-
-      this.get_select_list1()
-  },
-  methods:{
-
- 
-    form_search(){
-      var me = this
-      console.log('请求表格列表sendData',me.sendData)
-      this.get_table_data()
-
-    },
-  
-    get_select_list1(){
-        var me = this
-        ajaxDataGet(me.url_get_select1, {"roleName": "",  "pageNum": 1,   "pageSize": 1000}).then(e => {
-          console.log("下拉框1：",e)
-
-          //打印请求成功结果
-          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-            me.roleList = []
-          } else {
-            me.roleList = e.data
-          }
-
-         
-  
-        })
-
-
-        ajaxDataGet('/authdata/pasture', {  "pageNum": 1,   "pageSize": 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
-          }
-  
-        })
-
-        ajaxDataGet('/role/getAll', { "roleName": "",  "pageNum": 1,   "pageSize": 1000}).then(e => {
-          console.log("角色下拉框1：",e)
-
-          //打印请求成功结果
-          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
-            me.roleSelectList = []
-          } else {
-            me.roleSelectList = e.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)
-     // this.sendData.pageSize = item
-      //  this.getUserList()
-    },
-
-    //监听 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() {
-      
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-
-          //关闭弹窗
-          this.$message({ type: 'success', message: '请求成功', duration: 2000 })
-          this.addFormShow = false
-        }
-      })
-    },
-
-    edit_dialog_save(){
-      this.addFormShow = false
-    },
-
-    form_delete(row) {
-      var me = this
-
-       me.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          me.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-        }).catch(() => {
-          me.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-
-
-       
-    },
-
-
-    form_set(row) {
-      var me = this 
-      console.log('row', row)
-      this.setForm = Object.assign({}, row) // copy obj
-      var roleList = row.
-
-
-      roleIdList
-      me.setFormShow = true
-      me.$nextTick(() => {
-        me.$refs['setFormRef'].clearValidate()
-      })
-    },
-
-
-
-    //监听关闭对话框
-    set_dialog_close(){
-       //内容重置
-       this.$refs['setFormRef'].resetFields()
-    },
-
-
-    set_dialog_save() {
-      var me = this
-      console.log(me.setForm)
-
-
-
-
-      var send_data = {
-          "roleId":  me.setForm.roleIdList,
-          "employeeId":  me.setForm.employeeId
-      }
-
-        //加载 - 发送编辑保存
-        ajaxDataPost("/role/employee/add", send_data).then(e => {
-            console.log("权限结果：",e)
-              //打印请求成功结果
-              if(e.code == 200  ){
-                me.$message({ type: 'success', message: '设置成功！'  , duration: 2000 })
-                //关闭弹窗
-                me.setFormShow = false
-                me.get_table_data()
-              } else {
-                me.$message({ type: 'error', message: '设置失败！' + e.msg, duration: 2000 })
-              }
-          })
-  
-    },
-    reset_password(row) {
-      var me = this
-
-         var send_data = {
-    
-              "empId":  row.employeeId
-          }
-
-       me.$confirm('是否默认密码为Gm@5418#?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-
-           //加载 - 发送保存
-           ajaxDataPost('/employee/password/reset', 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 })
-              }
-          })
-          // me.$message({
-          //   type: 'success',
-          //   message: '删除成功!'
-          // });
-        }).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/workManagement/WorkTaskAssign.vue

@@ -1,78 +1,7 @@
 <template>
  
   <div>
-
-
-    <el-card class="box-card">
-      <!-- 搜索区域 -->
-      <div class="search-bx1">
-          <el-input v-model="searchData.name" placeholder="犊牛类型"  style="width: 220px;" class="g-mr20" clearable />
-          <el-button type="primary"   @click="form_search">搜索</el-button>
-          <el-button type="primary"   @click="form_clear">重置</el-button>
-          <el-button type="primary"   v-if="isButtonEdit" @click="form_add">添加</el-button>
-           <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
-      </div>
-
- 
-      <!-- 表格 -->
-      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
-        <el-table-column label="序号"  width="50px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.id }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="类型名称" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="犊牛数量" min-width="150px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.number }}</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="300" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="scope">
-             <!-- 修改按钮 -->
-             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
-             <!-- 删除按钮 -->
-             <el-button type="danger" v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页区域 -->
-      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.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="100px"  style="width:50%;margin:0 auto 50px">
-            <el-form-item label="类型名称：" prop="name">
-                <el-input   v-model="addForm.name"  ></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>
-
- 
-    
+        1.1版本页面，待开发
   </div>
 
 
@@ -161,17 +90,17 @@ export default {
     }
   },
   created(){
-      //获取按钮权限
-      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
-      this.isButtonEdit = isButtonEdit
-      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
      
 
-     //获取下拉框
-     // this.get_select_list1()
+    //  获取下拉框
+    //  this.get_select_list1()
 
-      //表格 - 初始化 
-      this.get_table_data()
+    //   //表格 - 初始化 
+    //   this.get_table_data()
 
      
 

src/views/workManagement/WorkTaskAssign1.vue

@@ -0,0 +1,692 @@
+<template>
+ 
+  <div>
+
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+          <el-input v-model="searchData.number" placeholder="工单编号"  style="width: 180px;" class="g-mr20 g-mb20" clearable />
+          <el-input v-model="searchData.user_name" placeholder="负责人"  style="width: 180px;" class="g-mr20" clearable />
+          <el-input v-model="searchData.user_phone" placeholder="负责人手机号"  style="width: 180px;" class="g-mr20" clearable />
+          <el-input v-model="searchData.operation_user" placeholder="派单人"  style="width: 180px;" class="g-mr20" clearable />
+          <el-input v-model="searchData.operation_phone" placeholder="派单人手机号"  style="width: 180px;" class="g-mr20" clearable />
+          <el-select v-model="searchData.work_order_category_id" filterable placeholder="类型" class="g-mr20" style="width: 180px;" clearable>
+            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+          <el-select v-model="searchData.status" filterable placeholder="状态" class="g-mr20" style="width: 180px;" clearable>
+            <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+
+          <el-date-picker v-model="searchData.inputDatetime1" class="g-mr20" type="daterange" range-separator="至" start-placeholder="完成时间" end-placeholder="完成时间" style="width: 250px;" />
+
+          <el-date-picker v-model="searchData.inputDatetime2" class="g-mr20" type="daterange" range-separator="至" start-placeholder="派单时间" end-placeholder="派单时间" style="width: 250px;" />
+        
+          
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <el-button type="primary"   @click="form_clear">重置</el-button>
+          <el-button type="primary"   v-if="isButtonEdit" @click="form_add">添加</el-button>
+           <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
+      </div>
+
+ 
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工单编号" min-width="150px" 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.work_order_category_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span v-if = "scope.row.status == 0">未知</span>
+            <span v-if = "scope.row.status == 1">未完成</span>
+            <span v-if = "scope.row.status == 2">已关闭</span>
+            <span v-if = "scope.row.status == 3">已完成</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="对象" min-width="150px" align="center">
+          <template slot-scope="scope">
+             <el-button type="primary" size="mini"  @click="form_record_see(scope.row)">查看</el-button>
+          </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="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.user_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="负责人手机号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.user_phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派单人" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.operation_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派单人手机号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.operation_phone }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派单时间" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.created_at_format }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="完成时间" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.finished_at_format }}</span>
+          </template>
+        </el-table-column>
+       
+         
+  
+
+        <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="scope">
+             <!-- 修改按钮 -->
+             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+             <!-- 删除按钮 -->
+             <el-button type="danger" v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">关闭工单</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.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="140px"  style="width:90%;margin:0 auto 50px">
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="工单类型：" prop="name">
+                <el-select  v-model="addForm.formula_id"  placeholder="请选择" class="filter-item" style="width: 100%;" >
+                  <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="负责人员：" prop="formula_id">
+                <el-select  v-model="addForm.formula_id"  placeholder="请选择" class="filter-item" style="width: 100%;" @change = "change_person" >
+                  <el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="工单任务：" prop="name">
+                <el-input  v-model="addForm.remark" type="textarea" maxlength="200"   :rows="3"  />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="负责人手机号：" prop="name">
+                <el-input  v-model="addForm.remark" type="input"   />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
+          <el-row :gutter="20">
+              <el-transfer  :titles="['栏舍组名称', '栏舍名称组']" v-model="transDataChooseRight1" :data="transDataList1" :props="{  key: 'id',   label: 'name'  }" @change="change_transData1"></el-transfer>
+          </el-row>
+
+          <el-row :gutter="20">
+              <el-transfer  :titles="['栏舍名称', '栏舍名称']" v-model="transDataChooseRight2" :data="transDataList2" :props="{  key: 'id',   label: 'name'  }" @change="change_transData2"></el-transfer>
+          </el-row>
+           
+            
+        </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>
+
+ 
+    
+  </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/work_order/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/work_order/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/work_order/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/work_order/close', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        number: "",
+        user_name: "",
+        user_phone: "",
+        operation_user: "",
+        operation_phone: "",
+        work_order_category_id: undefined,
+        status: 0,
+        start_finished_time: "",
+        end_finished_time: "",
+        start_created_time: "",
+        end_created_time: "",
+        inputDatetime1:"",
+        inputDatetime2:"",
+        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' },
+      ],
+
+
+      
+      typeList:[
+        
+      ],
+
+      personList:[
+        
+        ],
+
+      statusList:[
+        {id: 0, name: '未知'},
+        {id: 1, name: '未完成'},
+        {id: 2, name: '已关闭'},
+        {id: 3, name: '已完成'},
+      ],
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+
+      //穿梭框右边的值
+      transDataChooseRight1:[],
+      //穿梭框所有列表
+      transDataList1:[
+        // {key:1,label:'组1',disabled:false},
+        // {key:2,label:'组2',disabled:false},
+        // {key:3,label:'组3',disabled:false},
+        // {key:4,label:'组4',disabled:false},
+        // {key:5,label:'组5',disabled:false},
+        // {key:6,label:'组6',disabled:false},
+        // {key:7,label:'组7',disabled:false},
+      ],
+
+      //穿梭框右边的值
+      transDataChooseRight2:[],
+      //穿梭框所有列表
+      transDataList2:[
+        // {key:1,label:'组1',disabled:false},
+        // {key:2,label:'组2',disabled:false},
+        // {key:3,label:'组3',disabled:false},
+        // {key:4,label:'组4',disabled:false},
+        // {key:5,label:'组5',disabled:false},
+        // {key:6,label:'组6',disabled:false},
+        // {key:7,label:'组7',disabled:false},
+      ],
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+     //获取下拉框
+     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('/api/v1/ops/base_setting/category_table/list?page=1&page_size=1000', {}).then(e => {
+          console.log("工单下拉框1：",e)
+          if(e.code == 200 ){
+            me.typeList = e.data.list
+          } else {
+            me.typeList = []
+          }
+
+        })
+
+        
+ 
+
+
+        ajaxDataPost('/api/v1/system/user/list?page=1&page_size=1000', {name:""}).then(e => {
+          console.log("人员下拉：",e)
+          if(e.code == 200 ){
+            me.personList = e.data.list
+          } else {
+            me.personList = []
+          }
+
+        })
+
+
+        ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=1000', {name:""}).then(e => {
+          console.log("穿梭框1：",e)
+
+          //打印请求成功结果
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.transDataList1 = []
+          } else {
+            var transDataList1 = e.data.list
+            transDataList1.forEach(function(item){
+              item.name = item.name + "（犊牛数量："+ item.calf_number + "）"
+            })
+            me.transDataList1 = transDataList1
+          }
+
+        })
+
+
+        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
+          console.log("穿梭框2：",e)
+
+          //打印请求成功结果
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.transDataList2 = []
+          } else {
+        
+            var transDataList2 = e.data.list
+            transDataList2.forEach(function(item){
+              if(item.stauts == 4){
+                item.name = item.name + "（犊牛数量：0）"
+              } else {
+                item.name = item.name + "（犊牛数量：1）"
+              }
+              
+            })
+            me.transDataList2 = transDataList2
+
+          }
+
+        })
+    
+    },
+
+    
+    //获取 表格
+    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)
+      if (me.searchData.inputDatetime1 !== '' && me.searchData.inputDatetime1 !== null) {
+          me.searchData.min_operation_time = parseTime(me.searchData.inputDatetime1[0], '{y}-{m}-{d}')
+          me.searchData.max_operation_time = parseTime(me.searchData.inputDatetime1[1], '{y}-{m}-{d}')
+        } else {
+          me.searchData.inputDatetime1 = ''
+          me.searchData.min_operation_time = ''
+          me.searchData.max_operation_time = ''
+        }
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.number = ""
+      me.searchData.user_name = ""
+      me.searchData.user_phone = ""
+      me.searchData.operation_user = ""
+      me.searchData.operation_phone = ""
+      me.searchData.work_order_category_id = undefined
+      me.searchData.status = 0
+      me.searchData.start_finished_time = ""
+      me.searchData.end_finished_time = ""
+      me.searchData.start_created_time = ""
+      me.searchData.end_created_time = ""
+      me.searchData.inputDatetime1 = ""
+      me.searchData.inputDatetime2 = ""
+
+      me.searchData.page = 1
+      me.searchData.page_size = 10
+
+
+ 
+
+      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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+    change_person(value){
+      var me = this 
+      console.log("更改牛号Id",value)
+      var item  = me.cowNameList.find(obj => obj.calf_code == value)
+      console.log("更改牛号当前的内容",item)
+      me.addForm.calf_code = item.calf_code
+      me.addForm.calf_category_id = item.calf_category_id
+      me.addForm.calf_category_name = item.calf_category_name
+      me.addForm.original_barn_id = item.barn_id
+      me.addForm.original_barn_name = item.barn_name
+          
+    },
+
+    //监听 - 穿梭框选到右边的值
+    change_transData1(value){
+      console.log("穿梭框选到右边的值",value)
+    },
+
+    //监听 - 穿梭框选到右边的值
+    change_transData2(value){
+      console.log("穿梭框选到右边的值",value)
+    },
+ 
+    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>
+.el-transfer /deep/.el-transfer-panel {  width:300px;  text-align: left;}
+</style>

src/views/workManagement/WorkTaskImplement.vue

@@ -0,0 +1,396 @@
+<template>
+ 
+  <div>
+        1.1版本页面，待开发
+  </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/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+    //   //获取按钮权限
+    //   const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+    //   this.isButtonEdit = isButtonEdit
+    //   console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+    //  获取下拉框
+    //  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
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1：",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        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 = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      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,
+          }
+          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 = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          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>

系统导航Sql备份/system_menu.sql

@@ -0,0 +1,101 @@
+/*
+ Navicat MySQL Data Transfer
+
+ Source Server         : 192.168.1.70
+ Source Server Type    : MySQL
+ Source Server Version : 50736 (5.7.36)
+ Source Host           : 192.168.1.70:3306
+ Source Schema         : calf_feed
+
+ Target Server Type    : MySQL
+ Target Server Version : 50736 (5.7.36)
+ File Encoding         : 65001
+
+ Date: 18/10/2023 13:45:49
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for system_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `system_menu`;
+CREATE TABLE `system_menu`  (
+  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '自增id',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '菜单名称',
+  `menu_type` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '菜单类型 0 无效 1 菜单 2 按钮',
+  `level` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '菜单等级 1 一级 2 二级 3 三级',
+  `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '标题',
+  `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '路径',
+  `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '组件',
+  `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '图标',
+  `sort` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序',
+  `redirect` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '重定向',
+  `parent_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父id',
+  `is_show` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '是否启用 0 无效 1 启动 2 关闭',
+  `is_delete` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否删除 0 无效 1 未删除 2 已删除',
+  `created_at` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `updated_at` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_name`(`name`) USING BTREE,
+  INDEX `idx_parent_id`(`parent_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 141 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统菜单表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of system_menu
+-- ----------------------------
+INSERT INTO `system_menu` VALUES (87, '数据统计', 1, 1, '数据统计', 'process:time', 'Layout', 'iconfont el-icon-s-ORDER', 7, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (88, '牛只管理', 1, 1, '牛只管理', 'calf:management ', 'Layout', 'iconfont el-icon-s-ORDER', 6, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (89, '栏舍管理', 1, 1, '栏舍管理', 'barn:management', 'Layout', 'iconfont el-icon-s-ORDER', 5, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (90, '配方计划', 1, 1, '配方计划', 'feed:plan', 'Layout', 'iconfont el-icon-s-ORDER', 4, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (91, '工单管理', 1, 1, '工单管理', 'work:order', 'Layout', 'iconfont el-icon-s-ORDER', 3, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (92, '基础设置', 1, 1, '基础设置', 'base:setting', 'Layout', 'iconfont el-icon-s-ORDER', 2, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (93, '系统设置', 1, 1, '系统设置', 'system:setting', 'Layout', 'iconfont el-icon-s-ORDER', 1, '', 0, 1, 1, 1692689011, 1692689011);
+INSERT INTO `system_menu` VALUES (95, '饲喂过程', 1, 2, '饲喂过程', 'FeedProcess', '', 'iconfont el-icon-s-ORDER', 1, '', 87, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (96, '牛只信息', 1, 2, '牛只信息', 'CowInfo', '', 'iconfont el-icon-s-ORDER', 1, '', 88, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (97, '事件记录', 1, 2, '事件记录', 'EventRecord', 'systemManagement/eventInfo/index', 'iconfont el-icon-s-ORDER', 1, '', 88, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (98, '牛只栏舍', 1, 2, '牛只栏舍', 'CowCowShed', 'systemManagement/calfBarn/index', 'iconfont el-icon-s-ORDER', 1, '', 89, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (99, '栏舍分组', 1, 2, '栏舍分组', 'CowShedGroup', 'systemManagement/calfBarnGroup/index', 'iconfont el-icon-s-ORDER', 1, '', 89, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (100, '饲喂计划', 1, 2, '饲喂计划', 'FeedPlan', 'systemManagement/feedPlan/index', 'iconfont el-icon-s-ORDER', 1, '', 90, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (101, '配方模板', 1, 2, '配方模板', 'FormulaTemplate', 'systemManagement/forageInfo/index', 'iconfont el-icon-s-ORDER', 1, '', 90, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (102, '犊牛类型', 1, 2, '犊牛类型', 'CalfType', 'systemManagement/calfInfo/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (103, '饲喂车管理', 1, 2, '饲喂车管理', 'FeedCarManagement', 'systemManagement/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (104, '预设饲喂模板', 1, 2, '预设饲喂模板', 'FeedTemplate', 'systemManagement/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (105, '默认标准参数', 1, 2, '默认标准参数', 'DefaultPara', 'systemManagement/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (106, '饲料成本设置', 1, 2, '饲料成本设置', 'FeedCostSet', 'systemManagement/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 92, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (107, '角色管理', 1, 2, '角色管理', 'Role', 'systemManagement/role/index', 'iconfont el-icon-s-ORDER', 1, '', 93, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (108, '用户管理', 1, 2, '用户管理', 'User', 'user/feedVehicle/index', 'iconfont el-icon-s-ORDER', 1, '', 93, 1, 1, 1683707629, 1684290645);
+INSERT INTO `system_menu` VALUES (109, '牛只信息编辑', 2, 3, '牛只信息编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 96, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (110, '事件记录编辑', 2, 3, '事件记录编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 97, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (111, '牛只栏舍编辑', 2, 3, '牛只栏舍编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 98, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (112, '栏舍分组编辑', 2, 3, '栏舍分组编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 99, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (113, '饲喂计划编辑', 2, 3, '饲喂计划编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 100, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (114, '配方模板编辑', 2, 3, '配方模板编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 101, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (115, '犊牛类型编辑', 2, 3, '犊牛类型编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 102, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (116, '饲喂车管理编辑', 2, 3, '饲喂车管理编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 103, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (117, '预设饲喂模板编辑', 2, 3, '预设饲喂模板编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 104, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (118, '默认标准参数编辑', 2, 3, '默认标准参数编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 105, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (119, '饲料成本设置编辑', 2, 3, '饲料成本设置编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 106, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (120, '用户管理编辑', 2, 3, '用户管理编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 108, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (121, '角色管理编辑', 2, 3, '角色管理编辑', '', 'console/menu/show/index', 'iconfont el-icon-s-ORDER', 1, '', 107, 1, 1, 1683707629, 1685417159);
+INSERT INTO `system_menu` VALUES (123, '工单任务分派', 1, 2, '工单任务分派', 'WorkTaskAssign', '', '', 0, '', 91, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (124, '工单任务执行', 1, 2, '工单任务执行', 'WorkTaskImplement', '', '', 0, '', 91, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (125, '增重趋势', 1, 2, '增重趋势', 'WeightTrend', '', '', 0, '', 87, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (126, '配方效果', 1, 2, '配方效果', 'FormulaEffect', '', '', 0, '', 87, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (127, '成长达标率', 1, 2, '成长达标率', 'GrowthRate', '', '', 0, '', 87, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (128, '饲料成本', 1, 2, '饲料成本', 'FeedCost', '', '', 0, '', 87, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (129, '疾病情况', 1, 2, '疾病情况', 'DiseaseSituation', '', '', 0, '', 87, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (130, '存活率', 1, 2, '存活率', 'SurvivalRate', '', '', 0, '', 87, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (131, '称量记录', 1, 2, '称量记录', 'WeightRecord', '', '', 0, '', 88, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (132, '工单类型', 1, 2, '工单类型', 'WorkOrderType', '', '', 0, '', 92, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (133, '疾病管理', 1, 2, '疾病管理', 'DiseaseManagement', '', '', 0, '', 92, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (134, '消息提醒', 1, 2, '消息提醒', 'InfoRemind', '', '', 0, '', 92, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (135, '称量记录编辑', 2, 3, '称量记录编辑', '', '', '', 0, '', 131, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (136, '工单任务分派编辑', 2, 3, '工单任务分派编辑', '', '', '', 0, '', 123, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (137, '工单任务执行编辑', 2, 3, '工单任务执行编辑', '', '', '', 0, '', 124, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (138, '工单类型编辑', 2, 3, '工单类型编辑', '', '', '', 0, '', 132, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (139, '疾病管理编辑', 2, 3, '疾病管理编辑', '', '', '', 0, '', 133, 1, 1, 0, 0);
+INSERT INTO `system_menu` VALUES (140, '消息提醒编辑', 2, 3, '消息提醒编辑', '', '', '', 0, '', 134, 1, 1, 0, 0);
+
+SET FOREIGN_KEY_CHECKS = 1;