6654

src/views/sound/function/collect/index.vue

@@ -95,10 +95,10 @@
           // 上传到服务器
 
           Promise.all(tasks).then(() => {
-            this.$refs.noise.reload();
-            this.$refs.place.reload();
-          }).catch(() => {
-            this.$message.error("表格格式有误，请检查后重新上传！");
+            this.$refs.noise&&this.$refs.noise.reload();
+            this.$refs.noise&&this.$refs.place.reload();
+          }).catch(err=>{
+            console.log(err);
           })
           // console.log(billData);
         };

src/views/sound/function/collect/noise-bill.vue

@@ -72,10 +72,14 @@
           <a-space>
             <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
             <span v-hasPermi="['ecology:sound:verify']">
-              <a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-                @confirm="verify(record)">
+              <a-popconfirm  v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
+                @confirm="verify(record,1)">
                 <a-button type="primary" shape="round" size="small">审核</a-button>
               </a-popconfirm>
+              <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No"
+                @confirm="verify(record,0)">
+                <a-button type="dashed" shape="round" size="small">撤回</a-button>
+              </a-popconfirm>
             </span>
             <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
               <a-button type="primary" danger shape="round" size="small">删除</a-button>
@@ -230,13 +234,14 @@
         this.editableData[record.functionNoiseBillId].reportTime = moment(this.editableData[record.functionNoiseBillId]
           .reportTime)
       },
-      verify(record) {
+      verify(record,checked) {
         const hide = this.$message.loading('请求中..', 0);
         verifyFunctionNoiseBill({
-          functionNoiseBillId: record.functionNoiseBillId
+          functionNoiseBillId: record.functionNoiseBillId,
+          checked
         }).then(res => {
           if (res.data.code == 0) {
-            record.checked = 1
+            record.checked = checked
             this.$message.success(res.data.msg);
           } else {
             this.$message.error(res.data.msg);

src/views/sound/function/collect/place-bill.vue

@@ -73,9 +73,12 @@
           <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
           <span v-hasPermi="['ecology:sound:verify']">
             <a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-              @confirm="verify(record)">
+              @confirm="verify(record,1)">
               <a-button type="primary" shape="round" size="small">审核</a-button>
             </a-popconfirm>
+            <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No" @confirm="verify(record,0)">
+              <a-button type="dashed" shape="round" size="small">撤回</a-button>
+            </a-popconfirm>
           </span>
           <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
             <a-button type="primary" danger shape="round" size="small">删除</a-button>
@@ -228,13 +231,14 @@
         this.editableData[record.functionPlaceBillId].reportTime = moment(this.editableData[record.functionPlaceBillId]
           .reportTime)
       },
-      verify(record) {
+      verify(record, checked) {
         const hide = this.$message.loading('请求中..', 0);
         verifyFunctionPlaceBill({
-          functionPlaceBillId: record.functionPlaceBillId
+          functionPlaceBillId: record.functionPlaceBillId,
+          checked
         }).then(res => {
           if (res.data.code == 0) {
-            record.checked = 1
+            record.checked = checked
             this.$message.success(res.data.msg);
           } else {
             this.$message.error(res.data.msg);

src/views/sound/function/collect/place.vue

@@ -178,6 +178,7 @@
             dataIndex: 'place',
             sorter: true
           },
+         
           {
             title: '测点经度',
             dataIndex: 'placeLng',
@@ -188,19 +189,9 @@
             dataIndex: 'placeLat',
             sorter: true
           },
-           {
-            title: '机动车车道数',
-            dataIndex: 'motorway',
-            sorter: true
-          },
-          {
-            title: '车道类别',
-            dataIndex: 'motorwayType',
-            sorter: true
-          },
-           {
-            title: '道路等级',
-            dataIndex: 'motorwayLevel',
+             {
+            title: '测点高度',
+            dataIndex: 'placeHeight',
             sorter: true
           },
           {
@@ -208,14 +199,9 @@
             dataIndex: 'refObj',
             sorter: true
           },
-           {
-            title: '道路覆盖人口（万人）',
-            dataIndex: 'people',
-            sorter: true
-          },
-           {
-            title: '监测站名',
-            dataIndex: 'station',
+          {
+            title: '功能区代码',
+            dataIndex: 'functionCode',
             sorter: true
           },
            {