Merge branch 'test' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

public/index.html

@@ -18,8 +18,8 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    window.staticHost = 'http://10.230.26.15:8000/spfm';
-    // window.staticHost = 'http://192.168.2.142:9600/';
+    // window.staticHost = 'http://10.230.26.15:8000/spfm';
+    window.staticHost = 'http://192.168.0.103:9600/';
   </script>
 </body>
 

public/static/views/ecClubWork.html

@@ -239,7 +239,7 @@
                             type: 'error'
                             })
                         }
-                        
+
                     });
                 })
                 // 导出
@@ -293,4 +293,4 @@
     </script>
 </body>
 
-</html>
+</html>

public/static/views/weeklyReport.html

@@ -99,7 +99,7 @@
 			}
 		</script>
 		<script>
-			//创建角色  配置菜单   
+			//创建角色  配置菜单
 			var id = '' //  模板id 查看/修改load时候用
 			var powerFlag = '0'; // 权限控制 0 开启 1关闭
 			var excelId = '';
@@ -136,7 +136,8 @@
 						$('#monthSelect').show()
 						$('#bmSelect').show()
 						lockFlag = 'bm'; //部门经理
-						util.ajaxJson("数据加载中", ctx + '/sysmgr/csysdept/queryChildListByLoginDept', {}, function(res) {
+                        var weekUrl="";
+						util.ajaxJson("数据加载中", ctx + '/market/weeklyReport/queryChildListByLoginDept', {}, function(res) {
 							document.getElementById("ksFlag").innerHTML = '';
 							document.getElementById("userFlag").innerHTML = '';
 							for (let i = 0; i < res.length; i++) {

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
                         // vuex: {
                         //     name: 'vuex',
                         //     test: /[\\/]node_modules[\\/]vuex[\\/]/,
-                        //     priority: -10
+                        //     priority: -10qa
                         // },
                         // 'vue-router': {
                         //     name: 'vue-router',