VUE_APP_BASE_API

package.json

@@ -50,6 +50,7 @@
     "vue-ele-form-dynamic": "^0.4.3",
     "vue-ele-form-gallery": "^0.1.1",
     "vue-ele-form-image-uploader": "^0.1.9",
+    "vue-ele-form-table-editor": "^0.1.6",
     "vue-ele-form-upload-file": "^0.0.7",
     "vue-highlightjs": "^1.3.3",
     "vue-router": "3.0.2",

src/views/device/flange/formModel.vue

@@ -6,9 +6,7 @@
     :title="title"
     :request-fn="handleFormSubmit"
     :visible.sync="DialogVisible"
-    width="450px"
     custom-class="abow_dialog"
-    label-width="100px"
     label-position="left"
     :dialogAttrs="{ 'close-on-click-modal': false,'top':'8vh'}"
   />
@@ -47,6 +45,8 @@ export default {
       formConfig: {
         formDesc: {
            is_used: {
+            break:true,
+            layout:12,
             type: "select",
             label: "使用状态",
             isOptions: true,
@@ -67,6 +67,7 @@ export default {
           },
           
            department_id: {
+            layout:12,
             type: "cascader",
             label: "所属部门",
             isOptions: true,
@@ -84,6 +85,7 @@ export default {
           },
           //风场id
           fan_id:{
+             layout:12,
               type: "cascader",
               label: "风机编号",
               isOptions: true,
@@ -103,26 +105,31 @@ export default {
 
           },
           number: {
+            layout:12,
             type: "input",
             label: "编号",
            
           },
            name: {
+            layout:12,
             type: "input",
             label: "名称",
             required:true
           },
           model: {
+            layout:12,
             type: "select",
             label: "型号",
             required:true,
             options:[]
           },
            outside:{
+            layout:12,
             type: "input",
             label: "外径"
           },
            torque:{
+             layout:12,
              type: "number",
              label: "扭矩",
              required:true,
@@ -135,6 +142,7 @@ export default {
             ]
           },
           wrench:{
+             layout:12,
              type: "select",
               label: "液压扳手",
               isOptions: true,
@@ -155,6 +163,7 @@ export default {
 
           },
           fastening_scheme:{
+             layout:12,
              type: "select",
               label: "紧固方案",
               isOptions: true,
@@ -175,6 +184,7 @@ export default {
 
           },
           stress:{
+             layout:12,
              type: "number",
              label: "压力",
               rules: [
@@ -186,6 +196,7 @@ export default {
             ]
           },
           bolt_size: {
+             layout:12,
              type: "number",
              label: "螺栓尺寸",
              rules: [
@@ -197,6 +208,7 @@ export default {
             ]
           },
            bolt_number: {
+            layout:12,
              type: "number",
              label: "螺栓数量",
              rules: [
@@ -208,19 +220,23 @@ export default {
             ]
           },
           install_position:{
+             layout:12,
             type: "input",
             label: "安装位置",
             vif:true
           },
            brand: {
+             layout:12,
             type: "input",
             label: "品牌"
           },
            supplier: {
+            layout:12,
             type: "input",
             label: "供应商"
           },
             out_date: {
+            layout:12,
             type: "date",
             label: "出厂日期"
           },
@@ -229,7 +245,7 @@ export default {
             label: "备注"
           }
         },
-        order: ["is_used","model","department_id","fan_id","number", "name","outside","torque","wrench","fastening_scheme","stress","bolt_size","bolt_number","install_position","brand","supplier","out_date","remark"]
+        order: ["is_used","model","department_id","fan_id","number", "name","outside","wrench","torque","fastening_scheme","stress","bolt_size","bolt_number","install_position","brand","supplier","out_date","remark"]
       }
     };
   },

src/views/device/synscheme/formModel.vue

@@ -6,7 +6,6 @@
     :title="title"
     :request-fn="handleFormSubmit"
     :visible.sync="DialogVisible"
-    width="450px"
     custom-class="abow_dialog"
     label-width="100px"
     label-position="left"
@@ -15,6 +14,17 @@
 </template>
 
 <script>
+import Vue from 'vue';
+import EleForm from 'vue-ele-form';
+import EleFormTableEditor from 'vue-ele-form-table-editor';
+Vue.component('table-editor', EleFormTableEditor);
+Vue.use(EleForm, {
+  // 专门设置全局的 table-editor 属性
+  // 属性参考: https://github.com/dream2023/ele-table-editor 或者 下面的属性说明
+  'table-editor': {
+    isShowDelete: false // 所有的 table-editor 都会有 isShowDelete = false 的属性值, 即不显示删除按钮
+  }
+})
 export default {
   props: ["formModelVisible", "title"],
   data() {
@@ -41,10 +51,84 @@ export default {
           },
           step: {
             type: "input",
-            label: "步骤"
+            label: "总步骤"
+          },
+          data:{
+            label: '流程',
+            type: 'table-editor',
+            attrs: {
+              // 校检规则
+              rules: {
+                step: { required: true, message: '步骤必填' },
+                number: { required: true, message: '螺栓编号必填' },
+                preload:{require:true,message:'标准拧紧力必填'}
+              },
+              // 其它按钮
+              // extraBtns: [
+              //   {
+              //     // text 按钮显示的文本
+              //     text: '保存',
+              //     // 按钮的属性
+              //     attrs: {
+              //       type: 'text'
+              //     },
+              //     // click事件
+              //     click(scope) {
+              //       /* eslint-disable */
+              //       console.log(scope)
+              //     }
+              //   }
+              // ],
+              // 表格列
+              columns: [
+                {
+                  // el-table-column 的属性
+                  prop: 'step',
+                  label: '步骤',
+                  content: {
+                    // type 可以为全局注册的组件名或者组件引用
+                    type: 'el-input',
+                    // attrs 是组件的属性
+                    attrs: {
+                      placeholder: '步骤'
+                    }
+                  }
+                },
+                {
+                  prop: 'number',
+                  label: '螺栓编号',
+                  // 当有 content 属性时, 可以指定相应的组件
+                  content: {
+                    // type 可以为全局注册的组件名或者组件引用
+                    type: 'el-input',
+                    // attrs 是组件的属性
+                    attrs: {
+                      placeholder: '螺栓编号'
+                    }
+                  }
+                },
+                {
+                  prop: 'preload',
+                  label: '标准拧紧力',
+                  content: {
+                    // type 可以为全局注册的组件名或者组件引用
+                    type: 'el-input',
+                    // attrs 是组件的属性
+                    attrs: {
+                      placeholder: '标准拧紧力'
+                    }
+                  }
+                }
+              ],
+              // 新行默认值
+              newColumnValue: {
+                step: '1',
+              }
+            }
           }
+        
         },
-        order: ["name","hole", "step"]
+        order: ["name","hole", "step","data"]
       }
     };
   },

src/views/wind/fan/formModel.vue

@@ -6,7 +6,7 @@
     :title="title"
     :request-fn="handleFormSubmit"
     :visible.sync="DialogVisible"
-    width="450px"
+   
     custom-class="abow_dialog"
     label-width="100px"
     label-position="left"
@@ -15,6 +15,17 @@
 </template>
 
 <script>
+import EleForm from 'vue-ele-form';
+import Vue from 'vue';
+import EleFormImageUploader from 'vue-ele-form-image-uploader';
+Vue.use(EleForm, {
+  // 对所有具有上传属性的组件适用
+  upload: {
+    fileSize: 10
+  },
+})
+// 注册 image-uploader 组件
+Vue.component('image-uploader', EleFormImageUploader)
 export default {
   props: ["formModelVisible", "title"],
   data() {
@@ -27,7 +38,9 @@ export default {
         install_date:"",
         supplier:"",
         info: "",
-        location:''
+        location:'',
+        name:'',
+        img:'',
       },
       url: "fan",
       formConfig: {
@@ -47,6 +60,11 @@ export default {
               }
             }
           },
+           name: {
+            type: "input",
+            label: "名称",
+            required:true,
+          },
           number: {
             type: "input",
             label: "编号",
@@ -71,12 +89,30 @@ export default {
             label: "安装日期",
             required:true
           },
+          img:{
+              label:"上传图片",
+              type:"image-uploader",
+              attrs: {
+                multiple: {
+                  type: true,
+                },
+              limit: 3,
+              fileSize: 3,
+              drag: true,
+              action: process.env.VUE_APP_BASE_API+'/osspolicy',
+              responseFn (response, file) {
+                return file.url
+              }
+            }
+
+
+          },
           info: {
             type: "textarea",
             label: "备注"
           }
         },
-        order: ["wind_id","number", "supplier", "production_date","install_date","location","info"]
+        order: ["wind_id","number","name", "supplier", "production_date","install_date","location","img","info"]
       }
     };
   },

src/views/wind/fan/index.vue

@@ -94,6 +94,14 @@
         :show-overflow-tooltip="true"
        
       />
+       <el-table-column
+        prop="name"
+        label="名称"
+        align="center"
+        v-if="showColumn.name"
+        :show-overflow-tooltip="true"
+     
+      />
 
       <el-table-column
         prop="number"
@@ -167,6 +175,7 @@
           <div class="body">
             <el-checkbox v-model="checkList.wind_name">所属部门风场</el-checkbox>
             <el-checkbox v-model="checkList.number" disabled>编号</el-checkbox>
+            <el-checkbox v-model="checkList.name" disabled>名称</el-checkbox>
             <el-checkbox v-model="checkList.supplier">供应商</el-checkbox>
             <el-checkbox v-model="checkList.production_date">出厂日期</el-checkbox>
             <el-checkbox v-model="checkList.install_date">安装日期</el-checkbox>
@@ -224,9 +233,8 @@
 <script>
 import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
 import { action } from "@/directive/permission/index.js";
-import detail from "./detail.vue"
-import formModel from './formModel.vue'
-
+import detail from "./detail.vue";
+import formModel from './formModel.vue';
 export default {
   name: "fan",
   directives: { action },
@@ -264,6 +272,7 @@ export default {
       showColumn: {
         wind_name: true,
         production_date: true,
+        name:true,
         location:true,
         number: true,
         production_date: true,
@@ -366,6 +375,7 @@ export default {
     } else {
       this.checkList = {
         wind_name: true,
+        name:true,
         production_date: true,
         location:true,
         number: true,