linan 4 年之前
父节点
当前提交
2ee9e4d40c

+ 4 - 0
src/views/Home/mencCofig.js

@@ -33,6 +33,10 @@ export const menuData = [
                 optionName: '羔羊分布',
                 routerName: "lambDistribute"
             },
+            {
+                optionName: '种羊销售',
+                routerName: "sheepSale"
+            },
 
             {
                 optionName: '羊粪价格',

+ 6 - 6
src/views/breed/environment.vue

@@ -42,9 +42,9 @@ export default {
             });
             this.$confirm("确定更新信息?").then(() => {
                 reqSetEnvironment({
-                    time: time.join(","),
-                    temp: temp.join(","),
-                    humidity: humidity.join(",")
+                    time: time.toString(),
+                    temp: temp.toString(),
+                    humidity: humidity.toString()
                 })
                     .then(res => {
                         if (res.errCode) {
@@ -63,10 +63,10 @@ export default {
         getEnvironment() {
             reqEnvironment()
                 .then(res => {
-                    let arr2 = res.conf["temp"].split(",");
-                    let arr3 = res.conf["humidity"].split(",");
+                    let arr2 = res.conf["temp"];
+                    let arr3 = res.conf["humidity"];
                     this.list = [];
-                    res.conf["time"].split(",").forEach((item, i) => {
+                    res.conf["time"].forEach((item, i) => {
                         this.list.push({
                             time: item,
                             temp: arr2[i],

+ 3 - 3
src/views/breed/poopSale.vue

@@ -28,7 +28,7 @@ export default {
                 money.push(item.money);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetPoopSale({ time: time.join(","), money: money.join(",") })
+                reqSetPoopSale({ time: time.toString(), money: money.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getPoopSale() {
             reqPoopSale()
                 .then(res => {
-                    let arr2 = res.conf['money'].split(",")
+                    let arr2 = res.conf['money']
                     this.list = [];
-                    res.conf['time'].split(",").forEach((item, i) => {
+                    res.conf['time'].forEach((item, i) => {
                         this.list.push({ 'time': item , 'money': arr2[i]});
                     });
                 })

+ 13 - 13
src/views/breed/sale.vue

@@ -1,7 +1,7 @@
 <template>
     <!-- sale -->
     <div class="Sale">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">羊粪销售</h2>
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">牧场销售</h2>
         <formList
             v-model="list"
             :title="['第一周时间','第一周金额','第二周时间','第二周金额','第三周时间','第三周金额']"
@@ -51,12 +51,12 @@ export default {
             });
             this.$confirm("确定更新信息?").then(() => {
                 reqSetSale({
-                    firstTime: firstTime.join(","),
-                    firstMoney: firstMoney.join(","),
-                    secondTime: secondTime.join(","),
-                    secondMoney: secondMoney.join(","),
-                    thirdTime: thirdTime.join(","),
-                    thirdMoney: thirdMoney.join(",")
+                    firstTime: firstTime.toString(),
+                    firstMoney: firstMoney.toString(),
+                    secondTime: secondTime.toString(),
+                    secondMoney: secondMoney.toString(),
+                    thirdTime: thirdTime.toString(),
+                    thirdMoney: thirdMoney.toString()
                 })
                     .then(res => {
                         if (res.errCode) {
@@ -75,13 +75,13 @@ export default {
         getSale() {
             reqSale()
                 .then(res => {
-                    let arr2 = res.conf["firstMoney"].split(",");
-                    let arr3 = res.conf["secondTime"].split(",");
-                    let arr4 = res.conf["secondMoney"].split(",");
-                    let arr5 = res.conf["thirdTime"].split(",");
-                    let arr6 = res.conf["thirdMoney"].split(",");
+                    let arr2 = res.conf["firstMoney"];
+                    let arr3 = res.conf["secondTime"];
+                    let arr4 = res.conf["secondMoney"];
+                    let arr5 = res.conf["thirdTime"];
+                    let arr6 = res.conf["thirdMoney"];
                     this.list = [];
-                    res.conf["firstTime"].split(",").forEach((item, i) => {
+                    res.conf["firstTime"].forEach((item, i) => {
                         this.list.push({
                             firstTime: item,
                             firstMoney: arr2[i],

+ 3 - 3
src/views/breed/sheepSale.vue

@@ -28,7 +28,7 @@ export default {
                 number.push(item.number);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetSheepSale({ month: month.join(","), number: number.join(",") })
+                reqSetSheepSale({ month: month.toString(), number: number.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -45,9 +45,9 @@ export default {
         getSheepSale() {
             reqSheepSale()
                 .then(res => {
-                    let arr2 = res.conf['number'].split(",")
+                    let arr2 = res.conf['number']
                     this.list = [];
-                    res.conf['month'].split(",").forEach((item, i) => {
+                    res.conf['month'].forEach((item, i) => {
                         this.list.push({ 'month': item , 'number': arr2[i]});
                     });
                 })

+ 11 - 6
src/views/breed/warn.vue

@@ -13,7 +13,7 @@ export default {
     name: "Warn",
     data() {
         return {
-            list: [{ key: "" }]
+            list: [{ msg: "" }]
         };
     },
     created() {
@@ -21,9 +21,13 @@ export default {
     },
     methods: {
         /* 
-        无害化仓库已满请及时清理
-        14587号母羊已到达断奶时间请及时断奶
-        阿莫西林药品已经低于安全库存请补充
+        content[0]: 14587号母羊已到达断奶时间请及时断奶99
+content[1]: 阿莫西林药品已经低于安全库存请补充
+content[2]: 无害化仓库已满请及时清理
+content[3]: 阿莫西林药品已经低于安全库存请补充
+content[4]: 14587号母羊已到达断奶时间请及时断奶
+content[5]: 无害化仓库已满请及时清理
+content[6]: 14587号母羊已到达断奶时间请及时断奶
         
         */
         onSubmit() {
@@ -31,8 +35,9 @@ export default {
             this.list.forEach(item => {
                 data.push(item.msg);
             });
+            console.log({ content: data.toString() })
             this.$confirm("确定更新信息?").then(() => {
-                reqSetWarn({ content: data.join("--") })
+                reqSetWarn({ content: data.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -51,7 +56,7 @@ export default {
             reqWarn()
                 .then(res => {
                     this.list = [];
-                    res.conf.content.split("--").forEach(item => {
+                    res.conf.content.forEach(item => {
                         this.list.push({ msg: item });
                     });
                 })

+ 6 - 6
src/views/meatTransport/analyse.vue

@@ -42,9 +42,9 @@ export default {
             });
             this.$confirm("确定更新信息?").then(() => {
                 reqSetAnalyse({
-                    time: time.join(","),
-                    lastWeek: lastWeek.join(","),
-                    thisWeek: thisWeek.join(",")
+                    time: time.toString(),
+                    lastWeek: lastWeek.toString(),
+                    thisWeek: thisWeek.toString()
                 })
                     .then(res => {
                         if (res.errCode) {
@@ -63,10 +63,10 @@ export default {
         getAnalyse() {
             reqAnalyse()
                 .then(res => {
-                    let arr2 = res.conf["lastWeek"].split(",");
-                    let arr3 = res.conf["thisWeek"].split(",");
+                    let arr2 = res.conf["lastWeek"];
+                    let arr3 = res.conf["thisWeek"];
                     this.list = [];
-                    res.conf["time"].split(",").forEach((item, i) => {
+                    res.conf["time"].forEach((item, i) => {
                         this.list.push({
                             time: item,
                             lastWeek: arr2[i],

+ 3 - 3
src/views/meatTransport/areaSale.vue

@@ -28,7 +28,7 @@ export default {
                 number.push(item.number);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetAreaSale({ area: area.join(","), number: number.join(",") })
+                reqSetAreaSale({ area: area.toString(), number: number.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getAreaSale() {
             reqAreaSale()
                 .then(res => {
-                    let arr2 = res.conf['number'].split(",")
+                    let arr2 = res.conf['number']
                     this.list = [];
-                    res.conf['area'].split(",").forEach((item, i) => {
+                    res.conf['area'].forEach((item, i) => {
                         this.list.push({ 'area': item , 'number': arr2[i]});
                     });
                 })

+ 3 - 3
src/views/meatTransport/bodyPrice.vue

@@ -28,7 +28,7 @@ export default {
                 price.push(item.price);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetBodyPrice({ time: time.join(","), price: price.join(",") })
+                reqSetBodyPrice({ time: time.toString(), price: price.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getBodyPrice() {
             reqBodyPrice()
                 .then(res => {
-                    let arr2 = res.conf['price'].split(",")
+                    let arr2 = res.conf['price']
                     this.list = [];
-                    res.conf['time'].split(",").forEach((item, i) => {
+                    res.conf['time'].forEach((item, i) => {
                         this.list.push({ 'time': item , 'price': arr2[i]});
                     });
                 })

+ 3 - 3
src/views/meatTransport/bodyTurnover.vue

@@ -28,7 +28,7 @@ export default {
                 turnover.push(item.turnover);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetBodyTurnover({ time: time.join(","), turnover: turnover.join(",") })
+                reqSetBodyTurnover({ time: time.toString(), turnover: turnover.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getBodyTurnover() {
             reqBodyTurnover()
                 .then(res => {
-                    let arr2 = res.conf['turnover'].split(",")
+                    let arr2 = res.conf['turnover']
                     this.list = [];
-                    res.conf['time'].split(",").forEach((item, i) => {
+                    res.conf['time'].forEach((item, i) => {
                         this.list.push({ 'time': item , 'turnover': arr2[i]});
                     });
                 })

+ 3 - 3
src/views/meatTransport/breedingSale.vue

@@ -28,7 +28,7 @@ export default {
                 price.push(item.price);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetBreedingSale({ time: time.join(","), price: price.join(",") })
+                reqSetBreedingSale({ time: time.toString(), price: price.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getBreedingSale() {
             reqBreedingSale()
                 .then(res => {
-                    let arr2 = res.conf['price'].split(",")
+                    let arr2 = res.conf['price']
                     this.list = [];
-                    res.conf['time'].split(",").forEach((item, i) => {
+                    res.conf['time'].forEach((item, i) => {
                         this.list.push({ 'time': item , 'price': arr2[i]});
                     });
                 })

+ 3 - 3
src/views/meatTransport/breedingTurnover.vue

@@ -29,7 +29,7 @@ export default {
                 turnover.push(item.turnover);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetBreedingTurnover({ time: time.join(","), turnover: turnover.join(",") })
+                reqSetBreedingTurnover({ time: time.toString(), turnover: turnover.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -47,9 +47,9 @@ export default {
         getBreedingTurnover() {
             reqBreedingTurnover()
                 .then(res => {
-                    let arr2 = res.conf['turnover'].split(",")
+                    let arr2 = res.conf['turnover']
                     this.list = [];
-                    res.conf['time'].split(",").forEach((item, i) => {
+                    res.conf['time'].forEach((item, i) => {
                         this.list.push({ 'time': item , 'turnover': arr2[i]});
                     });
                 })

+ 3 - 3
src/views/meatTransport/profit.vue

@@ -28,7 +28,7 @@ export default {
                 rating.push(item.rating);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetProfit({ time: time.join(","), rating: rating.join(",") })
+                reqSetProfit({ time: time.toString(), rating: rating.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getProfit() {
             reqProfit()
                 .then(res => {
-                    let arr2 = res.conf['rating'].split(",")
+                    let arr2 = res.conf['rating']
                     this.list = [];
-                    res.conf['time'].split(",").forEach((item, i) => {
+                    res.conf['time'].forEach((item, i) => {
                         this.list.push({ 'time': item , 'rating': arr2[i]});
                     });
                 })

+ 8 - 8
src/views/meatTransport/quarterlyTurnover.vue

@@ -45,10 +45,10 @@ export default {
             });
             this.$confirm("确定更新信息?").then(() => {
                 reqSetQuarterlyTurnover({
-                    time: time.join(","),
-                    body: body.join(","),
-                    part: part.join(","),
-                    direct: direct.join(",")
+                    time: time.toString(),
+                    body: body.toString(),
+                    part: part.toString(),
+                    direct: direct.toString()
                 })
                     .then(res => {
                         if (res.errCode) {
@@ -67,11 +67,11 @@ export default {
         getQuarterlyTurnover() {
             reqQuarterlyTurnover()
                 .then(res => {
-                    let arr2 = res.conf["body"].split(",");
-                    let arr3 = res.conf["part"].split(",");
-                    let arr4 = res.conf["direct"].split(",");
+                    let arr2 = res.conf["body"];
+                    let arr3 = res.conf["part"];
+                    let arr4 = res.conf["direct"];
                     this.list = [];
-                    res.conf["time"].split(",").forEach((item, i) => {
+                    res.conf["time"].forEach((item, i) => {
                         this.list.push({
                             time: item,
                             body: arr2[i],

+ 3 - 3
src/views/meatTransport/transport.vue

@@ -28,7 +28,7 @@ export default {
                 number.push(item.number);
             });
             this.$confirm("确定更新信息?").then(() => {
-                reqSetTransport({ status: status.join(","), number: number.join(",") })
+                reqSetTransport({ status: status.toString(), number: number.toString() })
                     .then(res => {
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
@@ -46,9 +46,9 @@ export default {
         getTransport() {
             reqTransport()
                 .then(res => {
-                    let arr2 = res.conf['number'].split(",")
+                    let arr2 = res.conf['number']
                     this.list = [];
-                    res.conf['status'].split(",").forEach((item, i) => {
+                    res.conf['status'].forEach((item, i) => {
                         this.list.push({ 'status': item , 'number': arr2[i]});
                     });
                 })