浏览代码

部分页面调整

linan 4 年之前
父节点
当前提交
b42405d1e6

+ 7 - 6
src/store/index.js

@@ -1,24 +1,25 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+import publicType from './publicType.js' // 公共的类型 
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
 	strict: true,
 	state: {
-		token: localStorage.getItem("token")
+		...publicType
 	},
 	getters: {
-		token: state => state.token,
 	},
 	mutations: {
-		setToken(state, token) {
-			state.token = token
+		setState(state, [key,val]) {
+			state[key] = val
 		}
 	},
 	actions: {
-		login({ commit }, token) {
-			commit('setToken', token)
+		login(aa, token) {
+			// commit('setToken', token)
+			console.log(aa)
 		},
 	}
 })

+ 110 - 0
src/store/publicType.js

@@ -0,0 +1,110 @@
+// 种羊来源 类型
+const seedSheedSource = [
+    { label: "本场出生", value: 1 },
+    { label: "它场转入", value: 2 }
+]
+
+// 种羊等级
+const seedSheedLevel = [
+    { label: "甲", value: 1 },
+    { label: "乙", value: 2 },
+    { label: "丙", value: 3 },
+    { label: "丁", value: 4 }
+]
+
+// 羊类型 
+const sheepType = [
+    { label: "商品羊", value: 4 },
+    { label: "种母羊", value: 2 },
+    { label: "种公羊", value: 1 }
+]
+
+// 药品有效期单位
+const periodOfValidityUnit = [
+    { label: "天", value: 1 },
+    { label: "月", value: 2 },
+    { label: "年", value: 3 }
+]
+
+// 羊产品类型
+const sheepProductType = [
+    '带骨羊前腿(A)',
+    '带骨羊前腿(AA)',
+    '带骨羊前腿(AAA)',
+    '羔羊肉卷(2500g/卷)',
+    '羔羊精卷(2500g/卷)',
+    '法式羊后腿',
+    '中式羊后腿',
+    '带骨羊后腿',
+    '羔羊肉砖',
+    '羔羊后腿肉卷',
+    '羔羊后腱骨',
+    '羔羊前腱骨',
+    '羔羊干棒骨',
+    '羔羊全排(A)',
+    '羔羊全排(AA)',
+    '羔羊全排(AAA)',
+    '羔羊龙骨',
+    '羊碎骨肉',
+    '罗肌肉',
+    '羊背筋',
+    '羊菲力(500g/包)',
+    '羊霖',
+    '羊颈排',
+    '羔羊半排',
+    '羊心',
+    '羊肺',
+    '羊肝',
+    '羔羊寸排(1000g/包)',
+    '方切后腿(240g/包)',
+    '腰油',
+    '膘油',
+    '羊鞭',
+    '废弃',
+    '肚油',
+    '羊宝',
+    '羊尾油',
+    '羊板筋',
+    '鞭根肉',
+    '羔羊后腿包(2500g/包)',
+    '羊尾芯',
+    '精致羊后腿包(2500g/包)',
+    '精致羊后腿卷(2500g/卷)',
+    '精致羊肉卷(2500g/卷)',
+    '十二肋法排(A)',
+    '十二肋法排(AA)',
+    '十二肋法排(AAA)',
+    '蝴蝶排(240g/包)',
+    '七肋法排',
+    '肋间肉',
+    '五分肉块',
+    '羊肉包(2500g/包)',
+    '羊油腰',
+    '羊蝎子(500g/包)',
+    '法式小切(500g/包)',
+    '单指排(500g/包)',
+    '羔羊寸排(500g/包)',
+    '前腿切片(500g/包)',
+    '羊胴体(剥皮)',
+    '羊胴体(烫毛)',
+    '羊头(带毛)',
+    '羊头(去毛)',
+    '羊蹄(带毛)',
+    '羊蹄(去毛)',
+    '羊皮',
+    '羊皮(次)',
+    '羊肥肠(2500g/包)',
+    '羊小肠',
+    '湖羊前半截',
+    '羊胴体分割',
+    '羊肚(毛肚)',
+    '羊肚(净肚)'
+]
+
+export default {
+    sheepProductType
+}
+
+
+
+

+ 1 - 4
src/views/Home/Home.vue

@@ -125,13 +125,10 @@ export default {
         },
         // 菜单展开
         handleOpen(key, keyPath) {
-            console.log(key, keyPath);
             localStorage.setItem("defaultUnfoldedMenu", "" + key);
         },
         // 菜单收取
-        handleClose(key, keyPath) {
-            console.log(key, keyPath);
-        },
+        handleClose(key, keyPath) {},
         // 点击菜单项
         onClickMenu(item) {
             let _this = this;

+ 2 - 2
src/views/productManagement/goatBloodLog.vue

@@ -26,8 +26,8 @@
                     <el-table-column prop="sheepId" label="羊ID"></el-table-column>
                     <el-table-column prop="bleedingTime" label="放血时间"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="weight" label="重量"></el-table-column>
-                    <el-table-column prop="shelfLife" label="保质期"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)"></el-table-column>
+                    <el-table-column prop="shelfLife" label="保质期(天)"></el-table-column>
                     <el-table-column prop="storageLocation" label="存放位置"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">

+ 2 - 2
src/views/productManagement/goatHasletLog.vue

@@ -26,8 +26,8 @@
                     <el-table-column prop="sheepId" label="羊ID"></el-table-column>
                     <el-table-column prop="slaughterTime" label="宰杀时间"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="weight" label="重量"></el-table-column>
-                    <el-table-column prop="shelfLife" label="保质期"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)"></el-table-column>
+                    <el-table-column prop="shelfLife" label="保质期(天)"></el-table-column>
                     <el-table-column prop="storageLocation" label="存放位置"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">

+ 1 - 1
src/views/productManagement/sheepskinLog.vue

@@ -26,7 +26,7 @@
                     <el-table-column prop="sheepId" label="羊ID" width="180"></el-table-column>
                     <el-table-column prop="strippingTime" label="剥离时间" width="180"></el-table-column>
                     <el-table-column prop="batchNo" label="批次号"></el-table-column>
-                    <el-table-column prop="weight" label="重量" width="180"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)" width="180"></el-table-column>
                     <el-table-column prop="location" label="位置"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">

+ 30 - 8
src/views/template/Aa.vue

@@ -1,5 +1,5 @@
 <template>
-<!-- 静态  -->
+    <!-- 静态  -->
     <div class="GroupRecord">
         <header id="header">
             <el-row type="flex">
@@ -55,6 +55,9 @@
                 </el-row>
             </article>
         </section>
+
+        <button @click="test1 = !test1">点击</button>
+        <div :class="['test', {test1}]"></div>
     </div>
 </template>
 
@@ -63,23 +66,24 @@ export default {
     data() {
         return {
             value: "",
+            test1: false,
             tableData: [
                 {
                     date: "2020-05-02",
                     name: "可用",
-                    id: '825',
+                    id: "825",
                     address: "6895564457554"
                 },
                 {
                     date: "2020-05-04",
                     name: "不可用",
-                    id: '826',
+                    id: "826",
                     address: "6895564456725"
                 },
                 {
                     date: "2020-05-03",
                     name: "可用",
-                    id: '830',
+                    id: "830",
                     address: "6895564457594"
                 }
             ]
@@ -88,16 +92,16 @@ export default {
     created() {},
     methods: {
         look(row) {
-            console.log(row)
+            console.log(row);
             this.$router.push({
-                path: 'UnityTrace',
+                path: "UnityTrace",
                 query: row
-            })
+            });
         },
         edit(row) {},
         del(row) {},
         pageChange(p) {
-            console.log(p)
+            console.log(p);
         }
     }
 };
@@ -112,4 +116,22 @@ export default {
         margin-top: 20px;
     }
 }
+
+.test {
+    width: 400px;
+    height: 300px;
+    background-color: #00f;
+    transition: 3s all;
+}
+.test1 {
+    background-color: #ff000033;
+}
+@keyframes myfirst {
+    from {
+        background: red;
+    }
+    to {
+        background: #00ff0000;
+    }
+}
 </style>