likang

src/layout/rl-list-operate/rlListOperate.js

@@ -3,376 +3,376 @@ import store from '@/store'
 import { toThousandFilter } from '@/filters'
 
 export default {
-  data() {
-    return {
-      // formVisible: false,
-      isReadonly:false,
-      loading: true,
-      downloadLoading:false,
-      highlight:false,
-      data: [],
-      id: null,
-      selectedIds: [],
-      title: '新增',
-      paginate: {
-        sizes: [10, 15, 20, 30, 50],  
-        limit: 10,
-        layout: 'slot, prev, pager, next, sizes,total,jumper',
-        current: 0,
-        total: 0
-      },
-      queryParam: {},
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    hiddenDialog() {
-      this.formVisible = false
-    },
-    handleResponse(response) {
-      // console.log(response)
-      if (response.code === 10000) {
-        this.$message.success(response.message)
-        this.resetFormFields()
-        this.handleRefresh()
-        this.hiddenDialog()
-        // 刷新路由
-        if (this.refreshRoute !== undefined && this.refreshRoute === true) {
-          this.handleUpdateUserInfo()
-        }
-        // 成功后
-        this.id = null
-      } else {
-        this.$message.error(response.message)
-      }
-    },
-    handlePageResponse(response){
-      if (response.code === 10000) {
-        this.$message.success(response.message)
-        
-        // 刷新路由
-        if (this.refreshRoute !== undefined && this.refreshRoute === true) {
-          this.handleUpdateUserInfo()
-        }
-        // 成功后
-        this.id = null
-        this.goback()
-      } else {
-        this.$message.error(response.message)
-      }
-    },
-    goback(){  
-      this.$router.go(-1)
-    },
-    sortChange(item) {
-      if (item.order) {
-        var field = item.prop,
-          order = item.order;
-        if (order == "descending") {
-          order = "desc";
-        } else {
-          order = "asc";
-        }
-        this.queryParam.order = order;
-        this.queryParam.field = field;
-        this.getList();
-      } else {
-        delete this.queryParam.order;
-        delete this.queryParam.field;
-        this.getList();
-      }
-    },
-    exportExcel(){
-      const query =this.queryParam
-      this.downloadLoading = true
-      this.$http.post(this.exportUrl, query ,{'timeout':180000}).then(response => {
-          this.downloadLoading = false
-          window.location.href=response.data.url
-      }).catch(()=>{
-        this.downloadLoading=false; 
-      })
-    },
-    // 列表请求
-    getList(params = null) {
-      const query = params ? params : this.queryParam
-      this.loading=true;
-      this.$http.get(this.url, { params: query }).then(response => {
-        
-        this.data = response.data
-        this.handlePaginateResponse(response)
-        if (this.afterGetList !== undefined) {
-          this.afterGetList()
+    data() {
+        return {
+            // formVisible: false,
+            isReadonly: false,
+            loading: true,
+            downloadLoading: false,
+            highlight: false,
+            data: [],
+            id: null,
+            selectedIds: [],
+            title: '新增',
+            paginate: {
+                sizes: [10, 15, 20, 30, 50],
+                limit: 10,
+                layout: 'slot, prev, pager, next, sizes,total,jumper',
+                current: 0,
+                total: 0
+            },
+            queryParam: {},
         }
-        this.loading=false;
-      }).catch(()=>{
-        this.loading=false;
-      })
     },
-    closeDialog() {
-	    this.formVisible = false  // 控制dialog弹框的不显示
-    },
-    closeBmapDialog() {
-      
-	    this.bmapVisible = false  // 控制dialog弹框的不显示
-    },
-
+    created() {
+        this.getList()
+    },
+    methods: {
+        hiddenDialog() {
+            this.formVisible = false
+        },
+        handleResponse(response) {
+            // console.log(response)
+            if (response.code === 10000) {
+                this.$message.success(response.message)
+                this.resetFormFields()
+                this.handleRefresh()
+                this.hiddenDialog()
+                    // 刷新路由
+                if (this.refreshRoute !== undefined && this.refreshRoute === true) {
+                    this.handleUpdateUserInfo()
+                }
+                // 成功后
+                this.id = null
+            } else {
+                this.$message.error(response.message)
+            }
+        },
+        handlePageResponse(response) {
+            if (response.code === 10000) {
+                this.$message.success(response.message)
 
-    // model 弹出层
-    handleCreate() {
-      this.title = '新增'
-      this.isReadonly=false
-      this.id = null
-      // 创建前
-      if (this.beforeCreate !== undefined) {
-        this.beforeCreate()
-      }
-      this.resetFormFields();
-      this.formVisible = true
-    },
-    //
-    handleCreateSub(subrecord){
-      this.title = '新增子级'
-      this.isReadonly=false
-      rlcurd.update.apply(this, [subrecord])
-  },
-    //子组件提交
-    handleSubmit() {
-      
-      if (this.$refs[this.formName].beforeSubmit !== undefined) {
-        this.$refs[this.formName].beforeSubmit()
-      }
-      rlcurd.submitForm.apply(this, [this.$refs[this.formName].url])
-      this.handleRefresh()
-    },
-    // 本页面提交 
-    handleSubmitThisPage(){
-      if (this.beforeSubmit !== undefined) {
-        this.beforeSubmit()
-      }
-      rlcurd.submitFormThisPage.apply(this, [this.url])
-      this.handleRefresh();
-    },
-    handleView(record){
-      this.title = '查看'
-      this.isReadonly=true
+                // 刷新路由
+                if (this.refreshRoute !== undefined && this.refreshRoute === true) {
+                    this.handleUpdateUserInfo()
+                }
+                // 成功后
+                this.id = null
+                this.goback()
+            } else {
+                this.$message.error(response.message)
+            }
+        },
+        goback() {
+            this.$router.go(-1)
+        },
+        sortChange(item) {
+            if (item.order) {
+                var field = item.prop,
+                    order = item.order;
+                if (order == "descending") {
+                    order = "desc";
+                } else {
+                    order = "asc";
+                }
+                this.queryParam.order = order;
+                this.queryParam.field = field;
+                this.getList();
+            } else {
+                delete this.queryParam.order;
+                delete this.queryParam.field;
+                this.getList();
+            }
+        },
+        exportExcel() {
+            const query = this.queryParam
+            this.downloadLoading = true
+            this.$http.post(this.exportUrl, query, { 'timeout': 180000 }).then(response => {
+                this.downloadLoading = false
+                window.location.href = response.data.url
+            }).catch(() => {
+                this.downloadLoading = false;
+            })
+        },
+        // 列表请求
+        getList(params = null) {
+            const query = params ? params : this.queryParam
+            this.loading = true;
+            this.$http.get(this.url, { params: query }).then(response => {
 
-      // 查看前
-      if (this.beforeView !== undefined) {
-        this.beforeView(record)
-      }
-      rlcurd.update.apply(this, [record])
-    },
-    // 更新
-    handleUpdate(record, col, idx) {
-      this.title = '更新'
-      this.isReadonly=false
- 
-      this.id = record[this.pk !== undefined ? this.pk : 'id']
-      // console.log(this.id)
-      // 更新前
-      if (this.beforeUpdate !== undefined) {
-        this.beforeUpdate(record)
-      }
-      rlcurd.update.apply(this, [record])
-      
-    },
-    // 详情
-    handleDetail(id) {
-        var id = {"id":id}
-        this.$router.push({ path:'/devices/devicedetail', query: id })
-    },
-    //新开页面修改填充数据
-    fillUpdateRecordPage(record) {
-      this.isReadonly=false
-      this.id = record[this.pk !== undefined ? this.pk : 'id']
-      // 更新前
-      if (this.beforeUpdate !== undefined) {
-        this.beforeUpdate(record)
-      }
-      rlcurd.updatePage.apply(this, [record])
-    },
-    //新页面添加
-    handleCreatePage(){
-      this.id = null
-      if (this.beforeUpdate !== undefined) {
-        this.beforeUpdate(record)
-      }
-      this.$router.push({ path: this.formRedirect || '/'})
-    },
-    //新页面编辑
-    handleUpdatePage(record){
-      this.id = record[this.pk !== undefined ? this.pk : 'id']
-      if (this.beforeUpdate !== undefined) {
-        this.beforeUpdate(record)
-      }
-      this.$router.push({ path: this.formRedirect || '/', query: record })
-    },
-    // 删除
-    handleDelete(id) {
-      // 更新前
-      if (this.beforeDelete !== undefined) {
-        this.beforeDelete()
-      }
-      rlcurd.del.apply(this, [this.url + '/' + id, '确定删除吗?'])
-    },
-    // 关闭
-    handleCancel() {
-      this.formVisible = false
-      // 防止提交关闭的时候 导致数据清空 所以延迟 300ms 清空数据
-      setTimeout(this.resetFormFields, 300)
-      this.$refs[this.formName].clearValidate()
-      if (this.afterCancel !== undefined) {
-        this.afterCancel()
-      }
-    },
-    // 批量删除
-    handleMultiDelete() {
-      // 批量删除前
-      if (this.beforeMultiDelete !== undefined) {
-        this.beforeMultiDelete()
-      }
-      rlcurd.multiDel.apply(this, [this.url, '确定批量删除吗？'])
-    },
-     // 批量拆除
-     handleMultiDelete_v1() {
-      // 批量拆除前
-      if (this.beforeMultiDelete !== undefined) {
-        this.beforeMultiDelete()
-      }
-      rlcurd.multiDel.apply(this, [this.url, '确定批量拆除吗？'])
-    },
-    // 搜索
-    handleSearch() {
-      this.queryParam.page = 1
-      this.getList()
-    },
-    // 刷新
-    handleRefresh() {
-      Object.keys(this.queryParam).forEach((k) => {
-        // 如果未设置默认搜索参数，刷新将会清空搜索
-        if (this.defaultQueryParam === undefined) {
-          this.queryParam[k] = ''
-        } else {
-          // 清空不包含默认搜索参数
-          if (this.defaultQueryParam.indexOf(k) === -1) {
-            this.queryParam[k] = ''
-          }
-        }
-      })
-      //console.log(this.paginate)
-      // 分页
-      if (this.paginate.total) {
-        this.queryParam.limit = this.paginate.limit
-        this.queryParam.page = 1
-      }
-      this.getList()
-    },
-    // 选择全部
-    handleSelectMulti(data) {
-      this.selectedIds = []
-      data.forEach(item => {
-        this.selectedIds.push(item.id)
-      })
-    },
-    rowClick(val){
-      let ifHighlight=true
-      if(this.selectedIds.length){
-           this.selectedIds.map((item,i) => {
-              if(val.id == item){
-                ifHighlight=false
-                this.highlight = false
-                this.selectedIds.splice(i,1)
-              }
+                this.data = response.data
+                this.handlePaginateResponse(response)
+                if (this.afterGetList !== undefined) {
+                    this.afterGetList()
+                }
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
             })
-            if(ifHighlight){
-              this.highlight = true
+        },
+        closeDialog() {
+            this.formVisible = false // 控制dialog弹框的不显示
+        },
+        closeBmapDialog() {
+
+            this.bmapVisible = false // 控制dialog弹框的不显示
+        },
+
+
+        // model 弹出层
+        handleCreate() {
+            this.title = '新增'
+            this.isReadonly = false
+            this.id = null
+                // 创建前
+            if (this.beforeCreate !== undefined) {
+                this.beforeCreate()
             }
-            
-            this.$refs.multipleTable.toggleRowSelection(val)
-              
-      }else{
-        this.highlight = true
-        this.$refs.multipleTable.toggleRowSelection(val)
-      }
-    },
-    cellClick(row, column, cell, event){
-      if(column.label == '操作'){
-         if(this.selectedIds.length){
-            this.selectedIds.map((item,i) => {
-              if(row.id == item){
-                   this.highlight = true
-                   this.$refs.multipleTable.toggleRowSelection(row)
-              }
+            this.resetFormFields();
+            this.formVisible = true
+        },
+        //
+        handleCreateSub(subrecord) {
+            this.title = '新增子级'
+            this.isReadonly = false
+            rlcurd.update.apply(this, [subrecord])
+        },
+        //子组件提交
+        handleSubmit() {
+
+            if (this.$refs[this.formName].beforeSubmit !== undefined) {
+                this.$refs[this.formName].beforeSubmit()
+            }
+            rlcurd.submitForm.apply(this, [this.$refs[this.formName].url])
+            this.handleRefresh()
+        },
+        // 本页面提交 
+        handleSubmitThisPage() {
+            if (this.beforeSubmit !== undefined) {
+                this.beforeSubmit()
+            }
+            rlcurd.submitFormThisPage.apply(this, [this.url])
+            this.handleRefresh();
+        },
+        handleView(record) {
+            this.title = '查看'
+            this.isReadonly = true
+
+            // 查看前
+            if (this.beforeView !== undefined) {
+                this.beforeView(record)
+            }
+            rlcurd.update.apply(this, [record])
+        },
+        // 更新
+        handleUpdate(record, col, idx) {
+            this.title = '更新'
+            this.isReadonly = false
+
+            this.id = record[this.pk !== undefined ? this.pk : 'id']
+                // console.log(this.id)
+                // 更新前
+            if (this.beforeUpdate !== undefined) {
+                this.beforeUpdate(record)
+            }
+            rlcurd.update.apply(this, [record])
+
+        },
+        // 详情
+        handleDetail(id) {
+            var id = { "id": id }
+            this.$router.push({ path: '/devices/devicedetail', query: id })
+        },
+        //新开页面修改填充数据
+        fillUpdateRecordPage(record) {
+            this.isReadonly = false
+            this.id = record[this.pk !== undefined ? this.pk : 'id']
+                // 更新前
+            if (this.beforeUpdate !== undefined) {
+                this.beforeUpdate(record)
+            }
+            rlcurd.updatePage.apply(this, [record])
+        },
+        //新页面添加
+        handleCreatePage() {
+            this.id = null
+            if (this.beforeUpdate !== undefined) {
+                this.beforeUpdate(record)
+            }
+            this.$router.push({ path: this.formRedirect || '/' })
+        },
+        //新页面编辑
+        handleUpdatePage(record) {
+            this.id = record[this.pk !== undefined ? this.pk : 'id']
+            if (this.beforeUpdate !== undefined) {
+                this.beforeUpdate(record)
+            }
+            this.$router.push({ path: this.formRedirect || '/', query: record })
+        },
+        // 删除
+        handleDelete(id) {
+            // 更新前
+            if (this.beforeDelete !== undefined) {
+                this.beforeDelete()
+            }
+            rlcurd.del.apply(this, [this.url + '/' + id, '确定删除吗?'])
+        },
+        // 关闭
+        handleCancel() {
+            this.formVisible = false
+                // 防止提交关闭的时候 导致数据清空 所以延迟 300ms 清空数据
+            setTimeout(this.resetFormFields, 300)
+            this.$refs[this.formName].clearValidate()
+            if (this.afterCancel !== undefined) {
+                this.afterCancel()
+            }
+        },
+        // 批量删除
+        handleMultiDelete() {
+            // 批量删除前
+            if (this.beforeMultiDelete !== undefined) {
+                this.beforeMultiDelete()
+            }
+            rlcurd.multiDel.apply(this, [this.url, '确定批量删除吗？'])
+        },
+        // 批量拆除
+        handleMultiDelete_v1() {
+            // 批量拆除前
+            if (this.beforeMultiDelete !== undefined) {
+                this.beforeMultiDelete()
+            }
+            rlcurd.multiDel.apply(this, [this.url, '确定批量拆除吗？'])
+        },
+        // 搜索
+        handleSearch() {
+            this.queryParam.page = 1
+            this.getList()
+        },
+        // 刷新
+        handleRefresh() {
+            Object.keys(this.queryParam).forEach((k) => {
+                    // 如果未设置默认搜索参数，刷新将会清空搜索
+                    if (this.defaultQueryParam === undefined) {
+                        this.queryParam[k] = ''
+                    } else {
+                        // 清空不包含默认搜索参数
+                        if (this.defaultQueryParam.indexOf(k) === -1) {
+                            this.queryParam[k] = ''
+                        }
+                    }
+                })
+                //console.log(this.paginate)
+                // 分页
+            if (this.paginate.total) {
+                this.queryParam.limit = this.paginate.limit
+                this.queryParam.page = 1
+            }
+            this.getList()
+        },
+        // 选择全部
+        handleSelectMulti(data) {
+            this.selectedIds = []
+            data.forEach(item => {
+                this.selectedIds.push(item.id)
             })
-         }
-      }
-    },
-    resetFormFields() {
-      Object.keys(this.$refs[this.formName].formFieldsData).forEach((k) => {
-        // console.log(k)
-        // console.log(this.$refs[this.formName].formFieldsData[k])
-        // console.log(typeof this.$refs[this.formName].formFieldsData[k])
-        switch (typeof this.$refs[this.formName].formFieldsData[k]) {
-          case 'object':
-            this.$refs[this.formName].formFieldsData[k] = []
-            break
-          case 'bigint':
-            this.$refs[this.formName].formFieldsData[k] = 1
-            break
-          case 'number':
-            if (k === 'parent_id' || k === 'pid' || k === 'sex') {
-              this.$refs[this.formName].formFieldsData[k] = 0
+        },
+        rowClick(val) {
+            let ifHighlight = true
+            if (this.selectedIds.length) {
+                this.selectedIds.map((item, i) => {
+                    if (val.id == item) {
+                        ifHighlight = false
+                        this.highlight = false
+                        this.selectedIds.splice(i, 1)
+                    }
+                })
+                if (ifHighlight) {
+                    this.highlight = true
+                }
+
+                this.$refs.multipleTable.toggleRowSelection(val)
+
             } else {
-              this.$refs[this.formName].formFieldsData[k] = ''
+                this.highlight = true
+                this.$refs.multipleTable.toggleRowSelection(val)
+            }
+        },
+        cellClick(row, column, cell, event) {
+            if (column.label == '操作') {
+                if (this.selectedIds.length) {
+                    this.selectedIds.map((item, i) => {
+                        if (row.id == item) {
+                            this.highlight = true
+                            this.$refs.multipleTable.toggleRowSelection(row)
+                        }
+                    })
+                }
             }
-            break
-          case 'string':
-            this.$refs[this.formName].formFieldsData[k] = ''
-            break
-          default:
-            break
+        },
+        resetFormFields() {
+            Object.keys(this.$refs[this.formName].formFieldsData).forEach((k) => {
+                // console.log(k)
+                // console.log(this.$refs[this.formName].formFieldsData[k])
+                // console.log(typeof this.$refs[this.formName].formFieldsData[k])
+                switch (typeof this.$refs[this.formName].formFieldsData[k]) {
+                    case 'object':
+                        this.$refs[this.formName].formFieldsData[k] = []
+                        break
+                    case 'bigint':
+                        this.$refs[this.formName].formFieldsData[k] = 1
+                        break
+                    case 'number':
+                        if (k === 'parent_id' || k === 'pid' || k === 'sex') {
+                            this.$refs[this.formName].formFieldsData[k] = 0
+                        } else {
+                            this.$refs[this.formName].formFieldsData[k] = ''
+                        }
+                        break
+                    case 'string':
+                        this.$refs[this.formName].formFieldsData[k] = ''
+                        break
+                    default:
+                        break
 
-            // eslint-disable-next-line no-unreachable
-            if (this.$refs[this.formName].formFieldsDefaultValues !== undefined && this.$refs[this.formName].formFieldsDefaultValues.indexOf(k)) {
-              this.$refs[this.formName].formFieldsData[k] = this.$refs[this.formName].formFieldsDefaultValues[k]
+                        // eslint-disable-next-line no-unreachable
+                        if (this.$refs[this.formName].formFieldsDefaultValues !== undefined && this.$refs[this.formName].formFieldsDefaultValues.indexOf(k)) {
+                            this.$refs[this.formName].formFieldsData[k] = this.$refs[this.formName].formFieldsDefaultValues[k]
+                        }
+                }
+            })
+        },
+        // 更新用户信息
+        handleUpdateUserInfo() {
+            store.dispatch('user/getInfo').then(response => {
+                const { roles, permissions } = response
+                store.dispatch('permission/generateRoutes', [roles, permissions]).then(r => {})
+            })
+        },
+        handleSizeChange(val) {
+            this.handlePaginateParams(val)
+        },
+        handleCurrentChange(val) {
+            this.handlePaginateParams(0, val)
+        },
+        // 处理分页参数
+        handlePaginateParams(limit = 0, page = 0) {
+            if (limit) {
+                this.queryParam.limit = limit
+                this.paginate.limit = limit
             }
-        }
-      })
-    },
-    // 更新用户信息
-    handleUpdateUserInfo() {
-      store.dispatch('user/getInfo').then(response => {
-        const { roles, permissions } = response
-        store.dispatch('permission/generateRoutes', [roles, permissions]).then(r => {})
-      })
-    },
-    handleSizeChange(val) {
-      this.handlePaginateParams(val)
-    },
-    handleCurrentChange(val) {
-      this.handlePaginateParams(0, val)
-    },
-    // 处理分页参数
-    handlePaginateParams(limit = 0, page = 0) {
-      if (limit) {
-        this.queryParam.limit = limit
-        this.paginate.limit = limit
-      }
-      if (page) {
-        this.queryParam.page = page
-        this.paginate.current = page
-      }
-      this.getList()
-    },
-    handlePaginateResponse(response) {
-  
-      if (response.limit !== undefined) {
-        this.paginate.total = response.count
-        this.paginate.limit = response.limit
-        this.paginate.current = response.current
-      }
-    },
-  }
-}
+            if (page) {
+                this.queryParam.page = page
+                this.paginate.current = page
+            }
+            this.getList()
+        },
+        handlePaginateResponse(response) {
+
+            if (response.limit !== undefined) {
+                this.paginate.total = response.count
+                this.paginate.limit = response.limit
+                this.paginate.current = response.current
+            }
+        },
+    }
+}

src/views/wind/worklocation/detail.vue

@@ -1,294 +0,0 @@
-<template>
-  <el-drawer
-    title="设备信息"
-    :visible.sync="drawerVisible"
-    :direction="direction"
-    size="60%"
-  >
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane label="法兰信息" name="first">
-        <el-divider content-position="left">基础信息</el-divider>
-        <el-row>
-          <div style="margin-bottom: 30px; margin-left: 50px">
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <span>法兰编号：</span>
-                <span class="item">{{ data.number }}</span>
-              </div>
-              <div class="detail-item">
-                <pre style="display: inline">型    号：</pre>
-                <span class="item">{{ data.model_type}}</span>
-              </div>
-              <div class="detail-item">
-                <span>所属部门：</span>
-                <span class="item">{{ data.depart_name }}</span>
-              </div>
-               <div class="detail-item">
-                <span>所属风场：</span>
-                <span class="item">{{ data.wind_name }}</span>
-              </div>
-            </el-col>
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <pre style="display: inline">名    称：</pre>
-                <span class="item">{{ data.name }}</span>
-              </div>
-              <div class="detail-item">
-                <span>使用状态：</span>
-                <span class="item">在用</span>
-              </div>
-              <div class="detail-item">
-                <pre style="display: inline">品    牌：</pre>
-                <span class="item">{{ data.brand }}</span>
-              </div>
-               <div class="detail-item">
-                <span>所属风机编号：</span>
-                <span class="item">{{ data.fan_number }}</span>
-              </div>
-            </el-col>
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <pre style="display: inline">供 应 商：</pre>
-                <span class="item">{{ data.supplier }}</span>
-              </div>
-              <div class="detail-item">
-                <span>出厂日期：</span>
-                <span class="item">{{ data.out_date }}</span>
-              </div>
-               <div class="detail-item">
-                <span>位置：</span>
-                <span class="item">{{ data.install_position }}</span>
-              </div>
-              <div class="detail-item">
-                <pre style="display: inline">备    注：</pre>
-                <span class="item">{{ data.remark }}</span>
-              </div>
-            </el-col>
-            <el-col :span="6"></el-col>
-          </div>
-        </el-row>
-        <el-divider content-position="left">规格信息</el-divider>
-        <el-row>
-          <div style="margin-bottom: 30px; margin-left: 50px">
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <pre style="display: inline">外    径：</pre>
-                <span class="item">{{ data.outside }}</span>
-              </div>
-             
-            </el-col>
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <pre style="display: inline">螺栓尺寸：</pre>
-                <span class="item">{{ data.bolt_size }}</span>
-              </div>
-            </el-col>
-            <el-col
-              :span="6"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <pre style="display: inline">螺栓数量：</pre>
-                <span class="item">{{ data.bolt_size }}</span>
-              </div>
-            </el-col>
-            <el-col :span="6"></el-col>
-          </div>
-        </el-row>
-      </el-tab-pane>
-      <el-tab-pane label="液压扳手" name="second">
-        <el-table
-          :data="AssemblyData"
-          style="width: 100%; margin-left: 20px"
-        >
-          <el-table-column prop="number" label="编号"> </el-table-column>
-          <el-table-column prop="text" label="名称"> </el-table-column>
-          <el-table-column prop="name" label="型号"> </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="螺栓紧固方案" name="third">
-        <el-tabs tab-position="left" style="width: 100%; margin-left: 20px">
-          <el-tab-pane :label="item.name" v-for="item in synschemeData" :key="item.id">
-            <el-table :data="item.data" style="width: 100%">
-              <el-table-column prop="step" label="步骤"> </el-table-column>
-              <el-table-column prop="number" label="螺栓编号">
-              </el-table-column>
-              <el-table-column prop="preload" label="标准预紧力（N*m）">  
-              </el-table-column>
-               <el-table-column prop="real_preload" label="标准扭矩力（N*m）">
-              </el-table-column>
-              
-            </el-table>
-          </el-tab-pane>
-        </el-tabs>
-      </el-tab-pane>
-   
-      <el-tab-pane label="维保记录" name="five">
-          <div class="search-box-area" id="searchBox" style="margin-left:20px">
-           <div class="search-item">
-          <el-input
-            placeholder="法兰编号"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
-        </div>
-        <div class="search-item" style="margin-left:20px">
-          <el-input
-            placeholder="泵编号"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
-        </div>
-         <el-button
-         style="margin-left:20px"
-          class="filter-item search fl"
-          icon="el-icon-search"
-          @click="handleSearch"
-          >搜索</el-button
-        >
-        <el-button
-        style="margin-left:20px"
-          class="filter-item fl"
-          icon="el-icon-refresh"
-          @click="handleRefresh"
-          >重置</el-button
-        >
-          </div>
-        <el-table :data="historyData" style="width: 100%; margin-left: 20px">
-           <el-table-column prop="flange_number" label="法兰编号"> </el-table-column>
-          <el-table-column prop="number" label="螺栓编号"> </el-table-column>
-          <el-table-column prop="real_preload" label="拧紧扭矩（N*m）">
-          </el-table-column>
-          <el-table-column prop="stand_preload" label="预紧压力（N*m）">
-          </el-table-column>
-           <el-table-column prop="wrench_number" label="拧紧角度"> </el-table-column>
-           <el-table-column prop="status" label="紧固状态"></el-table-column>
-          <el-table-column prop="beng_no" label="泵编号"> </el-table-column>
-          <el-table-column prop="banshou_no" label="扳手编号">
-          </el-table-column>
-          <el-table-column prop="ways" label="紧固方式"> </el-table-column>
-          <el-table-column prop="operator" label="操作员"> </el-table-column>
-           <el-table-column prop="end_time" label="操作时间">
-          </el-table-column>
-        </el-table>
-        <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange8"
-              :current-page="currentPage1"
-              :page-size="pageSize"
-              layout="total,  prev, pager, next, jumper"
-              style="float:right"
-              :total="45"
-            />
-      </el-tab-pane>
-    </el-tabs>
-  </el-drawer>
-</template>
-<script>
-import toolData from './toolData'
-import oneData from './oneData'
-import twoData from './twoData'
-import fourData from './fourData'
-import sixData from './sixData'
-import nowData from './nowData'
-import historyData from './historyData'
-export default {
-  props: ["detailVisible", "data"],
-  data() {
-    return {
-      drawer: false,
-      direction: "rtl",
-      activeName: "first",
-      AssemblyData: toolData,
-      //螺栓紧固方案
-      synschemeData:[],
-      nowData: nowData[0],
-      historyData: historyData[0],
-      pageSize: 10,
-      currentPage1: 1,
-      currentPage2: 5,
-      currentPage3: 5,
-      currentPage4: 1,
-    };
-  },
-  methods: {
-    handleClick(tab, event) {
-    
-       //获取液压扳手
-       if(tab.name=='second')
-       {
-          this.$http.get("wrenchtype",{ params: {id:this.data.wrench} }).then(response => {
-            this.AssemblyData = response.data;
-          });
-       }
-       if(tab.name=='third')
-       {
-         this.$http.get("synlist",{ params: {id:this.data.fastening_scheme} }).then(response => {
-            this.synschemeData = response.data;
-          });
-
-       }
-  
-    },
-   
-
-    handleRefresh()
-    {
-
-    },
-    handleSearch(){
-
-    },
-
-    handleSizeChange(val) {
-     this.pageSize = val
-    },
-    handleCurrentChange7(val) {
-      this.nowData = nowData[val-1];
-    },
-    handleCurrentChange8(val) {
-      this.historyData = historyData[val-1];
-    },
-  },
-  computed: {
-    drawerVisible: {
-      set(val) {
-        this.$emit("sendVal", val); // 表示将子组件改变的值传递给父组件
-      },
-      get() {
-        return this.detailVisible; // 表示获取父组件的值
-      },
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
- @import "@/views/device/hydraulic/index.scss";
-.detail-item {
-  width: 100%;
-  padding: 15px 0px;
-  list-style-type: none;
-}
-.item {
-  font-size: 14px;
-  color: black;
-  margin-top: 5px;
-}
-</style>

src/views/wind/worklocation/formModel.vue

@@ -24,36 +24,28 @@ export default {
       formFieldsData: {
         id:"",
         number: "",
-        fan_id:"",
-        work_location:"",
-        parts:"",
-        bolt_style:"",
-        boit_type:"",
+        wind_name:'',
+        fan_number:"",
+        work_local_name:"",
+        parts_name:"",
+        bolt_style_name:"",
+        boit_type_name:"",
         info: "",
 
       }, 
       url: "workLocation",
       formConfig: {
+        readonly:true,
+        isShowSubmitBtn:false,
         formDesc: {
           //风场id
-          fan_id:{
-              type: "cascader",
-              label: "风机编号",
-              isOptions: true,
-              options: [],
-              required: true,
-              vif:true,
-              attrs: {
-                //查询 
-                filterable:true,
-                props: {
-                  label: "text",
-                  value: "value",
-                  emitPath: false,
-                  multiple:false
-                }
-            }
-
+          wind_name:{
+             type: "input",
+             label: "风场名称",
+          },
+          fan_number:{
+              type: "input",
+              label: "风机机位号",
           },
           number: {  
             required:true,
@@ -61,34 +53,29 @@ export default {
             label: "编号",
            
           },
-           work_location: {
+          work_local_name: {
             
             type: "input",
             label: "工作位置",
             required:true
           },
-          parts: {
+          parts_name: {
             
             required:true,
-            type: "select",
+            type: "input",
             label: "所属部件",
             required:true,
-            options:[]
           },
-           bolt_style:{
-            
+           bolt_style_name:{
             type: "input",
             label: "螺丝样式",
              required:true
           },
-           boit_type:{
+           boit_type_name:{
              
              type: "input",
              label: "螺丝型号",
              required:true,
-             rules: [
-             {pattern: /^((0{1}\.\d{1,2})|([1-9]\d*\.{1}\d{1,2})|([1-9]+\d*)|0)$/,message: '请輸入正数,最多保存两位小数'}
-            ]
           },
           info: {
             
@@ -96,29 +83,15 @@ export default {
             label: "备注"
           }
         },
-        order: ["number","fan_id","work_location","parts","bolt_style", "boit_type","info","info"]
+        order: ["number",'wind_name',"fan_number","work_local_name","parts_name","bolt_style_name", "boit_type_name","info"]
       }
     };
   },
   created() {
    
-    //  this.$http.get("getwindfan").then(response => {
-    //   this.formConfig.formDesc.fan_id.options = response.data;
-    // });
-    // this.$http.get("get_device_mold",{ params: {type:2} }).then(resp => {
-    //     this.formConfig.formDesc.model.options = resp.data
-    //  });
-    // this.$http.get("wrenchtype").then(response => {
-    //   this.formConfig.formDesc.wrench.options = response.data;
-    // });
-    // this.$http.get("synschemetype").then(response => {
-    //   this.formConfig.formDesc.fastening_scheme.options = response.data;
-    // });
-
-
-
   },
   methods: {
+  
     handleFormSubmit(data) {
 
       this.$parent.handleSubmit();
@@ -130,7 +103,7 @@ export default {
       this.$message.success("发送成功");
     }
   },
-
+  
 
   computed: {
     DialogVisible: {

src/views/wind/worklocation/fourData.js

@@ -1,77 +0,0 @@
-module.exports = [
-  [{
-    step: 1,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 2,
-    preload: "2100",
-    number: "06,08,12,14",
-  },
-  {
-    step: 3,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 4,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 5,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 6,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 7,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 8,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 9,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 10,
-    preload: "2128",
-    number: "05,06,07,09",
-  }],
-  [{
-    step: 11,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 12,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 13,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 14,
-    preload: "2128",
-    number: "05,06,07,09",
-  },
-  {
-    step: 15,
-    preload: "2128",
-    number: "05,06,07,09",
-  }]
-]

src/views/wind/worklocation/historyData.js

@@ -1,593 +0,0 @@
-module.exports  =   [
-    [{
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        }
-    ],
-    [{
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        }
-    ],
-    [{
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        }
-    ],
-    [{
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        }
-    ],
-    [{
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "14,15",
-            real_preload: "2129",
-            stand_preload: "3006",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "15,16,17,18,19",
-            real_preload: "2139",
-            stand_preload: "3007",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: "10,11,12,13,14,15",
-            real_preload: "2129",
-            stand_preload: "3008",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        },
-        {
-            flange_number: '222',
-            wrench_number: '343',
-            status: '合格',
-            number: 13,
-            real_preload: "2128",
-            stand_preload: "3005",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        }
-    ]
-]

src/views/wind/worklocation/index.vue

@@ -122,7 +122,7 @@
         align="center"
         v-if="showColumn.wind_name"
         :show-overflow-tooltip="true"
-        width="150"
+       
       />
       <el-table-column
         prop="fan_number"
@@ -130,7 +130,7 @@
         align="center"
         v-if="showColumn.fan_number"
         :show-overflow-tooltip="true"
-        width="150"
+        
       />
       <el-table-column
         prop="number"
@@ -138,38 +138,65 @@
         align="center"
         v-if="showColumn.number"
         :show-overflow-tooltip="true"
-        width="150"
+        
       />
       <el-table-column
-        prop="work_local"
+        prop="work_local_name"
         label="工作位置"
         align="center"
         v-if="showColumn.work_local"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        prop="parts"
+        prop="parts_name"
         label="所属部件"
         align="center"
         v-if="showColumn.parts"
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        prop="bolt_style"
+        prop="bolt_style_name"
         label="螺栓样式"
         align="center"
         v-if="showColumn.bolt_style"
         :show-overflow-tooltip="true"
-        width="120"
       />
       <el-table-column
-        prop="boit_type"
+        prop="boit_type_name"
         label="螺栓型号"
         align="center"
         v-if="showColumn.boit_type"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        prop="torque"
+        label="扭矩"
+        align="center"
+        v-if="showColumn.torque"
+        :show-overflow-tooltip="true"
+      />
+       <el-table-column
+        prop="pressure"
+        label="压力"
+        align="center"
+        v-if="showColumn.pressure"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="external_diameter"
+        label="外径"
+        align="center"
+        v-if="showColumn.external_diameter"
+        :show-overflow-tooltip="true"
+      />
+       <el-table-column
+        prop="created_at"
+        label="创建时间"
+        align="center"
+        v-if="showColumn.external_diameter"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
         label="操作"
         width="150"
         align="center"
@@ -177,18 +204,18 @@
       >
         <template slot-scope="record">
           <el-tooltip
-            content="修改"
+            content="查看"
             placement="top"
             :enterable="false"
           >
             <el-button
               type="primary"
               size="mini"
-              icon="el-icon-edit"
-              @click="handleUpdate(record.row)"
+              icon="el-icon-view"
+              @click="handleView(record.row)"
             ></el-button>
           </el-tooltip>
-          <el-tooltip
+          <!-- <el-tooltip
             content="查看"
             placement="top"
             :enterable="false"
@@ -199,7 +226,7 @@
               icon="el-icon-view"
               @click="handleDetail(record.row)"
             ></el-button>
-          </el-tooltip>
+          </el-tooltip> -->
         </template>
       </el-table-column>
     </el-table>
@@ -214,6 +241,10 @@
             <el-checkbox v-model="checkList.parts">所属部件</el-checkbox>
             <el-checkbox v-model="checkList.bolt_style">螺丝样式</el-checkbox>
             <el-checkbox v-model="checkList.boit_type">螺栓型号</el-checkbox>
+            <el-checkbox v-model="checkList.torque">扭矩</el-checkbox>
+            <el-checkbox v-model="checkList.pressure">压力</el-checkbox>
+            <el-checkbox v-model="checkList.external_diameter">外径</el-checkbox>
+            <el-checkbox v-model="checkList.created_at">创建时间</el-checkbox>
           </div>
           <div class="footer">
             <el-button size="small" type="primary" plain @click="saveColumn"
@@ -314,6 +345,12 @@ export default {
         parts:true,
         bolt_style: true,
         boit_type: true,
+        torque:true,
+        pressure:true,
+        external_diameter:true,
+        created_at:true
+
+
       }
     };
   },
@@ -408,6 +445,10 @@ export default {
         parts:true,
         bolt_style: true,
         boit_type: true,
+        torque:true,
+        pressure:true,
+        external_diameter:true,
+        created_at:true
       };
     }
   },

src/views/wind/worklocation/nowData.js

@@ -1,43 +0,0 @@
-module.exports  =   [
-    [{
-            number: "09",
-            real_preload: "2128",
-            stand_preload: "3000",
-            end_time: "2022-03-02 15:31:54",
-            beng_no: "200001",
-            banshou_no: "300001",
-            ways: "单同步",
-            operator: "张速",
-        },
-        {
-            number: '10,11',
-            real_preload: "2129",
-            stand_preload: "3001",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "两同步",
-            operator: "张速",
-        },
-        {
-            number: '12,15,16,17',
-            real_preload: "2139",
-            stand_preload: "3002",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "四同步",
-            operator: "张速",
-        },
-        {
-            number: '12,13,14,15,16,17',
-            real_preload: "2129",
-            stand_preload: "3003",
-            end_time: "2022-03-02 16:31:44",
-            beng_no: "200002",
-            banshou_no: "300002",
-            ways: "六同步",
-            operator: "张速",
-        }
-    ]
-]

src/views/wind/worklocation/oneData.js

@@ -1,105 +0,0 @@
-module.exports = [
-  [{
-    step: 1,
-    preload: "2120",
-    number: "01",
-  },
-  {
-    step: 2,
-    preload: "2126",
-    number: "02",
-  },
-  {
-    step: 3,
-    preload: "2120",
-    number: "03",
-  },
-  {
-    step: 4,
-    preload: "2126",
-    number: "04",
-  },
-  {
-    step: 5,
-    preload: "2120",
-    number: "05",
-  },
-  {
-    step: 6,
-    preload: "2126",
-    number: "06",
-  },
-  {
-    step: 7,
-    preload: "2126",
-    number: "07",
-  },
-  {
-    step: 8,
-    preload: "2120",
-    number: "08",
-  },
-  {
-    step: 9,
-    preload: "2126",
-    number: "09",
-  },
-  {
-    step: 10,
-    preload: "2120",
-    number: "10",
-  }],
-  [
-    {
-      step: 11,
-      preload: "2126",
-      number: "11",
-    },
-    {
-      step: 12,
-      preload: "2120",
-      number: "12",
-    },
-    {
-      step: 13,
-      preload: "2126",
-      number: "13",
-    },
-    {
-      step: 14,
-      preload: "2120",
-      number: "14",
-    },
-    {
-      step: 15,
-      preload: "2126",
-      number: "15",
-    },
-    {
-      step: 16,
-      preload: "2120",
-      number: "16",
-    },
-    {
-      step: 17,
-      preload: "2126",
-      number: "17",
-    },
-    {
-      step: 18,
-      preload: "2120",
-      number: "18",
-    },
-    {
-      step: 19,
-      preload: "2126",
-      number: "19",
-    },
-    {
-      step: 20,
-      preload: "2120",
-      number: "20",
-    }
-  ]
-  
-]

src/views/wind/worklocation/sixData.js

@@ -1,92 +0,0 @@
-module.exports = [
-  [{
-    step: 1,
-    preload: "2128",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 2,
-    preload: "2100",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 3,
-    preload: "2228",
-    number: "29,30,31,32,33,34",
-  },
-  {
-    step: 4,
-    preload: "3000",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 5,
-    preload: "3001",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 6,
-    preload: "3002",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 7,
-    preload: "3003",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 8,
-    preload: "3004",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 9,
-    preload: "3005",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 10,
-    preload: "3006",
-    number: "23,24,25,26,27,28",
-  }],
-  [{
-    step: 11,
-    preload: "3007",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 12,
-    preload: "2100",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 13,
-    preload: "2128",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 14,
-    preload: "2100",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 15,
-    preload: "2128",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 16,
-    preload: "2100",
-    number: "23,24,25,26,27,28",
-  },
-  {
-    step: 17,
-    preload: "2128",
-    number: "07,08,09,20,21,22",
-  },
-  {
-    step: 18,
-    preload: "2100",
-    number: "23,24,25,26,27,28",
-  }]
-]

src/views/wind/worklocation/toolData.js

@@ -1,22 +0,0 @@
-module.exports = [
-  {
-   "model": "v23300",
-   "name": "测试工具1",
-   "number": "2022030301"
- },
- {
-   "model": "v23301",
-   "name": "测试工具2",
-   "number": "2022030302"
- },
- {
-   "model": "v23302",
-   "name": "测试工具3",
-   "number": "2022030303"
- },
- {
-   "model": "v23303",
-   "name": "测试工具4",
-   "number": "2022030304"
- }
-]

src/views/wind/worklocation/twoData.js

@@ -1,62 +0,0 @@
-module.exports = [
-  [{
-    step: 1,
-    preload: "2128",
-    number: "03,04",
-  },
-  {
-    step: 2,
-    preload: "2100",
-    number: "04,05",
-  },
-  {
-    step: 3,
-    preload: "2128",
-    number: "03,04",
-  },
-  {
-    step: 4,
-    preload: "2100",
-    number: "04,05",
-  },
-  {
-    step: 5,
-    preload: "2128",
-    number: "03,04",
-  },
-  {
-    step: 6,
-    preload: "2100",
-    number: "04,05",
-  },
-  {
-    step: 7,
-    preload: "2128",
-    number: "03,04",
-  },
-  {
-    step: 8,
-    preload: "2100",
-    number: "04,05",
-  },
-  {
-    step: 9,
-    preload: "2128",
-    number: "03,04",
-  },
-  {
-    step: 10,
-    preload: "2100",
-    number: "04,05",
-  }],
-  [{
-    step: 11,
-    preload: "2128",
-    number: "03,04",
-  },
-  {
-    step: 12,
-    preload: "2100",
-    number: "04,05",
-  }]
-]