Merge branch 'dev_ren' into 'dev'

1.11 paixu

See merge request !47

src/views/archiveDataManagement/satelliteManagement/index.vue

@@ -20,6 +20,8 @@
       </el-table-column>
       <el-table-column prop="price" label="价格" align="center">
       </el-table-column>
+      <el-table-column prop="dailySort" label="排序" align="center">
+      </el-table-column>
       <el-table-column label="状态" align="center">
         <template slot-scope="{ row }">
           <span v-if="row.status == 0">不可用</span>
@@ -64,6 +66,7 @@
       :visible.sync="showAddOrUpd"
       width="30%"
       @close="showAddOrUpd = false"
+      @closed="checkList"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="卫星名称" prop="satelliteName">
@@ -90,6 +93,14 @@
         <el-form-item label="传感器名称" prop="sensorName">
           <el-input v-model="form.sensorName" style="width: 80%"></el-input>
         </el-form-item>
+        <el-form-item label="排序" prop="dailySort">
+          <el-input-number
+            :min="0"
+            :step="1"
+            :precision="0"
+            v-model="form.dailySort"
+          ></el-input-number>
+        </el-form-item>
         <el-form-item label="价格" prop="price">
           <el-input-number
             :min="0"
@@ -129,6 +140,7 @@ export default {
         imageResolution: undefined,
         imageSensorType: undefined,
         sensorName: undefined,
+        dailySort: 0,
         price: 0,
         status: 0,
       },
@@ -148,6 +160,7 @@ export default {
         sensorName: [
           { required: true, message: "请输入传感器名称", trigger: "blur" },
         ],
+        dailySort: [{ required: true, message: "请输入排序", trigger: "blur" }],
         price: [{ required: true, message: "请输入价格", trigger: "blur" }],
       },
       showAddOrUpd: false,
@@ -158,6 +171,9 @@ export default {
     this.getList();
   },
   methods: {
+    checkList() {
+      this.getList();
+    },
     getList() {
       getSatelliteData(this.listQuery).then((res) => {
         if (res.status == 200) {
@@ -175,6 +191,7 @@ export default {
         imageResolution: undefined,
         imageSensorType: undefined,
         sensorName: undefined,
+        dailySort: 0,
         price: 0,
         status: 0,
       };