8-14

src/views/model/devicemodel/editModel.vue

@@ -1,6 +1,5 @@
 <template>
-  <div class="app-container" 
+  <div class="app-container" v-loading="loading">
-    v-loading="loading">
     <!-- 添加或修改设备模型信息对话框 -->
     <div class="marginbottom50px">
       <el-steps :active="currentStep">
@@ -24,16 +23,9 @@
                 <el-input-number v-model="form.sort" :min="1" :max="100" placeholder="请输入排序" />
               </el-form-item>
               <el-form-item label="上级" prop="pid">
-              <el-tree-select
+                <el-tree-select v-model="form.pid" :data="devicemodelOptions"
-                  v-model="form.pid"
+                  :props="{ value: 'id', label: 'modelName', children: 'children' }" value-key="id" placeholder="请选择上级"
-                  :data="devicemodelOptions"
+                  check-strictly :default-expand-all="true" :default-checked-keys="defaultCheckedKeys" />
-                  :props="{ value: 'id', label: 'modelName', children: 'children' }"
-                  value-key="id"
-                  placeholder="请选择上级"
-                  check-strictly
-                  :default-expand-all="true" 
-                  :default-checked-keys="defaultCheckedKeys"
-              />
               </el-form-item>
               <el-form-item label="模型类别" key="selectmodelType" prop="modelTypeId">
                 <el-select v-model="form.modelTypeId" placeholder="请选择模型类别" clearable @change="modalTypeControllButton">
@@ -42,11 +34,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="是否可用" prop="vailable">
-                <el-switch
+                <el-switch v-model="form.dc_available" class="ml-2i" style="--el-switch-on-color: #13ce66" />
-                  v-model="form.dc_available"
-                  class="ml-2i"
-                  style="--el-switch-on-color: #13ce66"
-                />
               </el-form-item>
               <el-form-item label="备注" prop="note">
                 <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
@@ -54,9 +42,12 @@
             </div>
             <div class="width50percent textalignright">
               <el-form-item class="inlineblock marginright6percent divsonmarginleft0">
-                <el-button type="primary" v-if="prevStepButtonShow" @click="prevStep" style="display: inline-block !important" >上一步</el-button>
+                <el-button type="primary" v-if="prevStepButtonShow" @click="prevStep"
-                <el-button type="primary" v-if="submitButtonShow" @click="submitForm" style="display: inline-block !important">提交</el-button>
+                  style="display: inline-block !important">上一步</el-button>
-                <el-button type="primary" v-if="nextStepButtonShow" @click="nextStep" style="display: inline-block !important">下一步</el-button>
+                <el-button type="primary" v-if="submitButtonShow" @click="submitForm"
+                  style="display: inline-block !important">提交</el-button>
+                <el-button type="primary" v-if="nextStepButtonShow" @click="nextStep"
+                  style="display: inline-block !important">下一步</el-button>
                 <el-button @click="cancel" style="display: inline-block !important">取 消</el-button>
               </el-form-item>
             </div>
@@ -64,7 +55,8 @@
           <el-carousel-item :key="2" name="2" class="textaligncenter overflowscroll height300">
             <div class="width75percentinlineblock">
               <div class="textalignright marginbottom5">
-                  <el-button type="primary" style="display: inline-block !important" @click="addParamModel">添加参数模版</el-button>
+                <el-button type="primary" style="display: inline-block !important"
+                  @click="addParamModel">添加参数模版</el-button>
               </div>
               <el-table :data="selectedModelList" style="width: 100%" max-height="250" @cell-dblclick="startEditing">
                 <el-table-column fixed label="序号" width="80" align="center">
@@ -84,12 +76,8 @@
                 </el-table-column>
                 <el-table-column label="是否可控" align="center" prop="controllab">
                   <template #default="scope">
-                      <el-switch
+                    <el-switch v-model="scope.row.controllab" @change="selectRadio(scope.row)" class="ml-2i"
-                        v-model="scope.row.controllab"
+                      style="--el-switch-on-color: #13ce66" />
-                        @change="selectRadio(scope.row)"
-                        class="ml-2i"
-                        style="--el-switch-on-color: #13ce66"
-                      />
                   </template>
                 </el-table-column>
                 <el-table-column label="类别" align="center" prop="classType">
@@ -105,16 +93,20 @@
                 <el-table-column label="备注" align="center" prop="note" />
                 <el-table-column label="操作" align="center" width="200px">
                   <template #default="scope">
-                      <el-button style="display:inline-block !important" type="primary"  @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button style="display:inline-block !important" type="primary"
+                      @click="handleDelete(scope.row)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </div>
             <div class="fixedbottomright width50percent textalignright">
               <el-form-item class="inlineblock marginright6percent divsonmarginleft0">
-                  <el-button type="primary" v-if="prevStepButtonShow" @click="prevStep" style="display: inline-block !important">上一步</el-button>
+                <el-button type="primary" v-if="prevStepButtonShow" @click="prevStep"
-                  <el-button type="primary" v-if="submitButtonShow" @click="submitForm" style="display: inline-block !important">提交</el-button>
+                  style="display: inline-block !important">上一步</el-button>
-                  <el-button type="primary" v-if="nextStepButtonShow" @click="nextStep" style="display: inline-block !important">下一步</el-button>
+                <el-button type="primary" v-if="submitButtonShow" @click="submitForm"
+                  style="display: inline-block !important">提交</el-button>
+                <el-button type="primary" v-if="nextStepButtonShow" @click="nextStep"
+                  style="display: inline-block !important">下一步</el-button>
                 <el-button @click="cancel" style="display: inline-block !important">取 消</el-button>
               </el-form-item>
             </div>
@@ -122,7 +114,8 @@
         </el-carousel>
 
       </el-form>
-      <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type">
+      <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body
+        :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type">
         <el-table ref="dialogTable" :data="paramModelList" key="newTable" style="width: 100%" max-height="600">
           <el-table-column type="selection" width="55" :selectable="ifselectable" />
           <el-table-column label="参数名称" align="center" prop="paramClassName" />
@@ -148,19 +141,21 @@
 </template>
 <style lang="scss">
 @import "@/assets/styles/self-defined.scss";
+
 .customCarousel {
   div {
     button {
       display: none !important;
     }
   }
+
   ul {
     display: none !important;
   }
 }
 </style>
 <script setup name="editdevicemodel">
-import { listDevicemodel,addDevicemodel, updateDevicemodel } from "@/api/model/devicemodel";
+import { listDevicemodel, addDevicemodel, updateDevicemodel, getDevicemodel} from "@/api/model/devicemodel";
 import { listParamclass } from "@/api/model/paramclass";
 import { listModelType } from "@/api/model/modelType";
 import { required } from "@vee-validate/rules";
@@ -332,6 +327,7 @@ function submitForm() {
     }
   });
 }
+
 /** 查询设备模型类型列表 */
 function getModelTypeList() {
   loading.value = true;
@@ -341,6 +337,7 @@ function submitForm() {
     loading.value = false;
   });
 }
+
 function getTreeselect() {
   listDevicemodel().then(response => {
     devicemodelOptions.value = [];
@@ -352,6 +349,7 @@ function submitForm() {
     devicemodelOptions.value.push(data);
   });
 }
+
 onMounted(() => {
 
   console.log("-------------" + modelId);

src/views/model/devicemodel/index.vue

@@ -254,10 +254,6 @@ function getTreeselect() {
     devicemodelOptions.value.push(data);
   });
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> 4581b8b996797432f97cb021b35b194e99980dd9
 // 取消按钮
 function cancel() {
   open.value = false;