系统修改

src/views/system/device/index.vue

@@ -298,6 +298,10 @@
                 :value="item.modelId"
               ></el-option>
             </el-select>
+            <el-select v-model="form.modelId" filterable placeholder="请选择" :multiple="true">
+              <el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -438,6 +442,7 @@ import { parseTime } from '../../../utils/ruoyi';
   // import {  listDept2 } from '@/api/system/dept'
   import { getHardwareVersion, listHardwareVersion } from '@/api/system/hardwareVersion'
 import Treeselect from '@riophae/vue-treeselect'
+import { listModel, getModel, delModel, addModel, updateModel } from "@/api/rl/model";
 // import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
@@ -491,6 +496,7 @@ export default {
       hardwareVersionOptions: [],
       // 运营区下拉框
       areaOptions: [],
+      modelList:[],
       // 通过key重新渲染area-map组件
       // key: 0,
       // 查询参数
@@ -546,6 +552,7 @@ export default {
     window.removeEventListener('scroll', this.handleScroll, true)
   },
   created() {
+    this.getlistModel()
     listHardwareVersion(this.queryParams).then(response => {
       this.hardwareVersionOptions = response.rows;
       this.loading2 = false;
@@ -582,6 +589,23 @@ export default {
     // this.$eventBus.$off('close-all-dialogs', this.closeDialog);
   },
   methods: {
+    getlistModel() {
+      let data = {
+        pageNum: 1,
+        pageSize: 20,
+       
+      }
+      listModel(this.addDateRange(data)).then(response => {
+        console.log(response,'responseresponseresponse');
+        // this.modelList = response.rows
+        this.modelList = response.rows.map(item => ({
+							value: item.modelId,
+							label: item.model
+						}));
+          console.log( this.options,' this.options this.options');
+      });
+     
+    },
     handleScroll() {
       let scrollTop = window.scrollY;
       let heightTop = this.$refs['tableSort'].$parent.$parent.$el.offsetTop; // 距离顶部高度

src/views/system/model/index.vue

@@ -121,10 +121,10 @@
           <el-input v-model="form.model" placeholder="请输入车型" />
         </el-form-item>
         <el-form-item label="满电电压" prop="fullVoltage">
-          <el-input v-model="form.fullVoltage" placeholder="请输入满电电压" />
+          <el-input v-model="form.fullVoltage" placeholder="请输入满电电压(v)" />
         </el-form-item>
         <el-form-item label="亏电电压" prop="lowVoltage">
-          <el-input v-model="form.lowVoltage" placeholder="请输入亏电电压" />
+          <el-input v-model="form.lowVoltage" placeholder="请输入亏电电压(v)" />
         </el-form-item>
         <el-form-item label="满电续航" prop="fullEndurance">
           <el-input v-model="form.fullEndurance" placeholder="请输入满电续航" />

src/views/system/rule/index.vue

@@ -136,11 +136,19 @@
         <el-form-item label="骑行价格说明" prop="instructions">
           <el-input v-model="form.instructions" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="超出数量" prop="outNum">
+        <!-- <el-form-item label="超出数量" prop="outNum">
           <el-input v-model="form.outNum" placeholder="请输入超出数量" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="超出单位" prop="outUnit">
-          <el-input v-model="form.outUnit" placeholder="请输入超出单位" />
+          <!-- <el-input v-model="form.outUnit" placeholder="请输入超出单位" /> -->
+          <el-select v-model="form.outUnit" placeholder="请选择超出租赁单位">
+            <el-option
+              v-for="dict in dict.type.rl_rental_unit"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="超出价格" prop="outPrice">
           <el-input v-model="form.outPrice" placeholder="请输入超出价格" />