联锁管理（动态表格表单版本）

src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

@@ -8,6 +8,7 @@
     :columns="columns"
     style="margin-top: 8px;"
     @valueChange="handleValueChange"
+    class="interlock-condition-tableForm"
     >
     <!-- row-number  -->
     <!-- row-selection -->
@@ -56,19 +57,25 @@
           @change="onChange"/>
       </div>
       <div v-if="props.row.instrumentStatusJuge === 2">
-        <a-cascader
-        v-model="props.row.ysmnlTag"
-        :options="dianweiOptions"
-        :display-render="displayRender"
-        expand-trigger="hover"
-        placeholder="请选择原始模拟量位号"
-        @change="onChange"/>
-        <div>
-          高限<a-input v-model="props.row.upperLimit" placeholder="请输入高限"></a-input>
-        </div>
-        <div>
-          低限<a-input v-model="props.row.lowerLimit" placeholder="请输入低限"></a-input>
-        </div>
+        <a-row>
+          <a-col :span="24">
+            原始模拟量位号：<a-cascader
+              v-model="props.row.ysmnlTag"
+              :options="dianweiOptions"
+              :display-render="displayRender"
+              expand-trigger="hover"
+              style="width: 200px"
+              placeholder="请选择原始模拟量位号"
+              @change="onChange"
+            />
+          </a-col>
+          <a-col :span="12">
+            高限值：<a-input v-model="props.row.upperLimit" placeholder="请输入高限" style="width: 100px;"></a-input>
+          </a-col>
+          <a-col :span="12">
+            低限值：<a-input v-model="props.row.lowerLimit" placeholder="请输入低限" style="width: 100px;"></a-input>
+          </a-col>
+        </a-row>
       </div>
       <div v-if="props.row.instrumentStatusJuge === 3">
         <a-cascader
@@ -79,7 +86,7 @@
         placeholder="请选择原始模拟量位号"
         @change="onChange"/>
         <div>
-          时间<a-input v-model="props.row.thresholdTime" placeholder="请输入时间"></a-input>
+          时间<a-input v-model="props.row.thresholdTime" placeholder="请输入时间" style="width: 20%;"></a-input>
         </div>
         <div>
           阈值<a-input v-model="props.row.thresholdValue" placeholder="请输入阈值"></a-input>
@@ -132,44 +139,44 @@
 <script>
   var dianweiOptions = [
     {
-      key: 'zhejiang',
-      value: 'zhejiang',
-      title: 'Zhejiang',
-      label: 'Zhejiang',
+      key: '设备1',
+      value: '设备1',
+      title: '设备1',
+      label: '设备1',
       children: [
         {
-          key: 'hangzhou',
-          value: 'hangzhou',
-          title: 'Hangzhou',
-          label: 'Hangzhou',
+          key: '模块1',
+          value: '模块1',
+          title: '模块1',
+          label: '模块1',
           children: [
             {
-              key: 'xihu',
-              value: 'xihu',
-              title: 'West Lake',
-              label: 'West Lake',
+              key: '点位1',
+              value: '点位1',
+              title: '点位1',
+              label: '点位1',
             },
           ],
         },
       ],
     },
     {
-      key: 'jiangsu',
-      value: 'jiangsu',
-      title: 'Jiangsu',
-      label: 'Jiangsu',
+      key: '设备2',
+      value: '设备2',
+      title: '设备2',
+      label: '设备2',
       children: [
         {
-          key: 'nanjing',
-          value: 'nanjing',
-          title: 'Nanjing',
-          label: 'Nanjing',
+          key: '模块2',
+          value: '模块2',
+          title: '模块2',
+          label: '模块2',
           children: [
             {
-              key: 'zhonghuamen',
-              value: 'zhonghuamen',
-              title: 'Zhong Hua Men',
-              label: 'Zhong Hua Men',
+              key: '点位2',
+              value: '点位2',
+              title: '点位2',
+              label: '点位2',
             },
           ],
         },
@@ -533,6 +540,13 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="less">
+.interlock-condition-tableForm{
+  .vxe-table.vxe-editable .vxe-body--column, .vxe-table.vxe-editable .vxe-body--column.col--actived{
+    padding: 10px 0 !important;
+  }
+}
+.mt4{
+  margin-top: 4px;
+}
 </style>

src/views/module_interLock/InterlockSummary/modules/InterlockSummaryForm.vue

@@ -75,10 +75,11 @@
                 v-model="model.interlockOutValueTag"
                 :options="dianweiOptions"
                 :display-render="displayRender"
+                :fieldNames="customFieldNames"
                 expand-trigger="hover"
                 placeholder="请选择点位"
+                @change="dianwerChange"
                 />
-                <!-- @change="onChange" -->
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -94,46 +95,80 @@
 </template>
 
 <script>
+  // var dianweiOptions = [
+  //   {
+  //     key: 'zhejiang',
+  //     value: 'zhejiang',
+  //     title: 'Zhejiang',
+  //     label: 'Zhejiang',
+  //     children: [
+  //       {
+  //         key: 'hangzhou',
+  //         value: 'hangzhou',
+  //         title: 'Hangzhou',
+  //         label: 'Hangzhou',
+  //         children: [
+  //           {
+  //             key: 'xihu',
+  //             value: 'xihu',
+  //             title: 'West Lake',
+  //             label: 'West Lake',
+  //           },
+  //         ],
+  //       },
+  //     ],
+  //   },
+  //   {
+  //     key: 'jiangsu',
+  //     value: 'jiangsu',
+  //     title: 'Jiangsu',
+  //     label: 'Jiangsu',
+  //     children: [
+  //       {
+  //         key: 'nanjing',
+  //         value: 'nanjing',
+  //         title: 'Nanjing',
+  //         label: 'Nanjing',
+  //         children: [
+  //           {
+  //             key: 'zhonghuamen',
+  //             value: 'zhonghuamen',
+  //             title: 'Zhong Hua Men',
+  //             label: 'Zhong Hua Men',
+  //           },
+  //         ],
+  //       },
+  //     ],
+  //   },
+  // ]
   var dianweiOptions = [
     {
-      key: 'zhejiang',
-      value: 'zhejiang',
-      title: 'Zhejiang',
-      label: 'Zhejiang',
+      info: 'zhejiang1',
+      name: 'Zhejiang1',
       children: [
         {
-          key: 'hangzhou',
-          value: 'hangzhou',
-          title: 'Hangzhou',
-          label: 'Hangzhou',
+          info: 'hangzhou',
+          name: 'Hangzhou',
           children: [
             {
-              key: 'xihu',
-              value: 'xihu',
-              title: 'West Lake',
-              label: 'West Lake',
+              info: 'dianwei&65',
+              name: 'West Lake',
             },
           ],
         },
       ],
     },
     {
-      key: 'jiangsu',
-      value: 'jiangsu',
-      title: 'Jiangsu',
-      label: 'Jiangsu',
+      info: 'jiangsu',
+      name: 'Jiangsu',
       children: [
         {
-          key: 'nanjing',
-          value: 'nanjing',
-          title: 'Nanjing',
-          label: 'Nanjing',
+          info: 'nanjing',
+          name: 'Nanjing',
           children: [
             {
-              key: 'zhonghuamen',
-              value: 'zhonghuamen',
-              title: 'Zhong Hua Men',
-              label: 'Zhong Hua Men',
+              info: 'dianwei&65',
+              name: 'Zhong Hua Men',
             },
           ],
         },
@@ -178,6 +213,11 @@
           edit: "/summary/interlockSummary/edit",
           queryById: "/summary/interlockSummary/queryById"
         },
+        customFieldNames: {
+          label: 'name',
+          value: 'info',
+          children: 'children'
+        },
         dianweiOptions: dianweiOptions,
         apparatusData: [],
         systemData: [],
@@ -228,12 +268,17 @@
         this.getData(e, 'interLockData')
       },
       interLockSearch(searchText){
-        this.interLockData = !searchText ? [] : [searchText, searchText.repeat(2), searchText.repeat(3)]
+        console.log(searchText)
+        // this.interLockData = !searchText ? [] : [searchText, searchText.repeat(2), searchText.repeat(3)]
       },
       displayRender({ labels }) {
         return labels[labels.length - 1];
       },
-      add () {
+      // 点位选择改变
+      dianwerChange(e){
+        console.log(e)
+      },
+      add () {  
         this.edit(this.modelDefault);
       },
       edit (record) {

src/views/module_interLock/InterlockSummary/modules/InterlockSummaryModal.vue

@@ -3,6 +3,7 @@
     :title="title"
     :width="width"
     :visible="visible"
+    fullscreen
     switchFullscreen
     @ok="handleOk"
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"