linan 4 年之前
父節點
當前提交
9c9884a6b0
共有 11 個文件被更改,包括 15 次插入38 次删除
  1. 1 1
      .eslintrc.js
  2. 二進制
      public/favicon.ico
  3. 二進制
      public/favicon副.ico
  4. 1 1
      public/index.html
  5. 1 1
      src/api/production.js
  6. 二進制
      src/assets/login_bg.jpg
  7. 二進制
      src/assets/logo.png
  8. 3 3
      src/views/Login/Login.vue
  9. 二進制
      src/views/device/source/video2.mp4
  10. 二進制
      src/views/device/source/video222.mp4
  11. 9 32
      src/views/production/batch.vue

+ 1 - 1
.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
   },
   extends: ['plugin:vue/essential'],
   rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-console': process.env.NODE_ENV === 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
   },
   parserOptions: {

二進制
public/favicon.ico


二進制
public/favicon副.ico


+ 1 - 1
public/index.html

@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1.0">
 	<link rel="icon" href="<%= BASE_URL %>favicon.ico">
 	<!--引入UI组件库(1.1版本) -->
-	<title>慧牧科技——云服务平台</title>
+	<title>湖羊养殖</title>
 </head>
 
 <body>

+ 1 - 1
src/api/production.js

@@ -4,7 +4,7 @@ import { ajax } from "../sdk/ajax";
 /* 批次管理  Batch*/
 export const reqBatchList = (data) => ajax("post", "/farm-huyang/batch/list", data)
 
-export const reqSeedEweSheepList = (data) => ajax("post", "/farm-huyang/sheep/listForBatch", data)
+export const reqSeedEweSheepList = (data) => ajax("post", "/farm-huyang/commercial/listForBatch", data)
 
 export const reqAddBatch = (data) => ajax("post", "/farm-huyang/batch/create", data)
 

二進制
src/assets/login_bg.jpg


二進制
src/assets/logo.png


+ 3 - 3
src/views/Login/Login.vue

@@ -2,8 +2,8 @@
     <div class="login">
         <div class="shade">
             <header class="header">
-                <img class="logo" src="../../assets/logo.png" alt="慧牧科技LOGO" />
-                慧牧科技
+                <img class="logo" src="../../assets/logo.png" alt="长兴湖羊LOGO" />
+                长兴湖羊
             </header>
             <article class="article">
                 <h1>登录界面</h1>
@@ -127,7 +127,7 @@ export default {
     width: 100%;
     height: 100%;
     background: url(../../assets/login_bg.jpg) 0 0 no-repeat;
-    background-size: 100%;
+    background-size: 100% 100%;
     .shade {
         height: 100%;
         width: 100%;

二進制
src/views/device/source/video2.mp4


二進制
src/views/device/source/video222.mp4


+ 9 - 32
src/views/production/batch.vue

@@ -71,46 +71,23 @@
                     :row-key="getRowKeys"
                 >
                     <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-                    <el-table-column prop="id" label="羊编码" width="100"></el-table-column>
-                    <el-table-column label="入场时间" width="200">
+                    <el-table-column prop="id" label="商品羊编码"></el-table-column>
+
+                    <el-table-column prop="fatherId" label="父亲ID"></el-table-column>
+                    <el-table-column prop="motherId" label="母亲ID"></el-table-column>
+                    <el-table-column prop="birthWeight" label="出生重量"></el-table-column>
+                    <el-table-column label="出生时间">
                         <template v-slot="scope">
-                            <span>{{ scope.row['entryTime'].substr(0,10) }}</span>
+                            <span>{{ scope.row['birthday'].substr(0,10) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayOfAge" label="入场日龄"></el-table-column>
-                    <el-table-column label="种羊来源">
+                    <el-table-column prop="status" label="状态">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedSource']" :key="item.value">
-                                <span v-if="item.value == scope.row['source']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="position" label="当前位置"></el-table-column>
-                    <el-table-column label="当前状态">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedStatus']" :key="item.value">
+                            <div v-for="item in $store.state['prductSheedStatus']" :key="item.value">
                                 <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="cost" label="成本价格(元)"></el-table-column>
-                    <el-table-column prop="weight" label="体重(kg)"></el-table-column>
-                    <el-table-column prop="feederName" label="饲养员">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['workerList']" :key="item.value">
-                                <span
-                                    v-if="item.id == scope.row['feeder']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="等级评级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['level']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
                 </el-table>
 
                 <el-row type="flex" justify="end" style="margin-top: 20px">