|
@@ -798,12 +798,12 @@ class PersonWorkbench extends BaseWidget {
|
|
|
var gcdhArr=[];
|
|
|
var gjcd=[];
|
|
|
result.sharpDataCount.forEach(item => {
|
|
|
- gxsg.push(-item.buildTotal)
|
|
|
- gcdh.push(item.deliverTotal)
|
|
|
- gjcd.push(item.sharpdata?item.sharpdata:0)
|
|
|
+ gxsg.push(-this.setNullAndUndefinedEmpty(item.buildTotal))
|
|
|
+ gcdh.push(this.setNullAndUndefinedEmpty(item.deliverTotal))
|
|
|
+ gjcd.push(this.setNullAndUndefinedEmpty(item.sharpdata))
|
|
|
|
|
|
- gxsgArr.push(item.buildTotal)
|
|
|
- gcdhArr.push(item.deliverTotal)
|
|
|
+ gxsgArr.push(this.setNullAndUndefinedEmpty(item.buildTotal))
|
|
|
+ gcdhArr.push(this.setNullAndUndefinedEmpty(item.deliverTotal))
|
|
|
})
|
|
|
gxsgArr.sort(function (a, b) {
|
|
|
return a-b;
|
|
@@ -1312,6 +1312,7 @@ class PersonWorkbench extends BaseWidget {
|
|
|
}
|
|
|
pictureHtml = "<ul class='picList' style='height:100%;width:100%;margin:0;padding:0;'>" + pictureHtml + "</ul>";
|
|
|
this.domObj.find('.photoList').empty().append(pictureHtml);
|
|
|
+ this.domObj.find('.photoList').viewer('destroy');
|
|
|
this.domObj.find('.photoList').viewer({
|
|
|
url:'data-original'
|
|
|
});
|
|
@@ -1409,6 +1410,14 @@ class PersonWorkbench extends BaseWidget {
|
|
|
}
|
|
|
return count;
|
|
|
}
|
|
|
+
|
|
|
+ setNullAndUndefinedEmpty(input) {
|
|
|
+ if (input === "Null"||input === "null"||input === "NULL"||input === null || input === undefined || input === "") {
|
|
|
+ return 0
|
|
|
+ } else {
|
|
|
+ return input
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
* 销毁对象
|
|
|
*/
|