1 涉及到上传的调整成 上报

zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue

@@ -108,19 +108,19 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="上传状态" >
+          <el-form-item label="上报状态" >
             <span>{{fUploadType}}</span> 
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-            <el-form-item label="上传时间" >
+            <el-form-item label="上报时间" >
               <span>{{ fUploadTime }}</span> 
             </el-form-item>
         </el-col>
         
         <el-col :span="12"> 
-          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上传时间" >
+          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
             <span>{{ detailInfo.fUploadTime }}</span>
           </el-form-item>
         </el-col>
@@ -164,10 +164,10 @@
         }
 
         if (this.fUploadType == '0') {
-          this.fUploadType = "未上传"
+          this.fUploadType = "未上报"
         }
         if (this.fUploadType == '1') {
-          this.fUploadType = "已上传"
+          this.fUploadType = "已上报"
         }
       },
       showUploadTime() {

zh-baseversion-web/src/views/oldpipesystem/process/index.vue

@@ -20,10 +20,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="上传状态" prop="fUploadType">
-        <el-select v-model="queryParams.fUploadType" placeholder="请选择上传状态" clearable size="small">
-          <el-option label="未上传" value="0" />
-          <el-option label="已上传" value="1" />
+      <el-form-item label="上报状态" prop="fUploadType">
+        <el-select v-model="queryParams.fUploadType" placeholder="请选择上报状态" clearable size="small">
+          <el-option label="未上报" value="0" />
+          <el-option label="已上报" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -112,9 +112,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上传状态" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
+      <el-table-column label="上报状态" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
       </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
+      <el-table-column label="上报时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
@@ -143,7 +143,7 @@
             type="text"
             @click="handleReport(scope.row)"
             v-if="judgeUploadIsShow((scope.row))"
-          >上传</el-button> 
+          >上报</el-button> 
         </template>
       </el-table-column>
     </el-table>
@@ -460,24 +460,24 @@ export default {
       this.reset();
     },
      
-    //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
+    //判断 上报是否需要显示，上报分为企业上报 和 政府端上报
     judgeUploadIsShow(row) { 
 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
 
-      // 企业端 上传状态 0-未上传，1-已上传
+      // 企业端 上报状态 0-未上报，1-已上报
       let entUploadState = row.fUploadType;
 
-      // 政府端 上传状态 0-未上传，1-已上传
+      // 政府端 上报状态 0-未上报，1-已上报
       let govUploadState = row.govUploadState;
 
-      // 如果政府端都已经上传，那就不能显示了。
+      // 如果政府端都已经上报，那就不能显示了。
       if(govUploadState === '1') {
         return false;
       }
 
-      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
+      // 如果企业端上报了，则企业端就不能显示了，政府端和 超级管理员能显示
       if(entUploadState === '1' && govUploadState === '0') {
         if (roleId === 5) {
           return false;
@@ -490,25 +490,25 @@ export default {
       return true;
 
     },
-    //上传状态动态展示
+    //上报状态动态展示
     uploadStateFormat(row, column) { 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
         if (row.fUploadType == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } else { 
         if (row.govUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } 
     },
-    //上传时间动态展示
+    //上报时间动态展示
     uploadTimeFormat(row, column) {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
@@ -655,9 +655,9 @@ export default {
       this.$refs.detail.getDetailInfo(row.fOldPlanProcessId);
     },
     handleReport(row){
-      // 如果是  超级管理员或者 企业，并且 企业端上传状态为0
+      // 如果是  超级管理员或者 企业，并且 企业端上报状态为0
       if (this.user.roleId == 5 && row.fUploadType == '0') {
-        this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -665,14 +665,14 @@ export default {
             return entReportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId});  
           }).then(() => { 
             this.getList();
-            this.msgSuccess("上传成功");
+            this.msgSuccess("上报成功");
           }).catch(() => {});
       } 
       
 
-      // 如果是  超级管理员或者 政府，并且 政府端上传状态为0
+      // 如果是  超级管理员或者 政府，并且 政府端上报状态为0
       if (this.user.roleId == 3  && row.govUploadState == '0') {
-        this.$confirm('是否确认上传老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报老旧管网改造计划项目名称为"' + row.fProjectName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -680,7 +680,7 @@ export default {
           return reportPipeOldPlanProcess({fOldPlanProcessId : row.fOldPlanProcessId}); 
         }).then(() => {
           this.getList();
-          this.msgSuccess("上传成功");
+          this.msgSuccess("上报成功");
         }).catch(() => {});
       }
     },

zh-baseversion-web/src/views/risk/components/DetailInfo.vue

@@ -66,19 +66,19 @@
           </el-col> 
 
           <el-col :span="12">
-            <el-form-item label="上传状态" >
+            <el-form-item label="上报状态" >
               <span>{{fUploadType}}</span> 
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-              <el-form-item label="上传时间" >
+              <el-form-item label="上报时间" >
                 <span>{{ fUploadTime }}</span> 
               </el-form-item>
           </el-col>
           
           <el-col :span="12"> 
-            <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上传时间" >
+            <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
               <span>{{ detailInfo.entUploadTime }}</span>
             </el-form-item>
           </el-col>

zh-baseversion-web/src/views/risk/index.vue

@@ -30,10 +30,10 @@
         </el-select>
       </el-form-item>
       
-      <el-form-item label="上传状态" prop="entUploadState">
-        <el-select v-model="queryParams.entUploadState" placeholder="请选择上传状态" clearable size="small">
-          <el-option label="未上传" value="0" />
-          <el-option label="已上传" value="1" />
+      <el-form-item label="上报状态" prop="entUploadState">
+        <el-select v-model="queryParams.entUploadState" placeholder="请选择上报状态" clearable size="small">
+          <el-option label="未上报" value="0" />
+          <el-option label="已上报" value="1" />
         </el-select>
       </el-form-item>
 
@@ -96,9 +96,9 @@
       <el-table-column label="县级行政区" align="center" prop="fRegionId" />
       <el-table-column label="重要风险点类型" align="center" prop="fRiskType" :formatter="fRiskTypeFormat" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="fRemark" :show-overflow-tooltip="true"/>
-      <el-table-column label="上传状态" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
+      <el-table-column label="上报状态" align="center" prop="fUploadType" :formatter="uploadStateFormat"> 
       </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
+      <el-table-column label="上报时间" align="center" prop="fUploadTime" width="150" :formatter="uploadTimeFormat"> 
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -128,7 +128,7 @@
             type="text"
             @click="handleReport(scope.row)"
             v-if="judgeUploadIsShow((scope.row))"
-          >上传</el-button>
+          >上报</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -353,24 +353,24 @@ export default {
     this.getCountyInfo();
   },
   methods: {
-    //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
+    //判断 上报是否需要显示，上报分为企业上报 和 政府端上报
     judgeUploadIsShow(row) { 
 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
 
-      // 企业端 上传状态 0-未上传，1-已上传
+      // 企业端 上报状态 0-未上报，1-已上报
       let entUploadState = row.entUploadState;
 
-      // 政府端 上传状态 0-未上传，1-已上传
+      // 政府端 上报状态 0-未上报，1-已上报
       let govUploadState = row.govUploadState;
 
-      // 如果政府端都已经上传，那就不能显示了。
+      // 如果政府端都已经上报，那就不能显示了。
       if(govUploadState === '1') {
         return false;
       }
 
-      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
+      // 如果企业端上报了，则企业端就不能显示了，政府端和 超级管理员能显示
       if(entUploadState === '1' && govUploadState === '0') {
         if (roleId === 5) {
           return false;
@@ -576,25 +576,25 @@ export default {
       this.$refs.detail.getDetailInfo(row.fRiskDevMajInforId);
     },
     
-    //上传状态动态展示
+    //上报状态动态展示
     uploadStateFormat(row, column) { 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
         if (row.entUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } else { 
         if (row.govUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } 
     },
-    //上传时间动态展示
+    //上报时间动态展示
     uploadTimeFormat(row, column) {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
@@ -605,11 +605,11 @@ export default {
       }
 
     },
-    /** 上传按钮操作 */
+    /** 上报按钮操作 */
     handleReport(row) {
-      // 如果是 企业，并且 企业端上传状态为0
+      // 如果是 企业，并且 企业端上报状态为0
       if (this.user.roleId == 5 && row.entUploadState == '0') {
-        this.$confirm('是否确认上传重要风险点编码为"' + row.fRiskCode + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报重要风险点编码为"' + row.fRiskCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -617,14 +617,14 @@ export default {
             return entReportRiskInfo({fRiskDevMajInforId : row.fRiskDevMajInforId});
           }).then(() => { 
             this.getList();
-            this.msgSuccess("上传成功");
+            this.msgSuccess("上报成功");
           }).catch(() => {});
       } 
       
 
-      // 如果是  政府，并且 政府端上传状态为0
+      // 如果是  政府，并且 政府端上报状态为0
       if (this.user.roleId == 3  && row.govUploadState == '0') {
-        this.$confirm('是否确认上传重要风险点编码为"' + row.fRiskCode + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报重要风险点编码为"' + row.fRiskCode + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -632,7 +632,7 @@ export default {
           return reportRiskInfo({fRiskDevMajInforId : row.fRiskDevMajInforId});
         }).then(() => {
           this.getList();
-          this.msgSuccess("上传成功");
+          this.msgSuccess("上报成功");
         }).catch(() => {});
       }
     },

zh-baseversion-web/src/views/supervision/findings/components/DetailInfo.vue

@@ -53,7 +53,7 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="上传时间">
+          <el-form-item label="上报时间">
             <span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span>
             <span v-else>-</span>
           </el-form-item>

zh-baseversion-web/src/views/supervision/findings/index.vue

@@ -29,10 +29,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="上传状态" prop="govUploadState">
-        <el-select v-model="queryParams.govUploadState" placeholder="请选择上传状态">
-          <el-option label="未上传" value="0"/>
-          <el-option label="已上传" value="1"/>
+      <el-form-item label="上报状态" prop="govUploadState">
+        <el-select v-model="queryParams.govUploadState" placeholder="请选择上报状态">
+          <el-option label="未上报" value="0"/>
+          <el-option label="已上报" value="1"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -108,14 +108,14 @@
           <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上传状态" align="center" prop="govUploadState">
+      <el-table-column label="上报状态" align="center" prop="govUploadState">
         <template slot-scope="scope">
-          <span v-if="scope.row.govUploadState == '1'">已上传</span>
-          <span v-else-if="scope.row.govUploadState == '0'">未上传</span>
+          <span v-if="scope.row.govUploadState == '1'">已上报</span>
+          <span v-else-if="scope.row.govUploadState == '0'">未上报</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="govUploadTime" width="180">
+      <el-table-column label="上报时间" align="center" prop="govUploadTime" width="180">
         <template slot-scope="scope">
           <span v-if="scope.row.govUploadTime">{{ parseTime(scope.row.govUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           <span v-else>-</span>
@@ -145,7 +145,7 @@
             size="mini"
             type="text"
             @click="handleReport(scope.row)"
-          >上传</el-button>
+          >上报</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -425,9 +425,9 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.fInsSpotRecInforId);
     },
-    //上传
+    //上报
     handleReport(row) {
-      this.$confirm('是否确认上传调查结果名称为"' + row.fName + '"的数据项?', "警告", {
+      this.$confirm('是否确认上报调查结果名称为"' + row.fName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -435,7 +435,7 @@ export default {
         return reportSpotRecInfo({fInsSpotRecInforId: row.fInsSpotRecInforId});
       }).then(() => {
         this.getList();
-        this.msgSuccess("上传成功");
+        this.msgSuccess("上报成功");
       }).catch(() => {});
     },
   }

zh-baseversion-web/src/views/supervision/record/components/InspectInfo.vue

@@ -89,7 +89,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="上传时间">
+            <el-form-item label="上报时间">
               <span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span>
               <span v-else>-</span>
             </el-form-item>

zh-baseversion-web/src/views/supervision/record/index.vue

@@ -39,10 +39,10 @@
         />
       </el-form-item>
 
-      <el-form-item label="上传状态" prop="govUploadState">
-        <el-select v-model="queryParams.govUploadState" placeholder="请选择上传状态">
-          <el-option label="未上传" value="0"/>
-          <el-option label="已上传" value="1"/>
+      <el-form-item label="上报状态" prop="govUploadState">
+        <el-select v-model="queryParams.govUploadState" placeholder="请选择上报状态">
+          <el-option label="未上报" value="0"/>
+          <el-option label="已上报" value="1"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -134,14 +134,14 @@
           <span v-else>-</span>
         </template>
       </el-table-column>-->
-      <el-table-column label="上传状态" align="center" prop="govUploadState">
+      <el-table-column label="上报状态" align="center" prop="govUploadState">
         <template slot-scope="scope">
-          <span v-if="scope.row.govUploadState == '1'">已上传</span>
-          <span v-else-if="scope.row.govUploadState == '0'">未上传</span>
+          <span v-if="scope.row.govUploadState == '1'">已上报</span>
+          <span v-else-if="scope.row.govUploadState == '0'">未上报</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="govUploadTime" width="180">
+      <el-table-column label="上报时间" align="center" prop="govUploadTime" width="180">
         <template slot-scope="scope">
           <span v-if="scope.row.govUploadTime">{{ parseTime(scope.row.govUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           <span v-else>-</span>
@@ -171,12 +171,12 @@
             size="mini"
             type="text"
             @click="handleReport(scope.row)"
-          >上传记录</el-button>
+          >上报记录</el-button>
           <el-button
             size="mini"
             type="text"
             @click="handleReportHidden(scope.row)"
-          >上传隐患</el-button>
+          >上报隐患</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -322,13 +322,6 @@
               <imageUpload v-model="form.fAnnex"/>
             </el-form-item>
           </el-col>  
-
-          <!--<el-col :span="24">
-            <el-form-item label="描述" prop="fRemark">
-              <el-input type="textarea" v-model="form.fRemark" placeholder="请输入描述" />
-            </el-form-item>
-          </el-col>-->
-
         </el-row>
 
         <!-- 隐患管理 -->
@@ -582,9 +575,9 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.fInsRecInforId);
     },
-    //上传
+    //上报
     handleReport(row) {
-      this.$confirm('是否确认上传检查记录编码为"' + row.fCheckCode + '"的数据项?', "警告", {
+      this.$confirm('是否确认上报检查记录编码为"' + row.fCheckCode + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -592,12 +585,12 @@ export default {
         return reportRecInfo({fInsRecInforId : row.fInsRecInforId});
       }).then(() => {
         this.getList();
-        this.msgSuccess("上传成功");
+        this.msgSuccess("上报成功");
       }).catch(() => {});
     },
-    //上传隐患
+    //上报隐患
     handleReportHidden(row){
-      this.$confirm('是否确认上传检查记录编码为"' + row.fCheckCode + '"的数据项?', "警告", {
+      this.$confirm('是否确认上报检查记录编码为"' + row.fCheckCode + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -605,7 +598,7 @@ export default {
         return reportHazRefInfoByCheckCode({checkCode : row.fCheckCode});
       }).then(() => {
         this.getList();
-        this.msgSuccess("上传隐患成功");
+        this.msgSuccess("上报隐患成功");
       }).catch(() => {});
     },
     taskChange(val){

zh-baseversion-web/src/views/supervision/spot/index.vue

@@ -72,6 +72,14 @@
           @click="handleExport"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          plain
+          size="mini"
+          type="info"
+          @click="getGovermentTaskInfo"
+        >从省平台获取数据</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -315,6 +323,7 @@
 import { listRef, getRef, delRef, addRef, updateRef, exportRef } from "@/api/supervision/spot";
 import ImageUpload from '@/components/ImageUpload';
 import DetailInfo from "./components/DetailInfo";
+import { getTask } from "@/api/govermentdata/GovermentData";
 import { getDefaultCountyList } from "@/api/area/county";
 import { enterpriseListInfo } from "@/api/regulation/info";
 import { hiddenList } from "@/api/supervision/hideType";
@@ -382,6 +391,19 @@ export default {
     });
   },
   methods: {
+    //获取数据 // 等正式有接口了，后台要重新一套 拿数据部分
+    getGovermentTaskInfo(){
+      this.$confirm('是否确认从省平台获取数据?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return getTask({updateTime:moment().format('YYYY-MM-DD HH:mm:ss'),pageIndex: 1,pageSize: 1000});
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("从省平台获取数据成功");
+      }).catch(() => {});
+    },
     /** 查询抽查隐患列表 */
     getList() {
       this.loading = true;

zh-baseversion-web/src/views/thirdbuild/accident/components/DetailInfo.vue

@@ -52,19 +52,19 @@
 
 
         <el-col :span="12">
-          <el-form-item label="上传状态" >
+          <el-form-item label="上报状态" >
             <span>{{fUploadType}}</span> 
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-            <el-form-item label="上传时间" >
+            <el-form-item label="上报时间" >
               <span>{{fUploadTime}}</span> 
             </el-form-item>
         </el-col>
         
         <el-col :span="12"> 
-          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上传时间" >
+          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
             <span>{{ detailInfo.entUploadTime }}</span>
           </el-form-item>
         </el-col>
@@ -99,10 +99,10 @@
         }
 
         if (this.fUploadType == '0') {
-          this.fUploadType = "未上传"
+          this.fUploadType = "未上报"
         }
         if (this.fUploadType == '1') {
-          this.fUploadType = "已上传"
+          this.fUploadType = "已上报"
         }
       },
       showUploadTime() {

zh-baseversion-web/src/views/thirdbuild/accident/index.vue

@@ -20,10 +20,10 @@
         />
       </el-form-item>
       
-      <el-form-item label="上传状态" prop="fUploadType">
-        <el-select v-model="queryParams.fUploadType" placeholder="请选择上传状态" clearable size="small">
-          <el-option label="未上传" value="0" />
-          <el-option label="已上传" value="1" />
+      <el-form-item label="上报状态" prop="fUploadType">
+        <el-select v-model="queryParams.fUploadType" placeholder="请选择上报状态" clearable size="small">
+          <el-option label="未上报" value="0" />
+          <el-option label="已上报" value="1" />
         </el-select>
       </el-form-item>
 
@@ -104,8 +104,8 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="上传状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
-      <el-table-column label="上传时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
+      <el-table-column label="上报状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
+      <el-table-column label="上报时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -133,7 +133,7 @@
             type="text"
             @click="handleReport(scope.row)"
             v-if="judgeUploadIsShow((scope.row))"
-          >上传</el-button>
+          >上报</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -324,25 +324,25 @@ export default {
       });
     },
     
-    //上传状态动态展示
+    //上报状态动态展示
     uploadStateFormat(row, column) { 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
         if (row.entUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } else { 
         if (row.govUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } 
     },
-    //上传时间动态展示
+    //上报时间动态展示
     uploadTimeFormat(row, column) {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
@@ -372,24 +372,24 @@ export default {
       });
     },
     
-    //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
+    //判断 上报是否需要显示，上报分为企业上报 和 政府端上报
     judgeUploadIsShow(row) { 
 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
 
-      // 企业端 上传状态 0-未上传，1-已上传
+      // 企业端 上报状态 0-未上报，1-已上报
       let entUploadState = row.entUploadState;
 
-      // 政府端 上传状态 0-未上传，1-已上传
+      // 政府端 上报状态 0-未上报，1-已上报
       let govUploadState = row.govUploadState;
 
-      // 如果政府端都已经上传，那就不能显示了。
+      // 如果政府端都已经上报，那就不能显示了。
       if(govUploadState === '1') {
         return false;
       }
 
-      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
+      // 如果企业端上报了，则企业端就不能显示了，政府端和 超级管理员能显示
       if(entUploadState === '1' && govUploadState === '0') {
         if (roleId === 5) {
           return false;
@@ -530,7 +530,7 @@ export default {
         }
       })
     },
-    //上传
+    //上报
     getFileInfo(res){  
       this.form.fAttachment = res.url;
       this.fileList.push({
@@ -549,12 +549,12 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.fConGasProIncId);
     },
-    /** 上传按钮操作 */
+    /** 上报按钮操作 */
     handleReport(row) { 
 
-      // 如果是 超级管理员 或这企业，并且 企业端上传状态为0
+      // 如果是 超级管理员 或这企业，并且 企业端上报状态为0
       if ((this.user.roleId == 5 || this.user.roleId == 1) && row.entUploadState == '0') {
-        this.$confirm('是否确认上传项目编号为"' + row.projectCode + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报项目编号为"' + row.projectCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -562,13 +562,13 @@ export default {
           return entReportConGasProInfo({fConGasProIncId : row.fConGasProIncId});
         }).then(() => {
           this.getList();
-        this.msgSuccess("上传成功");
+        this.msgSuccess("上报成功");
         }).catch(() => {});
       } 
       
-      // 如果是 超级管理员 或这政府，并且 政府端上传状态为0
+      // 如果是 超级管理员 或这政府，并且 政府端上报状态为0
       if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
-        this.$confirm('是否确认上传项目编号为"' + row.projectCode + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报项目编号为"' + row.projectCode + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -576,7 +576,7 @@ export default {
           return reportAccidentInfo({fConGasProIncId : row.fConGasProIncId});
         }).then(() => {
           this.getList();
-        this.msgSuccess("上传成功");
+        this.msgSuccess("上报成功");
         }).catch(() => {});
       }
     },

zh-baseversion-web/src/views/thirdbuild/project/components/DetailInfo.vue

@@ -245,19 +245,19 @@
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="上传状态" >
+          <el-form-item label="上报状态" >
             <span>{{fUploadType}}</span> 
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-            <el-form-item label="上传时间" >
+            <el-form-item label="上报时间" >
               <span>{{fUploadTime}}</span> 
             </el-form-item>
         </el-col>
         
         <el-col :span="12"> 
-          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上传时间" >
+          <el-form-item  v-if="this.$store.state.user.roleId == 3" label="企业端上报时间" >
             <span>{{ detailInfo.entUploadTime }}</span>
           </el-form-item>
         </el-col>
@@ -302,10 +302,10 @@
         }
 
         if (this.fUploadType == '0') {
-          this.fUploadType = "未上传"
+          this.fUploadType = "未上报"
         }
         if (this.fUploadType == '1') {
-          this.fUploadType = "已上传"
+          this.fUploadType = "已上报"
         }
       },
       showUploadTime() {

zh-baseversion-web/src/views/thirdbuild/project/index.vue

@@ -32,10 +32,10 @@
         </el-select>
       </el-form-item>
       
-      <el-form-item label="上传状态" prop="fUploadType">
-        <el-select v-model="queryParams.fUploadType" placeholder="请选择上传状态" clearable size="small">
-          <el-option label="未上传" value="0" />
-          <el-option label="已上传" value="1" />
+      <el-form-item label="上报状态" prop="fUploadType">
+        <el-select v-model="queryParams.fUploadType" placeholder="请选择上报状态" clearable size="small">
+          <el-option label="未上报" value="0" />
+          <el-option label="已上报" value="1" />
         </el-select>
       </el-form-item>
 
@@ -106,8 +106,8 @@
         </template>
       </el-table-column>
       <el-table-column label="管道压力等级分类" align="center" prop="fPipePress" :formatter="fPipePressFormat" />
-      <el-table-column label="上传状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
-      <el-table-column label="上传时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
+      <el-table-column label="上报状态" align="center" prop="uploadState" :formatter="uploadStateFormat" />
+      <el-table-column label="上报时间" align="center" prop="uploadTime" :formatter="uploadTimeFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="210">
         <template slot-scope="scope">
           <el-button
@@ -135,7 +135,7 @@
             type="text"
             @click="handleReport(scope.row)"
             v-if="judgeUploadIsShow((scope.row))"
-          >上传</el-button>
+          >上报</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -637,25 +637,25 @@ export default {
     fPipePressFormat(row, column) {
       return this.selectDictLabel(this.fPipePressOptions, row.fPipePress);
     },
-    //上传状态动态展示
+    //上报状态动态展示
     uploadStateFormat(row, column) { 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
       if (roleId == 5) {
         if (row.entUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } else { 
         if (row.govUploadState == '0') {
-          return "未上传"
+          return "未上报"
         } else{
-          return "已上传"
+          return "已上报"
         } 
       } 
     },
-    //上传时间动态展示
+    //上报时间动态展示
     uploadTimeFormat(row, column) {
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
@@ -750,24 +750,24 @@ export default {
         this.title = "修改涉气第三方施工项目档案";
       });
     },
-    //判断 上传是否需要显示，上传分为企业上传 和 政府端上传
+    //判断 上报是否需要显示，上报分为企业上报 和 政府端上报
     judgeUploadIsShow(row) { 
 
       //角色 1 超级管理员  5 企业
       let roleId = this.user.roleId;
 
-      // 企业端 上传状态 0-未上传，1-已上传
+      // 企业端 上报状态 0-未上报，1-已上报
       let entUploadState = row.entUploadState;
 
-      // 政府端 上传状态 0-未上传，1-已上传
+      // 政府端 上报状态 0-未上报，1-已上报
       let govUploadState = row.govUploadState;
 
-      // 如果政府端都已经上传，那就不能显示了。
+      // 如果政府端都已经上报，那就不能显示了。
       if(govUploadState === '1') {
         return false;
       }
 
-      // 如果企业端上传了，则企业端就不能显示了，政府端和 超级管理员能显示
+      // 如果企业端上报了，则企业端就不能显示了，政府端和 超级管理员能显示
       if(entUploadState === '1' && govUploadState === '0') {
         if (roleId === 5) {
           return false;
@@ -872,12 +872,12 @@ export default {
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.fConGasProInforId);
     },
-    /** 上传按钮操作 */
+    /** 上报按钮操作 */
     handleReport(row) {
 
-      // 如果是 超级管理员 或这企业，并且 企业端上传状态为0
+      // 如果是 超级管理员 或这企业，并且 企业端上报状态为0
       if ((this.user.roleId == 5 || this.user.roleId == 1) && row.entUploadState == '0') {
-        this.$confirm('是否确认上传涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -885,13 +885,13 @@ export default {
             return entReportConGasProInfo({fConGasProInforId : row.fConGasProInforId});
         }).then(() => {
           this.getList();
-          this.msgSuccess("上传成功");
+          this.msgSuccess("上报成功");
         }).catch(() => {});
       } 
     
-      // 如果是 超级管理员 或这政府，并且 政府端上传状态为0
+      // 如果是 超级管理员 或这政府，并且 政府端上报状态为0
       if ((this.user.roleId == 3 || this.user.roleId == 1) && row.govUploadState == '0') {
-        this.$confirm('是否确认上传涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
+        this.$confirm('是否确认上报涉气第三方施工项目档案名称为"' + row.fProjectName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -899,7 +899,7 @@ export default {
           return reportConGasProInfo({fConGasProInforId : row.fConGasProInforId});
         }).then(() => {
           this.getList();
-          this.msgSuccess("上传成功");
+          this.msgSuccess("上报成功");
         }).catch(() => {});
       }
     },