图表接口联调

shanXiPlatform/src/api/branchoff/index.js

@@ -29,3 +29,10 @@ export function  getpointll(homeType , depotId) {
     method: 'get'
   })
 }
+export function  getyclq( data  ) {
+  return request({              
+    url: `/csc-szls-business/grainConditionRecord/authority/getGrainErrorCount`,
+    method: 'post',
+    data : data
+  })
+}

shanXiPlatform/src/router/index.js

@@ -340,6 +340,13 @@ export const constantRoutes = [
         hidden: true,
         meta: { title: '仓房状态', icon: 'dashboard',isshowLibrary:true, affix: true },
       },
+      {
+        path: 'yclqTable',
+        component: () => import('@/views/home/yclqtable'),
+        name: 'yclqTable',
+        hidden: true,
+        meta: { title: '异常粮情', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
     ]
 
   },

shanXiPlatform/src/views/home/branchOffice.vue

@@ -7,21 +7,21 @@
                     <div class="one">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 储存状态
-                            <!-- <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(1)">更多>></span> -->
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(1)">更多>></span>
                         </p>
                         <div id="myCharttwo" class="oneo"></div>
                     </div>
                     <div class="two">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 粮食种类
-                            <!-- <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(2)">更多>></span> -->
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(2)">更多>></span>
                         </p>
                         <div id="myChartone" class="twot"></div>
                     </div>
                     <div class="thi">
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt /> 仓房状态
-                            <!-- <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(3)">更多>></span> -->
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="leftboxsMore(3)">更多>></span>
                         </p>
                         <div id="myChartthi" class="thit"></div>
                     </div>
@@ -247,6 +247,7 @@
                         <p class="lsp">
                             <img src="../../assets/images/rightarrow.png" alt />
                             异常粮情
+                            <span v-if="crumbs.length>1" class="echartSpan" @click="yclq()">更多>></span>
                         </p>
                         <div id="myChartfor" class="rboto"></div>
                     </div>
@@ -306,7 +307,9 @@ export default {
                 { id: "141024", name: "洪洞县" },
                 { id: "140800", name: "运城市" },
                 { id: "140882", name: "河津市" },
-                { id: "140700", name: "晋中市" }
+                { id: "140700", name: "晋中市" },
+                { id: "140300", name: "阳泉市" },
+                { id: "140321", name: "平定县" }
             ],
             datastr: "",
             objone: {
@@ -855,10 +858,18 @@ export default {
                                     }
                                     this.clickNumber = 2
                                 } else if (params.data[5]) {
+                                    this.$store.commit({
+                                        type: "changeDepotId",
+                                        depotId: params.data[4]
+                                    })
+                                    this.$store.commit({
+                                        type: "changeDepotName",
+                                        depotName: params.data[7]
+                                    })
                                     var cityId = params.data[5]
                                     if (cityId.slice(4, 6) == "00") {
                                         this.areacodearr.forEach(item => {
-                                            if (cityId == item.id) {
+                                            if ( Number(cityId)  == Number( item.id)) {
                                                 this.crumbs = [
                                                     { name: "山西省" }
                                                 ]
@@ -887,7 +898,7 @@ export default {
                                 }
                             } else if (this.clickNumber == 2) {
                                 this.areacodearr.forEach(item => {
-                                    if (params.data[5] == item.id) {
+                                    if (Number(params.data[5] )  == Number(item.id )) {
                                         this.crumbs = [{ name: "山西省" }]
                                         this.crumbs.push({ name: item.name })
                                         this.crumbs.push({
@@ -1199,7 +1210,7 @@ export default {
                 color: "#88C06A",
                 xAxis: {
                     type: "value",
-                    data: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+                    data: [],
                     name: "",
                     axisLabel: {
                         interval: 0
@@ -1284,14 +1295,17 @@ export default {
             }
         },
         leftboxsMore(type) {
-            if(type == 1){
+            if (type == 1) {
                 this.$router.push({ name: "storageStatusTable" })
-            }else if(type == 2){
+            } else if (type == 2) {
                 this.$router.push({ name: "typesOfGrainTable" })
-            }else if(type == 3){
+            } else if (type == 3) {
                 this.$router.push({ name: "houseStatusTable" })
             }
         },
+        yclq() {
+            this.$router.push({ name: "yclqTable" })
+        }
     }
 }
 </script>
@@ -1607,10 +1621,10 @@ export default {
     }
 }
 .echartSpan {
-    float:right;
-    font-size:14px;
-    margin-top:2px;
-    color:#999999;
-    cursor:pointer
+    float: right;
+    font-size: 14px;
+    margin-top: 2px;
+    color: #999999;
+    cursor: pointer;
 }
 </style>

shanXiPlatform/src/views/home/storageStatusTable.vue

@@ -1,96 +1,100 @@
 <template>
-  <div class="global">
-    <div class="contentContainerGg">
-        <div class="container">
-          <el-table  border  :data="tableList"  highlight-current-row  style="width:100%"  :header-cell-style="{background:'#f8f8f8'}">
-            <el-table-column  type="index"  align="center"  label="序号"  width="50px"/>
-            <el-table-column prop="warnName" label="仓房" align="center" />
-            <el-table-column prop="warnName" label="所属公司" align="center" />
-            <el-table-column prop="warnName" label="储存状态(个)" align="center" />
-            <el-table-column prop="warnName" label="粮食种类(个)" align="center" />
-            <el-table-column prop="warnName" label="仓房状态(个)" align="center" />
-          </el-table>
-          <div class="pagination-container">
-            <el-pagination
-              class="right"
-              background
-              :current-page.sync="listQuery.page"
-              :page-size="listQuery.limit"
-              :page-sizes="[10,20,30,40]"
-              :total="total"
-              @size-change="sizeChange"
-              @current-change="pageChange"
-              layout="total, sizes, prev, pager, next, jumper"
-            ></el-pagination>
-          </div>
+    <div class="global">
+        <div class="contentContainerGg">
+            <div class="container">
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
+                    <el-table-column type="index" align="center" label="序号" width="50px"> </el-table-column>
+                    <el-table-column prop="hname" label="仓房" align="center"> </el-table-column>
+                    <el-table-column property="depotName" label="所属公司" align="center">
+                        <template slot-scope="scope">
+                             {{ depotDic[scope.row.depotId] }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="storageStatus" label="储存状态(个)" align="center"> </el-table-column>
+                    <el-table-column prop="grainVarieties" label="粮食种类(个)" align="center"> </el-table-column>
+                    <el-table-column prop="warehouseStatus" label="仓房状态(个)" align="center"> </el-table-column>
+                </el-table>
+                <div class="pagination-container">
+                    <el-pagination class="right" background :current-page.sync="listQuery.page" :page-size="listQuery.limit" :page-sizes="[10,20,30,40]" :total="total" @size-change="sizeChange" @current-change="pageChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                </div>
+            </div>
         </div>
     </div>
-  </div>
 </template>
 <script>
-import { getList } from '@/api/system/earlyWarningManagement'
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
+// import { getList } from '@/api/system/earlyWarningManagement'
 export default {
-  data() {
-    return {
-      // 列表数据
-      tableList: [],
-      // 分页
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 10,
-      },
-      roleList:[]
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      let data = {
-        pageIndex: this.listQuery.page,
-        pageSize: this.listQuery.limit
-      }
-      getList(data).then((res) => {
-          if (res.code == 200) {
-            this.tableList = res.data.records
-            this.listQuery.limit = res.data.size
-            this.total = res.data.total
-          }else{
-            this.$message({
-              type: 'error',
-              message: res.msg
-            })
-          }
-      }).catch((err) => {
-          console.log(err)
-        })
-    },
-    sizeChange(v) {
-      this.listQuery.limit = v;
-      this.getList();
+    data() {
+        return {
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: [],
+            depotDic: []
+        }
     },
-    pageChange(v) {
-      this.listQuery.page = v;
-      this.getList();
+    created() {
+        this.getList()
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
     },
-  }
+    methods: {
+        getList() {
+            var condition = {
+                depotId: this.$store.state.depotId
+            }
+            condition = JSON.stringify(condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getcf(data)
+                .then(res => {
+                    if (res.code == 200) {
+                        this.tableList = res.data.records
+                        this.listQuery.limit = res.data.size
+                        this.total = res.data.total
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: res.msg
+                        })
+                    }
+                })
+                .catch(err => {
+                    console.log(err)
+                })
+        },
+        sizeChange(v) {
+            this.listQuery.limit = v
+            this.getList()
+        },
+        pageChange(v) {
+            this.listQuery.page = v
+            this.getList()
+        }
+    }
 }
 </script>
 <style lang="scss" scoped>
 .top {
-  height: 40px;
-  line-height: 40px;
-  border-bottom: 1px solid #ccc;
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
 }
 .container {
-  padding: 10px;
+    padding: 10px;
 }
 .pagination-container {
-  margin-top:10px;
-  margin-right:20px;
-  text-align: right;
+    margin-top: 10px;
+    margin-right: 20px;
+    text-align: right;
 }
 </style>

shanXiPlatform/src/views/home/yclqtable.vue

@@ -0,0 +1,120 @@
+<template>
+    <div class="global">
+        <div class="contentContainerGg">
+            <div class="container">
+                <el-form  :inline="true">
+                    <el-form-item label="时间:">
+                        <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="week" format="yyyy年WW周" placeholder="选择周">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button icon="el-icon-search" type="success" plain @click="getList()">
+                            查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
+                    <el-table-column prop="hname" label="时间" align="center" />
+                    <el-table-column prop="warnName" label="公司" align="center" />
+                    <el-table-column prop="storageStatus" label="所属市" align="center" />
+                    <el-table-column prop="grainVarieties" label="仓房数量(个)" align="center" />
+                    <el-table-column prop="warehouseStatus" label="粮情异常仓房数量(个)" align="center" />
+                    <el-table-column property="operation" label="操作" align="center">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row)">详情</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="pagination-container">
+                    <el-pagination class="right" background :current-page.sync="listQuery.page" :page-size="listQuery.limit" :page-sizes="[10,20,30,40]" :total="total" @size-change="sizeChange" @current-change="pageChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
+import {  getyclq } from "@/api/branchoff/index.js"
+export default {
+    data() {
+        return {
+            datetime: "",
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: []
+        }
+    },
+    created() {
+        this.getList()
+    },
+    methods: {
+        timechange() {
+            this.$nextTick(() => {
+                let week = document.querySelector("#getWeek").value
+                this.checkYear = week.slice(0, 4)
+                this.checkYearWeek = week.slice(5, 7)
+                this.getList()
+            })
+        },
+        getList() {
+            var condition = {
+                depotId: this.$store.state.depotId,
+                checkYear: this.checkYear,
+                checkYearWeek: this.checkYearWeek
+            }
+            condition = JSON.stringify(condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getyclq(data)
+                .then(res => {
+                    if (res.code == 200) {
+                        this.tableList = res.data.records
+                        this.listQuery.limit = res.data.size
+                        this.total = res.data.total
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: res.msg
+                        })
+                    }
+                })
+                .catch(err => {
+                    console.log(err)
+                })
+        },
+        sizeChange(v) {
+            this.listQuery.limit = v
+            this.getList()
+        },
+        pageChange(v) {
+            this.listQuery.page = v
+            this.getList()
+        },
+        detailbtn() {}
+    }
+}
+</script>
+<style lang="scss" scoped>
+.top {
+    height: 40px;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+}
+.container {
+    padding: 10px;
+}
+.pagination-container {
+    margin-top: 10px;
+    margin-right: 20px;
+    text-align: right;
+}
+</style>

shanXiPlatform/vue.config.js

@@ -39,8 +39,8 @@ module.exports = {
 
     proxy: {  //配置跨域
       '/': {
-        //  target: 'http://101.36.160.140:21061',  //这里后台的地址模拟的;应该填写你们真实的后台接口
-        target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+         target: 'http://101.36.160.140:21061',  //这里后台的地址模拟的;应该填写你们真实的后台接口
+        //target: 'http://101.36.160.140:21021',  //这里后台的地址模拟的;应该填写你们真实的后台接口
         // target:'http://172.16.0.02:9601',
         changOrigin: true,  //允许跨域
 
@@ -53,8 +53,8 @@ module.exports = {
       },
       '/apk': {
         // ws: true,
-        target: 'http://101.36.160.140:21021',
-        // target: 'http://101.36.160.140:21061', 
+        //target: 'http://101.36.160.140:21021',
+         target: 'http://101.36.160.140:21061', 
         changOrigin: true,
         pathRewrite: {
             '^/apk': ''