zs

config/dev.env.js

@@ -6,7 +6,9 @@ module.exports = {
   
   // BASE_API: '"http://test.qywx.g107.net"',
   // BASE_API: '"http://qywx.1024win.cn"',
-  BASE_API: '"http://test.qywx.g107.net"',
+
+  // BASE_API: '"http://test.qywx.g107.net"',//开发
+  BASE_API: '"https://qywx.g107.net"',//生产
   SERVE_AD: '"https://nkaoqin.g107.net"',
   // APPID: '"ww4065f0d4bb232a6a"',
   APPID: '"wwa8bbe3b687a632dd"',

config/prod.env.js

@@ -1,6 +1,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"https://oa.g107.com"',
+  BASE_API: '"https://qywx.g107.net"',//生产
   SERVE_AD:'"https://ad.g107.com"'
 }

config/sit.env.js

@@ -3,6 +3,6 @@ module.exports = {
   ENV_CONFIG: '"sit"',
   // BASE_API: '"https://new.gdy.g107.com"',
   // BASE_API: '"http://qywx.1024win.cn"',
-  BASE_API: '"http://test.qywx.g107.net"',
+  BASE_API: '"http://test.qywx.g107.net"',//开发
   SERVE_AD: '"https://nkaoqin.g107.net"'
 }

src/views/common/EmployeeSelector.vue

@@ -742,6 +742,9 @@ export default {
           }
         }
       }
+
+      var eSList = this.employee_selected_list;
+      this.employee_selected_list = eSList.filter(x => list.some(y => y.id === x.id));
       return list;
     }
   },

src/views/integral/rule/rule_category.vue

@@ -214,6 +214,7 @@
 
 <script>
   import { getToken } from '@/utils/auth'
+  import Vue from 'vue'
   let PerformTheNumber = true;//五秒执行一次变量
   export default {
     name: "rule_category",
@@ -398,7 +399,7 @@
     methods: {
       //导出规则按钮
       derivedRule(){
-        let token = this.$getToken?this.$getToken:getToken()
+        let token = getToken()?getToken():this.$getToken
         window.open(this.publicBASE_API+'/api/download/rule_item/item?employee_id='+this.$store.getters.user_info.id +'&token='+token)
       },
       //规则为空时点击 导入规则按钮

src/views/statistics_new/manager_statistics.vue

@@ -350,7 +350,7 @@
                     <p class="point">{{ personalData.task.ratio.ratio }}:1</p>
                     <p>奖扣比例</p>
                     <p class="target">
-                      目标>{{ personalData.task.ratio.target_ratio }}:1
+                      目标≤{{ personalData.task.ratio.target_ratio }}:1
                     </p>
                   </div>
                 </el-col>