0.0

package-lock.json

@@ -4323,6 +4323,14 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz",
+      "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
+      "requires": {
+        "zrender": "4.3.2"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -11621,6 +11629,11 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz?cache=0&sync_timestamp=1605884245353&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz",
+      "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
     }
   }
 }

package.json

@@ -13,6 +13,7 @@
     "axios": "^0.19.2",
     "core-js": "^3.6.5",
     "dingtalk-jsapi": "^2.11.25",
+    "echarts": "^4.9.0",
     "element-ui": "^2.13.2",
     "moment": "^2.29.0",
     "vconsole": "^3.3.4",

src/api/auth.js

@@ -24,7 +24,6 @@ export function getTyps (id) {
 export function getIsCreator (key) {
 	 let is=false;
 	 getUserData().employee_detail.role_list.forEach(item=>{ 
-		 console.log(item)
 		 if(key==item.name){
 			 is=true;
 		 }

src/main.js

@@ -9,6 +9,7 @@ import * as dd from 'dingtalk-jsapi';
 import VConsole from 'vconsole'
 import axios from 'axios'
 import service from './api/axios'
+import echarts from 'echarts'
 import { getToken, setToken,getUserData,setUserData,getTyps,setTyps,getIsCreator } from './api/auth';
 
 // 头像
@@ -19,7 +20,7 @@ Vue.use(ElementUI);
 // if (process.env.NODE_ENV === 'development') {
 //   new VConsole()
 // }
-
+Vue.prototype.$echarts = echarts
 Vue.prototype.$dd=dd;
 Vue.prototype.$getToken = getToken
 Vue.prototype.$setToken = setToken

src/views/ranking/custom_rank.vue

@@ -90,10 +90,10 @@
 		<el-dialog	:title="popupType? '新增分组':'编辑分组'" width="660px"  top="5%" :visible.sync="groupShow" @close="resetForm('newGroupForm')" :close-on-click-modal="false">
 			<el-form  ref="newGroupForm" :model="newGroupForm" :rules="rules" label-width="85px" @submit.native.prevent>
 				<el-form-item label="分组名称" prop="group_name">
-					<el-input v-model="newGroupForm.group_name" placeholder="请输入分组名称" auto-complete="off"></el-input>
+					<el-input v-model="newGroupForm.group_name" placeholder="请输入分组名称" :clearable="true"></el-input>
 				</el-form-item>
 				<el-form-item label="分组成员">
-				  <el-input auto-complete="off" v-model="employeeNames" placeholder="全部成员"></el-input>
+				  <el-input v-model="employeeNames" placeholder="全部成员"></el-input>
 				  <div @click="isEmployeeShow=true" style="height:36px; position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: 9;cursor:pointer"></div>
 				  <el-dialog title="选择人员" width="700px" :visible.sync="isEmployeeShow"  append-to-body :before-close="handleClose">
 					<EmployeeSelector
@@ -112,7 +112,7 @@
 				   
 				</el-form-item> 
 				<el-form-item label="积分规则">
-				  <el-input auto-complete="off" v-model="newGroupFormRules" placeholder="全部规则分类"></el-input>
+				  <el-input v-model="newGroupFormRules" placeholder="全部规则分类"></el-input>
 				  <div @click="ruleDialogTableVisibles" style="height:36px; position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: 9;cursor:pointer"></div>
 				  <div style="margin-bottom:12px;">
 				    <span style="font-size:13px;color:rgb(138 138 138);position: absolute; top: 30px; left: 0;">{{ruleHint}}</span>

src/views/ranking/manager_statistics.vue

@@ -45,6 +45,7 @@
 				size="medium"
                 @keyup.enter.native="keyWordSelect"
                 class="persons_name"
+				:clearable="true"
               >
                 <el-button slot="append" size="medium" icon="el-icon-search" @click='search_box'></el-button>
               </el-input>
@@ -63,7 +64,7 @@
 
           </el-form>
 
-		    <el-table :data="last" style="width: 100%" v-loading="loading" >
+		    <el-table :data="last" style="width: 100%" v-loading="loading">
             <el-table-column label="管理者">
               <template slot-scope="scope">
                 <userImage
@@ -117,9 +118,6 @@
               </div>
             </template>
           </el-table>
-
-		  
-
           <center style="padding: 20px 0;">
             <el-pagination
               background
@@ -131,7 +129,6 @@
               :total="totals"
             ></el-pagination>
           </center>
-
         </el-tab-pane>
         <el-tab-pane label="奖扣执行对比" name="first">
           <el-form :model="formData" :inline="true" ref="formData">
@@ -265,7 +262,6 @@
   </div>
 </template>
 <script>
-import ECharts from "echarts";
 export default {
   data() {
     return {
@@ -326,8 +322,7 @@ export default {
       }
       this.condition.page = 1
     	this.get_last()
-	},
-	
+	}
   },
   methods: {
     //情况
@@ -362,8 +357,8 @@ export default {
 	search_box(){
 		this.get_last();
   },
-  //导出报表
-  exportExcel() {
+    //导出报表
+    exportExcel() {
       let data = "";
       //部门
         this.condition.dept_id>0?data+="&rule_id="+ this.condition.dept_id:data+="&rule_id=0"
@@ -375,14 +370,8 @@ export default {
         this.condition.complete!=0?data+="&complete="+this.condition.complete:data+="&complete=0"
       //当前页数
         data+="&page="+this.condition.page
-      window.open(
-        process.env.BASE_API +
-          "/api/download/prize/list/v4?employee_id="+
-          this.$store.getters.user_info.id +
-          data,
-        "_blank"
-      );
-      this.dialogVisible = false;
+		window.open(process.env.VUE_APP_BASE_API  + "api/download/prize/list/v4?employee_id="+ this.$getUserData().id +  data, "_blank");
+        this.dialogVisible = false;
     },
     //分页选择显示多少条
     handleCurrentChange_xq(val) {
@@ -411,8 +400,7 @@ export default {
           } else {
             this.$message.error(res.data.data.msg);
           }
-        })
-        .finally(() => {
+        }).finally(() => {
           this.loading = false;
         });
     },
@@ -423,12 +411,8 @@ export default {
       this.detail_show = true;
       this.item = row;
       this.$nextTick(() => {
-        this.situationChart = ECharts.init(
-          document.getElementById("situationChart")
-        );
-        this.passengersChart = ECharts.init(
-          document.getElementById("passengersChart")
-        );
+        this.situationChart =this.$echarts.init( document.getElementById("situationChart"));
+        this.passengersChart = this.$echarts.init( document.getElementById("passengersChart"));
       });
       this.getData(() => (this.echart_loading = false));
       this.getDataV1(() => (this.personalData_loading = false));
@@ -573,8 +557,8 @@ export default {
   },
   mounted() {
 	  this.getDepartment();
-	// this.get_list();
- //    this.get_last();
+	  this.get_list();
+	  this.get_last();
   },
 };
 </script>

src/views/set/jurisdiction.vue

@@ -486,16 +486,7 @@ export default {
 	created() {
 		this.get_role_list();
 		// 判断是否是创始人或者积分负责人
-		var userData=this.$getUserData();
 		this.isStart = this.$getIsCreator("creator");
-		console.log(this.isStart)
-		// if(userData){
-		// 	  userData.employee_detail.role_list.forEach(item => {
-		// 		  if (item.name == 'creator') { 
-		// 			 this.isStart = true;
-		// 		  }
-		// 	  });
-		// }
 	},
 	mounted() {
 		if (localStorage.getItem('framework')) {