linyanfei 3 роки тому
батько
коміт
5a277497aa

+ 14 - 0
shanXiPlatform/src/router/index.js

@@ -347,6 +347,20 @@ export const constantRoutes = [
347 347
         hidden: true,
348 348
         meta: { title: '异常粮情', icon: 'dashboard',isshowLibrary:true, affix: true },
349 349
       },
350
+      {
351
+        path: 'gzjftable',
352
+        component: () => import('@/views/home/gzjftable'),
353
+        name: 'gzjftable',
354
+        hidden: true,
355
+        meta: { title: '工作完成情况', icon: 'dashboard',isshowLibrary:true, affix: true },
356
+      },
357
+      {
358
+        path: 'kngzjftable',
359
+        component: () => import('@/views/home/kngzjftable'),
360
+        name: 'kngzjftable',
361
+        hidden: true,
362
+        meta: { title: '工作完成情况', icon: 'dashboard',isshowLibrary:true, affix: true },
363
+      },
350 364
     ]
351 365
 
352 366
   },

+ 12 - 2
shanXiPlatform/src/views/home/branchOffice.vue

@@ -238,7 +238,7 @@
238 238
                                 <p class="lsp">
239 239
                                     <img src="../../assets/images/rightarrow.png" alt />
240 240
                                     上月工作积分情况
241
-                                    <span v-if="crumbs.length != 2" class="echartSpan" @click="yclq()">更多>></span>
241
+                                    <span v-if="crumbs.length != 2" class="echartSpan" @click="gzjf()">更多>></span>
242 242
                                 </p>
243 243
                                 <div id="myChartrb" class="rtoprbo"></div>
244 244
                                 <!-- <img src="../../assets/images/jifen.png" alt /> -->
@@ -1232,6 +1232,7 @@ export default {
1232 1232
                 this.drawtdt()
1233 1233
                 this.midprovinceid = "1"
1234 1234
                 this.drawfor()
1235
+                this.drawtrb()
1235 1236
             } else {
1236 1237
                 this.areacodearr.forEach(item => {
1237 1238
                     if (name == item.name) {
@@ -1262,7 +1263,16 @@ export default {
1262 1263
                     midprovinceName: this.midprovinceName
1263 1264
                 }
1264 1265
             })
1265
-        }
1266
+        },
1267
+        gzjf() {
1268
+            this.$router.push({
1269
+                name: "gzjftable",
1270
+                query: {
1271
+                    depotId: this.midprovinceid,
1272
+                    midprovinceName: this.midprovinceName
1273
+                }
1274
+            })
1275
+        },
1266 1276
     }
1267 1277
 }
1268 1278
 </script>

+ 138 - 0
shanXiPlatform/src/views/home/gzjftable.vue

@@ -0,0 +1,138 @@
1
+<template>
2
+    <div class="global">
3
+        <div class="contentContainerGg">
4
+            <div class="container">
5
+                <el-form :inline="true">
6
+                    <el-form-item label="时间:">
7
+                        <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="month" format="yyyy-MM" placeholder="选择月">
8
+                        </el-date-picker>
9
+                    </el-form-item>
10
+                    <el-form-item>
11
+                        <el-button icon="el-icon-search" type="success" plain @click="getList()">
12
+                            查询</el-button>
13
+                    </el-form-item>
14
+                </el-form>
15
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
16
+                    <el-table-column property="sTime" label="时间" align="center" >
17
+                        <template slot-scope="scope">
18
+                            {{ scope.row.sTime.slice(0,7) }}
19
+                        </template>
20
+                    </el-table-column>
21
+                    <el-table-column property="depotName" label="公司" align="center" min-width="150">
22
+                        <template slot-scope="scope">
23
+                            {{ depotDic[scope.row.depotId] }}
24
+                        </template>
25
+                    </el-table-column>
26
+                    <el-table-column prop="monthlyWorkQuantity" label="月工作总数(项)" align="center" />
27
+                    <el-table-column prop="finishOnTime" label="按时完成(项)" align="center" />
28
+                    <el-table-column prop="lateCompletion" label="逾期完成(项)" align="center" />
29
+                    <el-table-column prop="soverdue" label="逾期未完成(项)" align="center" />
30
+                    <el-table-column prop="sscore" label="得分" align="center" />
31
+                    <el-table-column property="operation" label="操作" align="center">
32
+                        <template slot-scope="scope">
33
+                            <el-button size="mini" type="detailbtn" @click="detailbtn(scope.$index, scope.row)">查看库内工作情况排名</el-button>
34
+                        </template>
35
+                    </el-table-column>
36
+                </el-table>
37
+                <div class="pagination-container">
38
+                    <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>
39
+                </div>
40
+            </div>
41
+        </div>
42
+    </div>
43
+</template>
44
+<script>
45
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
46
+import { getmorejfqk } from "@/api/branchoff/index.js"
47
+export default {
48
+    data() {
49
+        return {
50
+            datetime: "",
51
+            // 列表数据
52
+            tableList: [],
53
+            // 分页
54
+            total: 0,
55
+            listLoading: true,
56
+            listQuery: {
57
+                page: 1,
58
+                limit: 10
59
+            },
60
+            roleList: [],
61
+            depotDic: []
62
+        }
63
+    },
64
+    created() {
65
+        this.getList()
66
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
67
+    },
68
+    methods: {
69
+        timechange() {
70
+            this.$nextTick(() => {
71
+                let week = document.querySelector("#getWeek").value
72
+                this.checkYear = week
73
+            })
74
+        },
75
+        getList() {
76
+            var condition = {
77
+                // depotId: this.$store.state.depotId,
78
+                depotId: this.$route.query.depotId,
79
+                sTime: this.checkYear
80
+            }
81
+            condition = JSON.stringify(condition)
82
+            let data = {
83
+                condition: condition,
84
+                pageIndex: this.listQuery.page,
85
+                pageSize: this.listQuery.limit
86
+            }
87
+            getmorejfqk(data)
88
+                .then(res => {
89
+                    if (res.code == 200) {
90
+                        this.tableList = res.data.records
91
+                        this.listQuery.limit = res.data.size
92
+                        this.total = res.data.total
93
+                    } else {
94
+                        this.$message({
95
+                            type: "error",
96
+                            message: res.msg
97
+                        })
98
+                    }
99
+                })
100
+                .catch(err => {
101
+                    console.log(err)
102
+                })
103
+        },
104
+        sizeChange(v) {
105
+            this.listQuery.limit = v
106
+            this.getList()
107
+        },
108
+        pageChange(v) {
109
+            this.listQuery.page = v
110
+            this.getList()
111
+        },
112
+        detailbtn( index, row  ) {
113
+              this.$router.push({
114
+                name: "kngzjftable",
115
+                query: {
116
+                    depotId: row.depotId,
117
+                    midprovinceName: this.$route.query.midprovinceName
118
+                }
119
+            })
120
+        }
121
+    }
122
+}
123
+</script>
124
+<style lang="scss" scoped>
125
+.top {
126
+    height: 40px;
127
+    line-height: 40px;
128
+    border-bottom: 1px solid #ccc;
129
+}
130
+.container {
131
+    padding: 10px;
132
+}
133
+.pagination-container {
134
+    margin-top: 10px;
135
+    margin-right: 20px;
136
+    text-align: right;
137
+}
138
+</style>

+ 123 - 0
shanXiPlatform/src/views/home/kngzjftable.vue

@@ -0,0 +1,123 @@
1
+<template>
2
+    <div class="global">
3
+        <div class="contentContainerGg">
4
+            <div class="container">
5
+                <el-form :inline="true">
6
+                    <el-form-item label="时间:">
7
+                        <el-date-picker @change="timechange" id="getWeek" v-model="datetime" type="month" format="yyyy-MM" placeholder="选择月">
8
+                        </el-date-picker>
9
+                    </el-form-item>
10
+                    <el-form-item>
11
+                        <el-button icon="el-icon-search" type="success" plain @click="getList()">
12
+                            查询</el-button>
13
+                    </el-form-item>
14
+                </el-form>
15
+                <el-table border :data="tableList" highlight-current-row style="width:100%" :header-cell-style="{background:'#f8f8f8'}">
16
+                    <el-table-column property="sTime" label="时间" align="center" >
17
+                        <template slot-scope="scope">
18
+                            {{ scope.row.sTime.slice(0,7) }}
19
+                        </template>
20
+                    </el-table-column>
21
+                     <el-table-column prop="personnelName" label="人员" align="center" />
22
+                     <el-table-column prop="sposition" label="职位" align="center" />
23
+                     <el-table-column prop="depotName" label="公司" align="center" />
24
+                    <el-table-column prop="monthlyWorkQuantity" label="所在市区" align="center" />
25
+                    <el-table-column prop="monthlyWorkQuantity" label="月工作总数(项)" align="center" />
26
+                    <el-table-column prop="finishOnTime" label="按时完成(项)" align="center" />
27
+                    <el-table-column prop="lateCompletion" label="逾期完成(项)" align="center" />
28
+                    <el-table-column prop="soverdue" label="逾期未完成(项)" align="center" />
29
+                    <el-table-column prop="sscore" label="得分" align="center" />
30
+                </el-table>
31
+                <div class="pagination-container">
32
+                    <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>
33
+                </div>
34
+            </div>
35
+        </div>
36
+    </div>
37
+</template>
38
+<script>
39
+import { getcf } from "@/api/organizationalStructureManagement/index.js"
40
+import { getmorejfqk } from "@/api/branchoff/index.js"
41
+export default {
42
+    data() {
43
+        return {
44
+            datetime: "",
45
+            // 列表数据
46
+            tableList: [],
47
+            // 分页
48
+            total: 0,
49
+            listLoading: true,
50
+            listQuery: {
51
+                page: 1,
52
+                limit: 10
53
+            },
54
+            roleList: [],
55
+            depotDic: []
56
+        }
57
+    },
58
+    created() {
59
+        this.getList()
60
+        this.depotDic = JSON.parse(localStorage.getItem("deportDic"))
61
+    },
62
+    methods: {
63
+        timechange() {
64
+            this.$nextTick(() => {
65
+                let week = document.querySelector("#getWeek").value
66
+                this.checkYear = week
67
+            })
68
+        },
69
+        getList() {
70
+            var condition = {
71
+                // depotId: this.$store.state.depotId,
72
+                depotId: this.$route.query.depotId,
73
+                sTime: this.checkYear
74
+            }
75
+            condition = JSON.stringify(condition)
76
+            let data = {
77
+                condition: condition,
78
+                pageIndex: this.listQuery.page,
79
+                pageSize: this.listQuery.limit
80
+            }
81
+            getmorejfqk(data)
82
+                .then(res => {
83
+                    if (res.code == 200) {
84
+                        this.tableList = res.data.records
85
+                        this.listQuery.limit = res.data.size
86
+                        this.total = res.data.total
87
+                    } else {
88
+                        this.$message({
89
+                            type: "error",
90
+                            message: res.msg
91
+                        })
92
+                    }
93
+                })
94
+                .catch(err => {
95
+                    console.log(err)
96
+                })
97
+        },
98
+        sizeChange(v) {
99
+            this.listQuery.limit = v
100
+            this.getList()
101
+        },
102
+        pageChange(v) {
103
+            this.listQuery.page = v
104
+            this.getList()
105
+        },
106
+    }
107
+}
108
+</script>
109
+<style lang="scss" scoped>
110
+.top {
111
+    height: 40px;
112
+    line-height: 40px;
113
+    border-bottom: 1px solid #ccc;
114
+}
115
+.container {
116
+    padding: 10px;
117
+}
118
+.pagination-container {
119
+    margin-top: 10px;
120
+    margin-right: 20px;
121
+    text-align: right;
122
+}
123
+</style>

+ 2 - 1
shanXiPlatform/src/views/home/notice/index.vue

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

+ 0 - 1
shanXiPlatform/src/views/home/yclqtable.vue

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