# Conflicts:

#	src/views/unitorg/microStation/index.vue

src/api/backend/microStation.js

@@ -13,7 +13,7 @@ export function createMicroStation(data) {
 export function updateMicroStation(data) {
   return request({
     url: '/backend/micro-station/update',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
@@ -22,7 +22,7 @@ export function updateMicroStation(data) {
 export function deleteMicroStation(id) {
   return request({
     url: '/backend/micro-station/delete?id=' + id,
-    method: 'delete'
+    method: 'post'
   })
 }
 

src/views/unitorg/microStation/index.vue

@@ -11,13 +11,7 @@
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="建站日期" prop="builtOn">
-          <el-date-picker clearable 
-            v-model="queryParams.builtOn" 
-            type="daterange" 
-            range-separator="至" 
-            value-format="yyyy-MM-dd HH:mm:ss" 
-            start-placeholder="开始日期"  
-            end-placeholder="结束日期"
+          <el-date-picker clearable v-model="queryParams.builtOn" type="date" value-format="yyyy-MM-dd"
             placeholder="建站日期" />
           <!-- <el-input v-model="queryParams.builtOn" placeholder="请输入建站日期" clearable @keyup.enter.native="handleQuery" /> -->
         </el-form-item>
@@ -65,7 +59,8 @@
       <el-table-column label="详细地址" align="center" prop="addr" />
       <el-table-column label="建站日期" align="center" prop="builtOn" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.builtOn) }}</span>
+          <!-- <span>{{ parseTime(scope.row.builtOn) }}</span> -->
+          <span>{{ scope.row.builtOn }}</span>
         </template>
       </el-table-column>
       <el-table-column label="负责人（站长）" align="center" prop="charger" width="120" />
@@ -363,7 +358,11 @@ export default {
     getList() {
       this.loading = true
       // 执行查询
+      // if(this.queryParams.builtOn){
+      //   this.$set(this.queryParams,'builtOn',toString(this.queryParams.builtOn))
+      // }
       this.queryParams.orgId = this.orgId
+      // console.log('params',this.queryParams);
       getMicroStationPage(this.queryParams).then(response => {
         this.list = response.data.list
         this.total = response.data.total
@@ -578,6 +577,7 @@ export default {
 
 
     },
+
     nameBlur() {
       if (this.insideForm.name === '') {
         this.nameRule = true