优化更改

src/widgets/HomePageNew/GroupInfo.ts

@@ -657,7 +657,7 @@ class GroupInfo {
                             break;
             }
         }
-        this.global.domObj.find('.qt').html(""+total+"")
+        this.global.domObj.find('.qt').html(""+this.global.setNullAndUndefinedEmpty(total)+"")
     }
     //渲染管网信息的管线统计图表
     getPipeSituation(data){

src/widgets/HomePageNew/MapProjectOperation.ts

@@ -677,7 +677,7 @@ class MapProjectOpeartion{
                             break;
             }
         }
-        this.domObj.find('.qt').html(""+total+"")
+        this.domObj.find('.qt').html(""+this.global.setNullAndUndefinedEmpty(total)+"")
     }
     //渲染管网信息的管线统计图表
     getPipeSituation(data){

src/widgets/TjzlManagement/Widget.html

@@ -93,13 +93,13 @@
             <option value="02">管线宝导入</option>
         </select>
     </div>
-    <div class="moduleStyle">
+    <!-- <div class="moduleStyle">
         <label class="fontStyle">文件类型</label><br>
         <select class="form-control fontStyle infoType" style="width: 100% !important; height: 40%;float: left;padding:0px 0.2rem;">
             <option value="01" selected>成果表</option>
             <option value="03">CAD</option>
         </select>
-    </div>
+    </div> -->
     <div class="moduleStyle">
         <div class='fileSend'>
             <button type="button" class="addFile btn" title="点击上传选中的文件" style="left: 10px">文件上传</button>
@@ -113,7 +113,7 @@ $$
 <div class="tzzlpopup">
     <div class="top">
         <label>所属区域</label><select class="area"></select>
-        <label>项目</label><select class="project"></select>
+        <label>项目公司</label><select class="project"></select>
         <label>关键字</label><input class='inputData' placeholder="支持输入数据名称、上传单位">
         <button type="button" class="btn dataSearch">查询</button>
     </div>

src/widgets/TjzlManagement/Widget.ts

@@ -6,6 +6,7 @@ interface scfInfo{
     id:number,
     batchNum:string,
     areaName:string,
+    fullName:string,
     proName:string,
     division:string,
     batchName:string,
@@ -233,7 +234,7 @@ class TjzlManagement extends BaseWidget {
             name: 'areaName', title: '所属区域', data: 'areaName'
         }, 
         {
-            name: 'proName', title: '项目', data: 'proName'
+            name: 'fullName', title: '项目公司', data: 'fullName'
         },
         {
             name: 'division', title: '片区', data: 'division'
@@ -321,7 +322,7 @@ class TjzlManagement extends BaseWidget {
                     return {
                         submitStatus:that.submitStatus,
                         areaName:that.areaName,
-                        proName:that.project,
+                        fullName:that.project,
                         queryPara:that.keywordInput,
                         dataSource:that.dataSourceValue,
                         current: that.dataTable != null ? that.dataTable.page.info().page+1 : 1,
@@ -360,6 +361,7 @@ class TjzlManagement extends BaseWidget {
                                 batchName:item.batchName,
                                 id:item.id,
                                 batchNum:item.batchNum,
+                                fullName:item.fullName,
                                 division:item.division,
                                 proName:item.proName!=null?item.proName:"暂无",
                                 dataSource:dataSource,
@@ -432,23 +434,18 @@ class TjzlManagement extends BaseWidget {
                         this.domObj.find('.drawingName').val(data[0].batchName)
                         this.domObj.find('.dataProvideUnit').val(data[0].detectionUnit)
                         this.domObj.find('.dataProvidePerson').val(data[0].proName)
+                        this.domObj.find('.dataStage').val(data[0].dataSource)
                         //数据存储
                         let filesCgbName="";
+                        let cgbIndex=1;
                         // let filesCadName="";
                         this.fileCgb.splice(0,this.fileCgb.length)
                         // this.fileCad.splice(0,this.fileCad.length)
                         data[0].files.forEach((item) => {
                             // let type=item.filetype
-                            let cgbIndex=1;
-                            // let cadIndex=1;
                             if(item.localFileUrl!=null){
-                                if(cgbIndex==0){
-                                    filesCgbName+="<label>"+(cgbIndex)+"."+item.fileSourceName+"</label>"
-                                    cgbIndex++
-                                }else{
-                                    filesCgbName+="<label>"+(cgbIndex)+"."+item.fileSourceName+"</label>"
-                                    cgbIndex++
-                                }
+                                filesCgbName+="<label>"+(cgbIndex)+"."+item.fileSourceName+"</label>"
+                                cgbIndex++
                                 this.fileCgb.push(item.localFileUrl)
                             }
                             // switch(type){
@@ -1046,7 +1043,7 @@ class TjzlManagement extends BaseWidget {
         var that=this;
         let value = this.domObj.find('.dataStage option:selected').val();
         let sourceType = this.domObj.find('.sourceType option:selected').val().toString();
-        let infoType = this.domObj.find('.infoType option:selected').val().toString();
+        // let infoType = this.domObj.find('.infoType option:selected').val().toString();
         //文件名称
         let name = this.domObj.find(".drawingName").val().toString();
         if(this.baseAjaxSend.isXSS(name)){
@@ -1111,8 +1108,8 @@ class TjzlManagement extends BaseWidget {
         data.append("name", name);
         data.append("deptName", sendUnit);
         data.append("sourceType", sourceType);
-        data.append("infoType", infoType);
-        console.log("上传数据",data.get('infoType'),data.get('sourceType'),data.getAll('file'),data.getAll('path'),data.get('stdId'),data.get('prjId'),data.get('layerId'),data.get('name'),data.get('deptName'))
+        // data.append("infoType", infoType);
+        console.log("上传数据",data.get('sourceType'),data.getAll('file'),data.getAll('path'),data.get('stdId'),data.get('prjId'),data.get('layerId'),data.get('name'),data.get('deptName'))
         this.ajaxSend.sendFileAjax(this, data, this.config.addFile, this.ajaxSend.type.post, function (result) {
             if(result.code==1){
                 this.toast.show('资料上传成功');
@@ -1122,6 +1119,7 @@ class TjzlManagement extends BaseWidget {
                 that.domObj.find('.drawingName').val("")
                 that.domObj.find('.dataProvideUnit').val("")
                 that.domObj.find('.dataProvidePerson').val("")
+                that.domObj.find('.dataStage').val("")
                 that.fileCgb.splice(0,that.fileCgb.length)
                 cgbfile.value=''
                 that.domObj.find('.filesCgbResultShow').html("")