likang

src/views/device/flange/detail.vue

@@ -123,77 +123,17 @@
       </el-tab-pane>
       <el-tab-pane label="螺栓紧固方案" name="third">
         <el-tabs tab-position="left" style="width: 100%; margin-left: 20px">
-          <el-tab-pane label="单同步">
-            <el-table :data="oneData" style="width: 100%">
+          <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 prop="preload" label="标准预紧力（N*m）">  
               </el-table-column>
-            </el-table>
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange1"
-              :current-page="currentPage1"
-              :page-size="pageSize"
-              layout="total,  prev, pager, next, jumper"
-              style="float:right"
-              :total="20"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="两同步">
-            <el-table :data="twoData" 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>
-           <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange2"
-              :current-page="currentPage1"
-              :page-size="pageSize"
-              layout="total,  prev, pager, next, jumper"
-              style="float:right"
-              :total="12"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="四同步">
-            <el-table :data="fourData" 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>
-           <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange4"
-              :current-page="currentPage1"
-              :page-size="pageSize"
-              layout="total,  prev, pager, next, jumper"
-              style="float:right"
-              :total="15"
-            />
-          </el-tab-pane>
-          <el-tab-pane label="六同步">
-            <el-table :data="sixData" 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 prop="real_preload" label="标准扭矩力（N*m）">
               </el-table-column>
+              
             </el-table>
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange6"
-              :current-page="currentPage1"
-              :page-size="pageSize"
-              layout="total,  prev, pager, next, jumper"
-              style="float:right"
-              :total="18"
-            />
           </el-tab-pane>
         </el-tabs>
       </el-tab-pane>
@@ -277,10 +217,8 @@ export default {
       direction: "rtl",
       activeName: "first",
       AssemblyData: toolData,
-      oneData: oneData[0],
-      twoData: twoData[0],
-      fourData: fourData[0],
-      sixData: sixData[0],
+      //螺栓紧固方案
+      synschemeData:[],
       nowData: nowData[0],
       historyData: historyData[0],
       pageSize: 10,
@@ -292,7 +230,7 @@ export default {
   },
   methods: {
     handleClick(tab, event) {
-       console.log(tab.name);
+    
        //获取液压扳手
        if(tab.name=='second')
        {
@@ -300,8 +238,17 @@ export default {
             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()
     {
 
@@ -309,23 +256,10 @@ export default {
     handleSearch(){
 
     },
-  
 
     handleSizeChange(val) {
      this.pageSize = val
     },
-    handleCurrentChange1(val) {
-      this.oneData = oneData[val-1];
-    },
-     handleCurrentChange2(val) {
-      this.twoData = twoData[val-1];
-    },
-     handleCurrentChange4(val) {
-      this.fourData = fourData[val-1];
-    },
-     handleCurrentChange6(val) {
-      this.sixData = sixData[val-1];
-    },
     handleCurrentChange7(val) {
       this.nowData = nowData[val-1];
     },

src/views/device/flange/formModel.vue

@@ -49,6 +49,7 @@ export default {
             layout:12,
             type: "select",
             label: "使用状态",
+            required: true,
             isOptions: true,
             options: [
               {
@@ -106,6 +107,7 @@ export default {
           },
           number: {
             layout:12,
+            required:true,
             type: "input",
             label: "编号",
            
@@ -118,6 +120,7 @@ export default {
           },
           model: {
             layout:12,
+            required:true,
             type: "select",
             label: "型号",
             required:true,
@@ -126,19 +129,16 @@ export default {
            outside:{
             layout:12,
             type: "input",
-            label: "外径"
+            label: "外径",
+             required:true
           },
            torque:{
              layout:12,
-             type: "number",
+             type: "input",
              label: "扭矩",
              required:true,
              rules: [
-              {
-                type: "number",
-                trigger: "blur",
-
-              }
+             {pattern: /^((0{1}\.\d{1,2})|([1-9]\d*\.{1}\d{1,2})|([1-9]+\d*)|0)$/,message: '请輸入正数,最多保存两位小数'}
             ]
           },
           wrench:{
@@ -185,38 +185,30 @@ export default {
           },
           stress:{
              layout:12,
-             type: "number",
+             required: true,
+             type: "input",
              label: "压力",
-              rules: [
-              {
-                type: "number",
-                trigger: "blur",
-                message: "必须是数字"
-              }
+             rules: [
+               {pattern: /^((0{1}\.\d{1,2})|([1-9]\d*\.{1}\d{1,2})|([1-9]+\d*)|0)$/,message: '请輸入正数,最多保存两位小数'}
             ]
           },
           bolt_size: {
              layout:12,
-             type: "number",
+             type: "input",
              label: "螺栓尺寸",
              rules: [
-              {
-                type: "number",
-                trigger: "blur",
-                message: "必须是数字"
-              }
+             {pattern: /^((0{1}\.\d{1,2})|([1-9]\d*\.{1}\d{1,2})|([1-9]+\d*)|0)$/,message: '请輸入正数,最多保存两位小数'}
             ]
           },
            bolt_number: {
+            required: true,
             layout:12,
-             type: "number",
+             type: "input",
              label: "螺栓数量",
              rules: [
-              {
-                type: "number",
-                trigger: "blur",
-                message: "必须是数字"
-              }
+              
+               {pattern: /^[1-9]\d*$/,message: '请輸入正整数'}
+              
             ]
           },
           install_position:{

src/views/device/flange/index.vue

@@ -10,7 +10,7 @@
             :options="departments"
             clearable
             :props="{
-              checkStrictly: true,
+              emitPath:false,
               label: 'department_name',
               value: 'id',
             }"
@@ -36,13 +36,24 @@
           />
         </div>
         <div class="search-item">
-          <el-input
+          <!-- <el-input
             v-model="queryParam.model_typer"
             placeholder="型号"
             clearable
             class="filter-item form-search-input fl"
             @keyup.enter.native="handleSearch"
-          />
+          /> -->
+               <el-select
+                  v-model="queryParam.model"
+                  placeholder="模型"
+                  class="filter-item form-search-input fl"
+                  clearable
+                >
+             <el-option v-for="item in deviceModels" 
+             :key="item.value" 
+             :label="item.text" 
+             :value="item.value"></el-option>
+          </el-select>
         </div>
         <div class="search-item">
           <el-select
@@ -352,6 +363,7 @@ export default {
       //搜索
       searchDisplay: true,
       departments: [],
+      deviceModels:[],
 
       //详情
       detailVisible:false,
@@ -378,6 +390,10 @@ export default {
     this.$http.get("departments").then((response) => {
       this.departments = response.data;
     });
+     this.$http.get("get_device_mold",{ params: {type:2} }).then(resp => {
+        this.deviceModels = resp.data
+     });
+
   },
   methods: {
     //重置

src/views/device/synscheme/detail.vue

@@ -1,171 +0,0 @@
-<template>
-  <el-drawer
-    title="设备信息"
-    :visible.sync="drawerVisible"
-    :direction="direction"
-    size="45%"
-  >
-    <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">
-                <pre style="display: inline">编    号：</pre>
-                <span class="item">{{ record.number }}</span>
-              </div>
-              <div class="detail-item">
-                <pre style="display: inline">型    号：</pre>
-                <span class="item">{{ record.model_name }}</span>
-              </div>
-              <div class="detail-item">
-                <span>所属部门：</span>
-                <span class="item">{{ record.depart_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">{{ record.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">{{ record.brand }}</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">{{ record.supplier }}</span>
-              </div>
-              <div class="detail-item">
-                <span>出厂日期：</span>
-                <span class="item">{{ record.out_date }}</span>
-              </div>
-              <div class="detail-item">
-                <pre style="display: inline">备    注：</pre>
-                <span class="item">{{ record.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="24"
-              style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
-            >
-              <div class="detail-item">
-                <pre style="display: inline">压力范围（PSI）：</pre>
-                <span class="item">{{ record.min_pressure }}~{{ record.max_pressure }}</span>
-              </div>
-            </el-col>
-          </div>
-        </el-row>
-      </el-tab-pane>
-      <el-tab-pane label="维保记录" name="fourth">
-          <el-table
-            :data="data"
-            style="width: 100%;margin-left: 20px"
-          >
-          <el-table-column prop="longitude" label="经度" align="center"></el-table-column>
-          <el-table-column prop="latitude" label="纬度" align="center"></el-table-column>
-          <el-table-column prop="device_state" label="设备状态" align="center"></el-table-column>
-          <el-table-column prop="online_time" label="运行时间" align="center"></el-table-column>
-          <el-table-column prop="info" label="维护信息" align="center"></el-table-column>
-          
-        </el-table>
-        <el-pagination
-      background
-      class="pagination-container"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="paginate.current"
-      :page-sizes="paginate.sizes"
-      :page-size="paginate.limit"
-      :layout="paginate.layout"
-      :total="paginate.total"
-    />
-      </el-tab-pane>
-      
-    </el-tabs>
-  </el-drawer>
-</template>
-<script>
-import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
-export default {
-  props: ["detailVisible", "record"],
-  mixins: [rlListOperate],
-  data() {
-    return {
-      drawer: false,
-      direction: "rtl",
-      activeName: "first",
-      nowData: [],
-      url:'maintainLog',
-      queryParam: {
-        device_number: "",
-      }
-    };
-  },
-  methods: {
-    handleClick(){
-
-    }
-  },
-  computed: {
-    drawerVisible: {
-      set(val) {
-        this.$emit("sendVal", val); // 表示将子组件改变的值传递给父组件
-      },
-      get() {
-        if(this.detailVisible){
-          //获取维护记录
-          this.queryParam.device_number=this.record.number
-          this.getList()
-        }
-        return this.detailVisible; // 表示获取父组件的值
-      },
-    },
-  },
-};
-</script>
-<style scoped>
-.detail-item {
-  width: 100%;
-  padding: 15px 0px;
-  list-style-type: none;
-}
-.item {
-  font-size: 14px;
-  color: black;
-  margin-top: 5px;
-}
-.el-table .warning-row {
-  background: oldlace !important;
-}
-
-.el-table .success-row {
-  background: #f0f9eb !important;
-}
-.pagination-container{
-  padding-left:25px;
-  padding-right:25px;
-}
-</style>

src/views/device/synscheme/formModel.vue

@@ -47,11 +47,13 @@ export default {
           },
            hole: {
             type: "input",
-            label: "孔"
+            label: "孔",
+            required:true
           },
           step: {
             type: "input",
-            label: "总步骤"
+            label: "总步骤",
+            required:true
           },
           data:{
             label: '流程',
@@ -59,27 +61,12 @@ export default {
             attrs: {
               // 校检规则
               rules: {
-                step: { required: true, message: '步骤必填' },
-                number: { required: true, message: '螺栓编号必填' },
-                preload:{require:true,message:'标准拧紧力必填'}
+                step: [{required: true, message: '步骤必填'},{pattern: /^[+]{0,1}(\d+)$/,message:'必须正整数'}],
+                number: [{ required: true, message: '螺栓编号必填' },{pattern: /^\d+(,\d+)*$/,message: '请輸入正确的格式,用英文逗号分割的数字'},
+],
+                preload:[{require:true,message:'标准拧紧力必填'},{pattern: /^((0{1}\.\d{1,2})|([1-9]\d*\.{1}\d{1,2})|([1-9]+\d*)|0)$/,message: '请輸入正确的格式'}],
+                real_preload:[{require:true,message:'标准扭矩力必填'},{pattern: /^((0{1}\.\d{1,2})|([1-9]\d*\.{1}\d{1,2})|([1-9]+\d*)|0)$/,message: '请輸入正确的格式'}]
               },
-              // 其它按钮
-              // extraBtns: [
-              //   {
-              //     // text 按钮显示的文本
-              //     text: '保存',
-              //     // 按钮的属性
-              //     attrs: {
-              //       type: 'text'
-              //     },
-              //     // click事件
-              //     click(scope) {
-              //       /* eslint-disable */
-              //       console.log(scope)
-              //     }
-              //   }
-              // ],
-              // 表格列
               columns: [
                 {
                   // el-table-column 的属性
@@ -118,12 +105,20 @@ export default {
                       placeholder: '标准拧紧力'
                     }
                   }
+                },
+                 {
+                  prop: 'real_preload',
+                  label: '扭矩力',
+                  content: {
+                    // type 可以为全局注册的组件名或者组件引用
+                    type: 'el-input',
+                    // attrs 是组件的属性
+                    attrs: {
+                      placeholder: '扭矩力'
+                    }
+                  }
                 }
-              ],
-              // 新行默认值
-              newColumnValue: {
-                step: '1',
-              }
+              ]
             }
           }
         
@@ -137,6 +132,7 @@ export default {
   },
   methods: {
     handleFormSubmit(data) {
+  
       this.$parent.handleSubmit();
     },
     handleRequest(data) {

src/views/device/synscheme/index.vue

@@ -109,18 +109,6 @@
               @click="handleUpdate(record.row)"
             ></el-button>
           </el-tooltip>
-          <el-tooltip
-            content="查看"
-            placement="top"
-            :enterable="false"
-          >
-            <el-button
-              type="primary"
-              size="mini"
-              icon="el-icon-view"
-              @click="handleDetail(record.row)"
-            ></el-button>
-          </el-tooltip>
         </template>
       </el-table-column>
     </el-table>
@@ -185,15 +173,13 @@
 <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'
 export default {
   name: "synscheme",
   directives: { action },
   mixins: [rlListOperate],
   components: {
-    formModel,
-    detail,
+    formModel
   },
   data() {
     return {

src/views/wind/fan/formModel.vue

@@ -98,7 +98,6 @@ export default {
                 },
               limit: 3,
               fileSize: 3,
-              drag: true,
               action: process.env.VUE_APP_BASE_API+'/osspolicy',
               responseFn (response, file) {
                 return file.url