Commit 058f5c0a authored by godwithdh's avatar godwithdh

boss

parent 6aa70bfc
...@@ -13,7 +13,8 @@ function urlFun(name){ ...@@ -13,7 +13,8 @@ function urlFun(name){
* 默认公司 * 默认公司
*/ */
// default:`http://192.168.4.39:5001`, // default:`http://192.168.4.39:5001`,
default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`, default:`https://weixin.huansi.net/apiproxy/huansi/hszh_HSFabricTradeTest`,
// default:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/${userID}`,
/** /**
* 基本地址 * 基本地址
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<span :class="{active:situation=='abnormal'}" @click="situation='abnormal'">异常预警</span> <span :class="{active:situation=='abnormal'}" @click="situation='abnormal'">异常预警</span>
<span :class="{active:situation=='tiipChartInventory'}" @click="situation='tiipChartInventory'">库存情况</span> <span :class="{active:situation=='tiipChartInventory'}" @click="situation='tiipChartInventory'">库存情况</span>
</div> </div>
<div class="content"> <div class="content" :style="situation=='tiipChartInventory'&&'background:#fff;'">
<component :is="situation" :dateMode="dateMode" :start="DateValue[0]" :end="DateValue[1]"/> <component :is="situation" :dateMode="dateMode" :start="DateValue[0]" :end="DateValue[1]"/>
</div> </div>
<calendar <calendar
......
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
const data = this.chartData; const data = this.chartData;
const map = {}; const map = {};
data.forEach(function(obj) { data.forEach(function(obj) {
map[obj.sStoreName] = (obj.nAmount||0) + '元'; map[obj.sStoreName] = Number(obj.nAmount||0).toLocaleString() + '元';
}); });
this.myChart = new F2.Chart({ this.myChart = new F2.Chart({
id: 'myChart', id: 'myChart',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment