Ver código fonte

dev2 max-cpu

yuedefeng 6 anos atrás
pai
commit
1b35a305ac

+ 1 - 1
src/dashoo.cn/frontend_web/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "dev": "nuxt",
-    "dev2": "nuxt -c nuxt.config.ignore.js",
+    "dev2": "nuxt --max-old-space-size=4096 -c nuxt.config.ignore.js",
     "build": "nuxt build",
     "build2": "nuxt build -c nuxt.config.ignore.js --spa",
     "start": "cross-env HOST=0.0.0.0 PORT=9605 nuxt start",

+ 2 - 1
src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datalist.vue

@@ -12,9 +12,10 @@
         </el-breadcrumb>
 
         <span style="float: right;">
+          <el-button type="plain" size="mini" style="margin-right:20px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
           <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
                      <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 

+ 6 - 5
src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -92,35 +92,36 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="8">
-            <el-form-item label="存储介质">
+            <el-form-item label="压力分级">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
                 <template slot="append">℃</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="压力分级">
+            <el-form-item label="正开启压力">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
                 <template slot="append">℃</template>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="开启压力">
+            <el-form-item label="开启压力">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
                 <template slot="append">℃</template>
               </el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
-            <el-form-item label="负开启压力">
+            <el-form-item label="存储介质">
               <el-input v-model="formData.Temperature" placeholder="请输入" style="width: 100%">
                 <template slot="append">℃</template>
               </el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
             <el-form-item prop="Status" label="产品状态" :rules="[{ required: true, message: '产品状态不能为空'}]">
               <el-select ref="selectStatus" v-model="formData.Status" placeholder="请选择"