完成 企业信息 牧场信息

package.json

@@ -10,7 +10,6 @@
   "dependencies": {
     "cnpm": "^6.1.1",
     "core-js": "^3.3.2",
-    "element-china-area-data": "^5.0.1",
     "element-ui": "^2.13.2",
     "vue": "^2.6.10",
     "vue-module-loader": "^1.0.3",

src/api/fileInfo.js

@@ -1,6 +1,17 @@
 import { ajax } from "../sdk/ajax";
 
+/* 档案信息 */
+/* 企业信息 */
+export const reqFirminfo = () => ajax("get", "/publics/sysconf/get", {code: 'huyang_company'})
+
+export const reqUpdateFirm = (data) => ajax("get", "/publics/sysconf/update", data)
+
+
+/* 牧场信息 */
+export const reqPastureInfo = () => ajax("get", "/publics/sysconf/get", {code: 'huyang_farm_01'})
+
+export const reqUpdatePasture = (data) => ajax("get", "/publics/sysconf/update", data)
+
+
 
-/* 登录 */
-export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
 

src/router/routes.js

@@ -2,7 +2,7 @@ import Home from '../views/Home/Home.vue'
 /* 首页  */
 import Index from '@/views/index/Index.vue'
 /* 档案信息 */
-import enterpriseInfo from '@/views/fileInfo/enterpriseInfo.vue'
+import firmInfo from '@/views/fileInfo/firmInfo.vue'
 import pastureInfo from '@/views/fileInfo/pastureInfo.vue'
 import areaInfo from '@/views/fileInfo/areaInfo.vue'
 import workerInfo from '@/views/fileInfo/workerInfo.vue'
@@ -76,9 +76,9 @@ export default [
 			},
 			/* 档案信息 */
 			{
-				path: 'enterpriseInfo',
-				name: 'enterpriseInfo',
-				component: enterpriseInfo
+				path: 'firmInfo',
+				name: 'firmInfo',
+				component: firmInfo
 			},
 			{
 				path: 'pastureInfo',

src/sdk/ajax.js

@@ -32,7 +32,7 @@ export const ajax = function (type = "post", url, params) {
             }
             resole(res.data);
         }).catch((err) => {
-            reject(err.data);
+            reject(err);
         });
     });
 }

src/views/Home/mencCofig.js

@@ -16,7 +16,7 @@ export const menuData = [
             {
                 optionName: '企业信息',
                 index: '0-1',
-                routerName: "enterpriseInfo"
+                routerName: "firmInfo"
             },
             {
                 optionName: '牧场信息',

src/views/Login/Login.vue

@@ -58,10 +58,8 @@ export default {
     methods: {
         /* 登录按钮 */
         onSignIn() {
-            console.log(this.form);
             reqLogin(this.form)
                 .then(res => {
-                    console.log(res);
                     console.log(res)
                     localStorage.setItem("token", res.token);
                     this.doOrganizationChoose();
@@ -101,7 +99,7 @@ export default {
             reqOrganizationId({orgId: id}).then(res => {
                 this.isShowDialog = false;
                     //导航到 正式页面
-                    this.$router.replace("/home/enterpriseInfo");
+                    this.$router.replace("/home/firmInfo");
             }).catch(err => {
                 if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");

src/views/breed/seedSheepFile.vue

@@ -26,7 +26,7 @@
                     <el-table-column prop="created" label="入场时间" width="200"></el-table-column>
                     <el-table-column prop="dayOfAge" label="入场日龄"></el-table-column>
                     <el-table-column label="种羊来源">
-                        <template slot-scope="scope">
+                        <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>
@@ -34,7 +34,7 @@
                     </el-table-column>
                     <el-table-column prop="position" label="当前位置"></el-table-column>
                     <el-table-column label="当前状态">
-                        <template slot-scope="scope">
+                        <template v-slot="scope">
                             <div v-for="item in $store.state['seedSheedStatus']" :key="item.value">
                                 <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
                             </div>
@@ -44,14 +44,14 @@
                     <el-table-column prop="weight" label="体重(kg)"></el-table-column>
                     <el-table-column prop="feederName" label="饲养员"></el-table-column>
                     <el-table-column label="等级评级">
-                        <template slot-scope="scope">
+                        <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-column label="操作" width="150">
-                        <template slot-scope="scope">
+                        <template v-slot="scope">
                             <el-popconfirm title="是否删除此设备的信息？" @onConfirm="del(scope.row)">
                                 <el-button slot="reference" type="text" size="small">删除</el-button>
                             </el-popconfirm>
@@ -164,7 +164,7 @@ export default {
             page: 1,
             searchStr: "",
             tableData: [],
-            totalPages: "",
+            totalPages: 0,
             isShow: false,
             rules,
             formData: {

src/views/fileInfo/enterpriseInfo.vue

@@ -1,81 +0,0 @@
-<template>
-    <div class="enterpriseInfo">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">企业信息</h2>
-        <div class="left">
-            <el-form ref="form" :model="form" >
-                <el-form-item label="企业名称">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="邮箱">
-                    <el-input v-model="form.email"></el-input>
-                </el-form-item>
-                <el-form-item label="企业简介">
-                    <el-input type="textarea" v-model="form.desc"></el-input>
-                </el-form-item>
-                <el-form-item label="活动区域">
-                    <el-cascader
-                        size="large"
-                        :options="options"
-                        v-model="form.area"
-                        @change="handleChange"
-                    ></el-cascader>
-                </el-form-item>
-                <el-form-item label="详细地址">
-                    <el-input v-model="form.detail_address"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-row type="flex" :gutter="19">
-                        <el-col :span="8">
-                            <el-input v-model="form.mobile_base"></el-input>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="form.mobile_num"></el-input>
-                        </el-col>
-                    </el-row>
-                </el-form-item>
-                <el-form-item>
-                    <el-button style="margin-left:60%" type="primary" @click="onSubmit">更新信息</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-    </div>
-</template>
-
-<script>
-import { regionData } from "element-china-area-data";
-export default {
-    name: "enterpriseInfo",
-    data() {
-        return {
-            form: {
-                name: "长兴湖羊",
-                email: "antdesign@alipay.com",
-                desc: "一个养殖平台",
-                area: ['330000', '330100', '330110'],
-                detail_address: "西溪海创园",
-                mobile_base: "0752",
-                mobile_num: "88888888"
-            },
-            options: regionData
-        };
-    },
-    created() {},
-    methods: {
-        onSubmit() {
-            console.log("submit!");
-        },
-        handleChange(value) {
-            console.log(value);
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-.enterpriseInfo {
-    .left {
-        width: 400px;
-        margin-left: 50px;
-    }
-}
-</style>

src/views/fileInfo/firmInfo.vue

@@ -0,0 +1,112 @@
+<template>
+    <div class="firmInfo">
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">企业信息</h2>
+        <div class="left">
+            <el-form ref="form" :model="form">
+                <el-form-item label="企业名称">
+                    <el-input v-model="form.name"></el-input>
+                </el-form-item>
+                <el-form-item label="邮箱">
+                    <el-input v-model="form.email"></el-input>
+                </el-form-item>
+                <el-form-item label="企业简介">
+                    <el-input type="textarea" v-model="form.decription"></el-input>
+                </el-form-item>
+                <el-form-item label="国家地区">
+                    <el-input v-model="form.province"></el-input>
+                </el-form-item>
+                <el-form-item label="所在省市">
+                    <el-row type="flex" justify="space-between">
+                        <el-col :span="11">
+                            <el-input v-model="form.country"></el-input>
+                        </el-col>
+                        <el-col :span="11">
+                            <el-input v-model="form.city"></el-input>
+                        </el-col>
+                    </el-row>
+                </el-form-item>
+                <el-form-item label="详细地址">
+                    <el-input v-model="form.address"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话">
+                    <el-row type="flex" :gutter="19">
+                        <el-input v-model="form.tel"></el-input>
+                    </el-row>
+                </el-form-item>
+                <el-form-item>
+                    <el-button style="margin-left:60%" type="primary" @click="onSubmit">更新信息</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+    </div>
+</template>
+
+<script>
+import { reqFirminfo, reqUpdateFirm } from '@/api/fileInfo.js'
+export default {
+    name: "firmInfo",
+    data() {
+        return {
+            // 保留接口结构
+            reqInfo: {},
+            form: {
+                name: "长兴湖羊",
+                email: "antdesign@alipay.com",
+                decription: "一个养殖平台",
+                province: "",
+                country: "",
+                city: "杭州市",
+                address: "西溪海创园",
+                tel: "0752-88888888"
+            }
+        };
+    },
+    created() {
+        this.getFirminfo()
+    },
+    methods: {
+        // 更新企业信息
+        onSubmit() {
+            let tempArr = []
+            for (const key in this.form) {
+                tempArr.push({key, val: this.form[key]})
+            }
+            this.reqInfo.conf = JSON.stringify({data: JSON.stringify(tempArr)})
+            reqUpdateFirm(this.reqInfo)
+                .then(res => {
+                    console.log(res);
+                    this.$message.success("更新企业信息成功！")
+                })
+                .catch(err => {
+                    console.log(err);
+                    this.$message.error("更新企业信息失败！")
+                });
+        },
+        // 获取企业信息
+        getFirminfo() {
+            reqFirminfo()
+                .then(res => {
+                    // 保留接口结构
+                    this.reqInfo = res
+                    let obj = {}
+                    JSON.parse(res.conf.data).forEach(item => {
+                        obj[item.key] = item.val
+                    })
+                    this.form = obj
+                })
+                .catch(err => {
+                    console.error(err);
+                });
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.firmInfo {
+    .left {
+        width: 400px;
+        margin-left: 50px;
+    }
+}
+</style>

src/views/fileInfo/pastureInfo.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="enterpriseInfo">
+    <div class="pastureInfo">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">牧场信息</h2>
         <div class="left">
             <el-form ref="form" :model="form" >
@@ -10,39 +10,32 @@
                     <el-input v-model="form.email"></el-input>
                 </el-form-item>
                 <el-form-item label="牧场简介">
-                    <el-input type="textarea" v-model="form.desc"></el-input>
+                    <el-input type="textarea" v-model="form.description"></el-input>
                 </el-form-item>
                 <el-form-item label="主要负责人及电话">
                     <el-row type="flex" :gutter="19">
                         <el-col :span="8">
-                            <el-input v-model="form.people"></el-input>
+                            <el-input v-model="form.manager"></el-input>
                         </el-col>
                         <el-col :span="15">
-                            <el-input v-model="form.mobile"></el-input>
+                            <el-input v-model="form.managerPhone"></el-input>
                         </el-col>
                     </el-row>
                 </el-form-item>
-                <el-form-item label="活动区域">
-                    <el-cascader
-                        size="large"
-                        :options="options"
-                        v-model="form.area"
-                        @change="handleChange"
-                    ></el-cascader>
-                </el-form-item>
-                <el-form-item label="详细地址">
-                    <el-input v-model="form.detail_address"></el-input>
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-row type="flex" :gutter="19">
-                        <el-col :span="8">
-                            <el-input v-model="form.mobile_base"></el-input>
+                <el-form-item label="所在省市">
+                    <el-row type="flex" justify="space-between">
+                        <el-col :span="11">
+                            <el-input v-model="form.province"></el-input>
                         </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="form.mobile_num"></el-input>
+                        <el-col :span="11">
+                            <el-input v-model="form.city"></el-input>
                         </el-col>
                     </el-row>
                 </el-form-item>
+                <el-form-item label="详细地址">
+                    <el-input v-model="form.address"></el-input>
+                </el-form-item>
+                
                 <el-form-item>
                     <el-button style="margin-left:60%" type="primary" @click="onSubmit">更新信息</el-button>
                 </el-form-item>
@@ -52,38 +45,68 @@
 </template>
 
 <script>
-import { regionData } from "element-china-area-data";
+import { reqPastureInfo, reqUpdatePasture } from '@/api/fileInfo.js'
 export default {
     data() {
         return {
+            // 保留接口结构
+            reqInfo: {},
             form: {
-                name: "长兴牧场",
+                name: "西溪海创园",
                 email: "antdesign@alipay.com",
-                desc: "一个养殖平台",
-                people: "赵四",
-                mobile: "138888888888",
-                area: ['330000', '330100', '330110'],
-                detail_address: "西溪海创园",
-                mobile_base: "0572",
-                mobile_num: "55666655"
+                description: "一个养殖平台",
+                manager: "沈厂长",
+                managerPhone: '"18202780511"',
+                province: "浙江省",
+                city: "杭州市",
+                address: "西湖区工专路 77 号"
             },
-            options: regionData
         };
     },
-    created() {},
+    created() {
+        // 获取牧场信息
+        this.getPastureInfo()
+    },
     methods: {
         onSubmit() {
-            console.log("submit!");
+            let tempArr = []
+            for (const key in this.form) {
+                tempArr.push({key, val: this.form[key]})
+            }
+            this.reqInfo.conf = JSON.stringify({data: JSON.stringify(tempArr)})
+            reqUpdatePasture(this.reqInfo)
+                .then(res => {
+                    console.log(res);
+                    this.$message.success("更新企业信息成功！")
+                })
+                .catch(err => {
+                    console.error(err);
+                    this.$message.error("更新企业信息失败！")
+                });
         },
-        handleChange(value) {
-            console.log(value);
+        // 获取牧场信息
+        getPastureInfo() {
+            reqPastureInfo()
+                .then(res => {
+                    // 保留接口结构
+                    this.reqInfo = res
+                    let obj = {}
+                    JSON.parse(res.conf.data).forEach(item => {
+                        obj[item.key] = item.val
+                    })
+                    this.form = obj
+                })
+                .catch(err => {
+                    console.error(err);
+                });
         }
+        
     }
 };
 </script>
 
 <style lang="scss" scoped>
-.enterpriseInfo {
+.pastureInfo {
     .left {
         width: 500px;
         margin-left: 50px;

src/views/template/Aa.vue

@@ -40,6 +40,15 @@
                             </el-radio-group>
                         </el-form-item>
 
+                        <el-form-item label="日期">
+                            <el-date-picker
+                                v-model="formData.date"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                placeholder="选择日期"
+                            ></el-date-picker>
+                        </el-form-item>
+
                         <el-form-item>
                             <el-button @click="isShow=false">取 消</el-button>
                             <el-button type="primary" @click="submitForm('addSeedSheepForm')">保 存</el-button>
@@ -72,7 +81,7 @@ export default {
                     return false;
                 }
             });
-        },
+        }
     }
 };
 </script>