1

shanXiPlatform/src/router/index.js

@@ -347,6 +347,20 @@ export const constantRoutes = [
         hidden: true,
         meta: { title: '异常粮情', icon: 'dashboard',isshowLibrary:true, affix: true },
       },
+      {
+        path: 'gzjftable',
+        component: () => import('@/views/home/gzjftable'),
+        name: 'gzjftable',
+        hidden: true,
+        meta: { title: '工作完成情况', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
+      {
+        path: 'kngzjftable',
+        component: () => import('@/views/home/kngzjftable'),
+        name: 'kngzjftable',
+        hidden: true,
+        meta: { title: '工作完成情况', icon: 'dashboard',isshowLibrary:true, affix: true },
+      },
     ]
 
   },

shanXiPlatform/src/views/home/branchOffice.vue

@@ -238,7 +238,7 @@
                                 <p class="lsp">
                                     <img src="../../assets/images/rightarrow.png" alt />
                                     上月工作积分情况
-                                    <span v-if="crumbs.length != 2" class="echartSpan" @click="yclq()">更多>></span>
+                                    <span v-if="crumbs.length != 2" class="echartSpan" @click="gzjf()">更多>></span>
                                 </p>
                                 <div id="myChartrb" class="rtoprbo"></div>
                                 <!-- <img src="../../assets/images/jifen.png" alt /> -->
@@ -1232,6 +1232,7 @@ export default {
                 this.drawtdt()
                 this.midprovinceid = "1"
                 this.drawfor()
+                this.drawtrb()
             } else {
                 this.areacodearr.forEach(item => {
                     if (name == item.name) {
@@ -1262,7 +1263,16 @@ export default {
                     midprovinceName: this.midprovinceName
                 }
             })
-        }
+        },
+        gzjf() {
+            this.$router.push({
+                name: "gzjftable",
+                query: {
+                    depotId: this.midprovinceid,
+                    midprovinceName: this.midprovinceName
+                }
+            })
+        },
     }
 }
 </script>

shanXiPlatform/src/views/home/gzjftable.vue

@@ -0,0 +1,138 @@
+<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="month" format="yyyy-MM" 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 property="sTime" label="时间" align="center" >
+                        <template slot-scope="scope">
+                            {{ scope.row.sTime.slice(0,7) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column property="depotName" label="公司" align="center" min-width="150">
+                        <template slot-scope="scope">
+                            {{ depotDic[scope.row.depotId] }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="monthlyWorkQuantity" label="月工作总数(项)" align="center" />
+                    <el-table-column prop="finishOnTime" label="按时完成(项)" align="center" />
+                    <el-table-column prop="lateCompletion" label="逾期完成(项)" align="center" />
+                    <el-table-column prop="soverdue" label="逾期未完成(项)" align="center" />
+                    <el-table-column prop="sscore" 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 { getmorejfqk } from "@/api/branchoff/index.js"
+export default {
+    data() {
+        return {
+            datetime: "",
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: [],
+            depotDic: []
+        }
+    },
+    created() {
+        this.getList()
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
+    },
+    methods: {
+        timechange() {
+            this.$nextTick(() => {
+                let week = document.querySelector("#getWeek").value
+                this.checkYear = week
+            })
+        },
+        getList() {
+            var condition = {
+                // depotId: this.$store.state.depotId,
+                depotId: this.$route.query.depotId,
+                sTime: this.checkYear
+            }
+            condition = JSON.stringify(condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getmorejfqk(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( index, row  ) {
+              this.$router.push({
+                name: "kngzjftable",
+                query: {
+                    depotId: row.depotId,
+                    midprovinceName: this.$route.query.midprovinceName
+                }
+            })
+        }
+    }
+}
+</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/src/views/home/kngzjftable.vue

@@ -0,0 +1,123 @@
+<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="month" format="yyyy-MM" 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 property="sTime" label="时间" align="center" >
+                        <template slot-scope="scope">
+                            {{ scope.row.sTime.slice(0,7) }}
+                        </template>
+                    </el-table-column>
+                     <el-table-column prop="personnelName" label="人员" align="center" />
+                     <el-table-column prop="sposition" label="职位" align="center" />
+                     <el-table-column prop="depotName" label="公司" align="center" />
+                    <el-table-column prop="monthlyWorkQuantity" label="所在市区" align="center" />
+                    <el-table-column prop="monthlyWorkQuantity" label="月工作总数(项)" align="center" />
+                    <el-table-column prop="finishOnTime" label="按时完成(项)" align="center" />
+                    <el-table-column prop="lateCompletion" label="逾期完成(项)" align="center" />
+                    <el-table-column prop="soverdue" label="逾期未完成(项)" align="center" />
+                    <el-table-column prop="sscore" 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>
+        </div>
+    </div>
+</template>
+<script>
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
+import { getmorejfqk } from "@/api/branchoff/index.js"
+export default {
+    data() {
+        return {
+            datetime: "",
+            // 列表数据
+            tableList: [],
+            // 分页
+            total: 0,
+            listLoading: true,
+            listQuery: {
+                page: 1,
+                limit: 10
+            },
+            roleList: [],
+            depotDic: []
+        }
+    },
+    created() {
+        this.getList()
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
+    },
+    methods: {
+        timechange() {
+            this.$nextTick(() => {
+                let week = document.querySelector("#getWeek").value
+                this.checkYear = week
+            })
+        },
+        getList() {
+            var condition = {
+                // depotId: this.$store.state.depotId,
+                depotId: this.$route.query.depotId,
+                sTime: this.checkYear
+            }
+            condition = JSON.stringify(condition)
+            let data = {
+                condition: condition,
+                pageIndex: this.listQuery.page,
+                pageSize: this.listQuery.limit
+            }
+            getmorejfqk(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;
+}
+.container {
+    padding: 10px;
+}
+.pagination-container {
+    margin-top: 10px;
+    margin-right: 20px;
+    text-align: right;
+}
+</style>

shanXiPlatform/src/views/home/notice/index.vue

@@ -205,7 +205,8 @@ export default {
       }
     },
     removeTAG(str) {
-      return str.replace(/<[^>]+>/g, "")
+        str = str.replace(/&nbsp/g, "")
+        return str.replace(/<[^>]+>/g, "")
     },
     detailClickFn(id) {
       //  林加代码开始//

shanXiPlatform/src/views/home/yclqtable.vue

@@ -65,7 +65,6 @@ export default {
                 let week = document.querySelector("#getWeek").value
                 this.checkYear = week.slice(0, 4)
                 this.checkYearWeek = week.slice(5, 7)
-                this.getList()
             })
         },
         getList() {