新增按钮权限；

src/components/assessment/evaluationReportPage.vue

@@ -0,0 +1,279 @@
+<template>
+    <div class="evaluationReport">
+        <div class="evaluationReportBtn">
+            <div class="collectSeach">
+                <div class="exceed">
+                    <span class="exceedSpan">考评周期：</span>
+                    <!-- <el-input v-model="restype" placeholder="请输入业务类别"></el-input> -->
+                    <el-select v-model="rescycle" placeholder="请选择考评周期">
+                        <el-option
+                        v-for="item in periodData"
+                        :key="item.keyValue"
+                        :label="item.keyName"
+                        :value="item.keyValue">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="exceed">
+                    <span class="exceedSpan">业务属性：</span>
+                    <!-- <el-input v-model="resDes" placeholder="请输入业务简述"></el-input> -->
+                    <el-select v-model="resbinSection" placeholder="请选择业务属性" :disabled="isDetail">
+                        <el-option
+                        v-for="item in moduleData"
+                        :key="item.id"
+                        :label="item.sectionName"
+                        :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div>
+                <el-button type="primary" style="margin-left: 10px;" @click="getSeachData">搜索</el-button>
+                <el-button style="margin-left: 10px;" @click="resetSeach">重置</el-button>
+            </div>
+            <div class="PeriodBtn">
+                <btns
+                :showImport="false"
+                :showSave="false"
+                :showAdd="false"
+                :showDelete="false"
+                :disDelete="changeDateSelect.length === 0"
+                :disExport="true"
+                ></btns>
+            </div>
+            <div class="evaluationReportTableData">
+                <el-table :data="evaluationReportData" style="width: 100%" @select="rowClick" @select-all="rowClick">
+                    <el-table-column type="selection" label="操作" align="center"></el-table-column>
+                    <el-table-column label="业务编号" prop="responsibilityCode" width="300" />
+                    <el-table-column label="考评单位" prop="organizationName" width="330" />
+                    <el-table-column label="业务类别">
+                        <template #default="scope">
+                            <span v-if="scope.row.checkCycle === 'YDKP'" style="font-size: 12px;">月度考评</span>
+                            <span v-else-if="scope.row.checkCycle === 'JDKP'" style="font-size: 12px;">季度考评</span>
+                            <span v-else style="font-size: 12px;">年度考评</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="年度" prop="year" />
+                    <el-table-column label="月度/季度" prop="month" />
+                    <el-table-column label="业务属性" prop="binsection" />
+                    <el-table-column label="业务简述" prop="des" />
+                    <el-table-column label="操作">
+                        <template #default="scope">
+                            <p class="indicitem" @click="getDetail(scope.row)">详情</p>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="page.currentPage"
+                    :page-size="page.pagesize"
+                    layout="total, prev, pager, next, jumper"
+                    :total="page.total">
+                </el-pagination>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import btns from '../elbuttonS.vue'
+import {apiGetdeptresponsibilityList, apiGetdatadictionaryList, apiGetbinsectionList} from '../../api/api'
+export default {
+    components: {
+        btns
+    },
+    data() {
+        return {
+            rescycle: '',
+            resbinSection: '',
+            periodData: [],
+            moduleData: [],
+            changeDateSelect: [],
+            evaluationReportData:[],
+            page:{
+                pagesize: 12,
+                currentPage: 1,
+                total: 0
+            }
+        }
+    },
+    created() {
+        this.getevaluStartList()
+        this.getPeriodData()
+        this.getBinSectionData()
+    },
+    methods:{
+        // 查询列表页面
+        getevaluStartList(type) {
+            let that = this
+            let params = {
+                pageNum: that.page.currentPage,
+                pageSize: that.page.pagesize,
+                chechCycle: 'NDKP'
+            }
+            if (type) {
+                params.responsibilityCode = that.rescode
+                params.des = that.resDes
+            }
+            apiGetdeptresponsibilityList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.evaluationReportData = datas.data.records
+                    that.page.total = datas.data.total
+                }
+            })
+        },
+        //考评周期
+        getPeriodData() {
+            let that = this
+            let params = {
+                superKey: 'KPZQ0001'
+            }
+            apiGetdatadictionaryList(params).then(datas =>{
+                if (datas && datas.data) {
+                    that.periodData = datas.data
+                }
+            })
+        },
+        getBinSectionData() {
+            let that = this
+            apiGetbinsectionList().then(datas =>{
+                if (datas && datas.data) {
+                    that.moduleData = datas.data
+                }
+            })
+        },
+        //明细
+        getDetail(row) {
+            this.$refs.startFromDetail.init(row)
+        },
+        getSeachData() {
+            this.page.currentPage = 1
+            this.getevaluStartList('seach')
+        },
+        resetSeach() {
+            this.page.currentPage = 1
+            this.rescycle = ''
+            this.resbinSection = ''
+            this.getevaluStartList()
+        },
+        handleSizeChange(val){
+            this.page.pagesize = val
+            this.getevaluStartList()
+        },
+        handleCurrentChange(val){
+            this.page.currentPage =val
+            this.getevaluStartList()
+        },
+        rowClick(selection, row) {
+            this.changeDateSelect = selection
+        },
+    }
+}
+</script>
+
+<style lang="less">
+.evaluationReport{
+    .evaluationReportBtn{
+        .collectSeach{
+                display: flex;
+                padding: 24px 20px;
+                border-bottom: 1px solid#D6DBEA;
+                .exceed{
+                    display: flex;
+                    .exceedSpan{
+                        width: 80px;
+                        height: 12px;
+                        font-size: 14px;
+                        font-family: Microsoft YaHei;
+                        font-weight: 400;
+                        color: #8991B0;
+                        line-height: 12px;
+                        margin-top: 10px;
+                    }
+                    .el-input{
+                        margin-right:10px;
+                        height: 40px;
+                        .el-input__inner{
+                            height:40px;
+                        }
+                        .el-input__suffix{
+                            .el-select__caret{
+                                line-height:30px;
+                            }
+                        }
+                    }
+                }
+                .el-select{
+                    margin-right:10px;
+                    .el-input__inner{
+                        height:30px;
+                    }
+                    .el-input__suffix{
+                        .el-select__caret{
+                            line-height:30px;
+                        }
+                    }
+                }
+        }
+        span{
+            font-size:14px;
+        }
+        .PeriodBtn{
+            display: flex;
+                justify-content: end;
+                padding: 20px 0;
+        }
+        .el-button{
+            height: 30px;
+            // width:100px;
+            padding: 0 20px ;
+            // padding-top: 8px;
+            span{
+                margin:0;
+            }
+        }
+        .evaluationReportTableData{
+            .el-table{
+                .el-table__body-wrapper{
+                    height: 64vh !important;
+                }
+                .el-input__inner{
+                    height: 30px !important;
+                }
+                .el-radio__label{
+                    display: none;
+                }
+                .indicitem{
+                    color: #409EFF;
+                    font-size: 12px;
+                    margin-right: 20px;
+                    cursor:pointer;
+                    &:hover{
+                        text-decoration: underline;
+                    }
+                }
+            }
+            .el-pagination{
+                margin-top: 20px;
+                text-align: end;
+                position: relative;
+            }
+        }
+        .el-overlay{
+            .el-dialog{
+                .el-dialog__body{
+                    padding: 30px 60px 30px 20px !important;
+                    .periodFrom{
+                        .el-select, .el-input{
+                            width: 100%;
+                        }
+                        .el-input{
+                            height: 30px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+}
+</style>

src/components/assessment/evaluationStartFrom.vue

@@ -46,11 +46,11 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <div class="tableBtn add">
+                    <!-- <div class="tableBtn add">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div>
-                    <div class="tableBtn save" @click="saveDetail">
+                    </div> -->
+                    <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('evalStart:twoLevel:save')">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
                     </div>
@@ -58,10 +58,10 @@
                         <img :src="editIcon" alt="">
                         <span>新增</span>
                     </div> -->
-                    <div class="tableBtn delete">
+                    <!-- <div class="tableBtn delete">
                         <img :src="deleteIcon" alt="">
                         <span>删除</span>
-                    </div>
+                    </div> -->
                 </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
@@ -272,7 +272,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 66vw;
+                        left: 73vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/components/assessment/evaluationStartPage.vue

@@ -16,7 +16,10 @@
             <div class="PeriodBtn">
                 <btns
                 :showImport="false"
+                :showExport="false"
                 :showSave="false"
+                :showAdd="$utils.havePurview('evalStart:oneLevel:add')"
+                :showDelete="$utils.havePurview('evalStart:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disExport="true"
                 @handleAdd="handleAdd"

src/components/assessment/evaluationYearFrom.vue

@@ -46,11 +46,11 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <div class="tableBtn add">
+                    <!-- <div class="tableBtn add">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div>
-                    <div class="tableBtn save" @click="saveDetail">
+                    </div> -->
+                    <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('evalYear:twoLevel:save')">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
                     </div>
@@ -58,10 +58,10 @@
                         <img :src="editIcon" alt="">
                         <span>新增</span>
                     </div> -->
-                    <div class="tableBtn delete">
+                    <!-- <div class="tableBtn delete">
                         <img :src="deleteIcon" alt="">
                         <span>删除</span>
-                    </div>
+                    </div> -->
                 </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
@@ -272,7 +272,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 66vw;
+                        left: 73vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/components/assessment/evaluationYearPage.vue

@@ -17,6 +17,9 @@
                 <btns
                 :showImport="false"
                 :showSave="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('evalYear:oneLevel:add')"
+                :showDelete="$utils.havePurview('evalYear:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disExport="true"
                 @handleAdd="handleAdd"

src/components/assessment/monthQuarterFrom.vue

@@ -46,11 +46,11 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <div class="tableBtn add">
+                    <!-- <div class="tableBtn add">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div>
-                    <div class="tableBtn save" @click="saveDetail">
+                    </div> -->
+                    <div class="tableBtn save" @click="saveDetail" v-if="$utils.havePurview('monthQuarter:twoLevel:save')">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
                     </div>
@@ -58,10 +58,10 @@
                         <img :src="editIcon" alt="">
                         <span>新增</span>
                     </div> -->
-                    <div class="tableBtn delete">
+                    <!-- <div class="tableBtn delete">
                         <img :src="deleteIcon" alt="">
                         <span>删除</span>
-                    </div>
+                    </div> -->
                 </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
@@ -272,7 +272,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 66vw;
+                        left: 73vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/components/assessment/monthQuarterPage.vue

@@ -17,6 +17,9 @@
                 <btns
                 :showImport="false"
                 :showSave="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('monthQuarter:oneLevel:add')"
+                :showDelete="$utils.havePurview('monthQuarter:oneLevel:delete')"
                 :disDelete="changeDateSelect.length === 0"
                 :disExport="true"
                 @handleAdd="handleAdd"

src/components/evaluationSystem/achievementKPage.vue

@@ -11,6 +11,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('achieveK:oneLevel:add')"
+                :showSave="$utils.havePurview('achieveK:oneLevel:save')"
+                :showDelete="$utils.havePurview('achieveK:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/evaluationSystem/evaluationCompanyPage.vue

@@ -11,6 +11,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('evalCompany:oneLevel:add')"
+                :showSave="$utils.havePurview('evalCompany:oneLevel:save')"
+                :showDelete="$utils.havePurview('evalCompany:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/evaluationSystem/evaluationDepartmentPage.vue

@@ -11,6 +11,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('evalDepartment:oneLevel:add')"
+                :showSave="$utils.havePurview('evalDepartment:oneLevel:save')"
+                :showDelete="$utils.havePurview('evalDepartment:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/evaluationSystem/evaluationIndexPage.vue

@@ -11,6 +11,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('evalIndex:oneLevel:add')"
+                :showSave="$utils.havePurview('evalIndex:oneLevel:save')"
+                :showDelete="$utils.havePurview('evalIndex:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/evaluationSystem/evaluationPersonnelPage.vue

@@ -11,6 +11,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('evalPerson:oneLevel:add')"
+                :showSave="$utils.havePurview('evalPerson:oneLevel:save')"
+                :showDelete="$utils.havePurview('evalPerson:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/evaluationSystem/evaluationRulesPage.vue

@@ -11,6 +11,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('evalRules:oneLevel:add')"
+                :showSave="$utils.havePurview('evalRules:oneLevel:save')"
+                :showDelete="$utils.havePurview('evalRules:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/evaluationSystem/ruleDetailPage.vue

@@ -13,7 +13,7 @@
                     </div>
                     <div class="PeriodBtn">
                         <el-row :gutter="10" style="padding-left: 10px;">
-                            <el-col :span="1.5">
+                            <el-col :span="1.5" v-if="$utils.havePurview('evalStart:twoLevel:add')">
                                 <el-button
                                 type="primary"
                                 size="mini"
@@ -23,7 +23,7 @@
                                 <span>新增</span>
                                 </el-button>
                             </el-col>
-                            <el-col :span="1.5">
+                            <el-col :span="1.5" v-if="$utils.havePurview('evalStart:twoLevel:save')">
                                 <el-button
                                 type="success"
                                 size="mini"
@@ -34,7 +34,7 @@
                                 <span>修改</span>
                                 </el-button>
                             </el-col>
-                            <el-col :span="1.5">
+                            <el-col :span="1.5" v-if="$utils.havePurview('evalStart:twoLevel:delete')">
                                 <el-button
                                 type="danger"
                                 size="mini"

src/components/knowledgePage/scoringRulesDetailPage.vue

@@ -5,7 +5,7 @@
                 <div class="rulesDetailBtn">
                     <div class="PeriodBtn">
                         <el-row :gutter="10" style="padding-left: 10px;">
-                            <el-col :span="1.5">
+                            <el-col :span="1.5" v-if="$utils.havePurview('scoringRules:twoLevel:add')">
                                 <el-button
                                 type="primary"
                                 size="mini"
@@ -15,7 +15,7 @@
                                 <span>新增</span>
                                 </el-button>
                             </el-col>
-                            <el-col :span="1.5">
+                            <el-col :span="1.5" v-if="$utils.havePurview('scoringRules:twoLevel:save')">
                                 <el-button
                                 type="success"
                                 size="mini"
@@ -26,7 +26,7 @@
                                 <span>修改</span>
                                 </el-button>
                             </el-col>
-                            <el-col :span="1.5">
+                            <el-col :span="1.5" v-if="$utils.havePurview('scoringRules:twoLevel:delete')">
                                 <el-button
                                 type="danger"
                                 size="mini"

src/components/knowledgePage/scoringRulesPage.vue

@@ -18,6 +18,11 @@
             </div>
             <div class="PeriodBtn">
                 <btns
+                :showImport="false"
+                :showExport="false"
+                :showAdd="$utils.havePurview('scoringRules:oneLevel:add')"
+                :showSave="$utils.havePurview('scoringRules:oneLevel:save')"
+                :showDelete="$utils.havePurview('scoringRules:oneLevel:delete')"
                 :disSave="changeDateSelect.length === 0 || changeDateSelect.length>1"
                 :disDelete="changeDateSelect.length === 0"
                 :disImport="true"

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="startFrom">
-        <el-dialog title="考评启动详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
+        <el-dialog title="任务详情" v-model="dialogVisible" width="80vw" :close-on-click-modal="false">
             <div class="startDetail">
                 <p class="starttitleSty">单据信息：</p>
                 <el-row class="danjuMsg">
@@ -46,10 +46,10 @@
                     </el-col>
                 </el-row>
                 <div class="detaTableBtns">
-                    <div class="tableBtn add">
+                    <!-- <div class="tableBtn add">
                         <img :src="addIcon" alt="">
                         <span>新增</span>
-                    </div>
+                    </div> -->
                     <div class="tableBtn save" @click="saveDetail">
                         <img :src="saveIcon" alt="">
                         <span>保存</span>
@@ -58,10 +58,10 @@
                         <img :src="editIcon" alt="">
                         <span>新增</span>
                     </div> -->
-                    <div class="tableBtn delete">
+                    <!-- <div class="tableBtn delete">
                         <img :src="deleteIcon" alt="">
                         <span>删除</span>
-                    </div>
+                    </div> -->
                 </div>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="考评指标项内容" name="first">
@@ -316,7 +316,7 @@ export default {
                         width: 500px;
                         position: relative;
                         top: 32px;
-                        left: 66vw;
+                        left: 73vw;
                         z-index: 11111;
                         .tableBtn {
                             display: flex;

src/router/index.js

@@ -84,6 +84,17 @@ const routes = [
                                 '../components/assessment/evaluationYearPage.vue'
                             ),
                     },
+                    {
+                        path: '/assessment/evaluationReport',
+                        name: 'evaluationReport',
+                        meta: {
+                            title: '考评报告',
+                        },
+                        component: () =>
+                            import(
+                                '../components/assessment/evaluationReportPage.vue'
+                            ),
+                    },
                 ]
             },
             {

src/utils/index.js

@@ -1,140 +1,22 @@
-// import http from '@/api/http.js'
-// import { downloadXlsx } from "../utils/xlsx";
 import { saveAs } from 'file-saver'
-import {apiGetExportMsg, apiGetModel,} from '../api/api'
-// import XLSXD from 'xlsx-style'
-// import Papa from 'papaparse'
-// import { isObject } from "xe-utils"
+import { getToken } from '../api/auth'
 
 //检查空
 const checkNull = val => val === undefined || val === null
 
 const until = {
-    // 计算比率
-    ratioCalculation(a, b) {
-        let num = null
-        if (a !== '-' && b !== '-') {
-            if (a === '0.00' || a === 0) {
-                num = 0
-            } else if (b === '0.00' || b === 0) {
-                num = '-'
-            } else {
-                num = Math.round((Number(a)/Number(b)*100))+'%'
-            }
-        } else {
-            num = '-'
-        }
-        return num
-    },
-    // 导出所有
-    downloadPer(url,fileName, idss, idsmo) {
-        let params = null
-        if (!idsmo) {
-            params = {
-                ids: idss ? idss.join(',') : ''
-            }
-        } else {
-            params = {
-                idsMv: idss ? idss.join(',') : '',
-                idsBcr: idsmo ? idsmo.join(',') : '',
+    // 权限分配
+    havePurview(data) {
+        let per = JSON.parse(getToken('purview'))
+        let show = false
+        per.forEach(it => {
+            if (it === data) { 
+                show = true
             }
-        }
-        apiGetExportMsg(url,params).then(datas =>{
-            let blob = new Blob([datas])
-            saveAs(blob, fileName)
-        }).catch((r) => {
-            console.error(r)
-        })
-    },
-    // 下载模板
-    downloadTemplate(url, params, proName) {
-        apiGetModel(url,params).then(datas =>{
-            let blob = new Blob([datas])
-            saveAs(blob, proName)
-        }).catch((r) => {
-            console.error(r)
         })
+        return show
     },
-    getTime(date){
-        var y = date.getFullYear();  
-        var m = date.getMonth() + 1;  
-        m = m < 10 ? ('0' + m) : m;  
-        var d = date.getDate();  
-        d = d < 10 ? ('0' + d) : d;  
-        var h = date.getHours();  
-        h=h < 10 ? ('0' + h) : h;  
-        var minute = date.getMinutes();  
-        minute = minute < 10 ? ('0' + minute) : minute;  
-        var second=date.getSeconds();  
-        second=second < 10 ? ('0' + second) : second;  
-        return y + '-' + m + '-' + d+' '+h+':'+minute+':'+second; 
-        // timeF = y + '-' + m + '-' + d
-        // return timeF
-    },
-    changePowerPickDate(val) {
-        let endss = val.substring(val.length-2, val.length) * 1
-        let startTime = val.substring(0, val.length-2)
-        let allTime = ''
-        if (0 <= endss &&  endss < 15) {
-            allTime = startTime + '00'
-        } else if (15 <= endss &&  endss  < 30) {
-            allTime = startTime + '15'
-        } else if (30 <= endss &&  endss  < 45) {
-            allTime = startTime + '30'
-        } else if (45 <= endss &&  endss  < 60) {
-            allTime = startTime + '45'
-        }
-        return allTime
-    },
-    changeElectricPickDate(val) {
-        let endss = val.substring(val.length-2, val.length) * 1
-        let startTime = val.substring(0, val.length-2)
-        let allTime = ''
-        if (0 <= endss &&  endss < 10) {
-            allTime = startTime + '00'
-        } else if (10 <= endss &&  endss  < 20) {
-            allTime = startTime + '10'
-        } else if (20 <= endss &&  endss  < 30) {
-            allTime = startTime + '20'
-        } else if (30 <= endss &&  endss  < 40) {
-            allTime = startTime + '30'
-        } else if (40 <= endss &&  endss  < 50) {
-            allTime = startTime + '40'
-        } else if (50 <= endss &&  endss  < 60) {
-            allTime = startTime + '50'
-        }
-        return allTime
-    },
-    oninput(str, limit, type, zero) {
-        debugger
-        if (zero) {
-            if (str.substr(0, 1) === '.' || str.substr(0, 1) === '-') {
-                str = ''
-            }
-        } else {
-            if (str.substr(0, 1) === '.' || str.substr(0, 1) === '-' || str.substr(0, 1) === '0') {
-                str = ''
-            }
-        }
-        if (type === 'float') {
-            str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
-            if (limit === 1) {
-                str = str.replace(/^\D*([0-9]\d*\.?\d{0,1})?.*$/, '$1') // 小数点后只能输 1 位
-            } else if (limit === 2) {
-                str = str.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/, '$1') // 小数点后只能输 2 位
-            } else if (limit === 3) {
-                str = str.replace(/^\D*([0-9]\d*\.?\d{0,3})?.*$/, '$1') // 小数点后只能输 3 位
-            } else if (limit === 4) {
-                str = str.replace(/^\D*([0-9]\d*\.?\d{0,4})?.*$/, '$1') // 小数点后只能输 4 位
-            } else if (limit === 6) {
-                str = str.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1') // 小数点后只能输 6 位
-            }
-        } else {
-            str = str.replace(/[^\d^]+/g, '')
-            str = str.substring(0, limit)
-        }
-        return str
-    },
+    
     sortBy(attr,rev){
         //第二个参数没有传递 默认升序排列
         if(rev ==  undefined){