Merge remote-tracking branch 'origin/master'

backend/src/dashoo.cn/modi_webapi/app/api/instrument/instrument.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gvalid"
+	"time"
 )
 
 type Controller struct {
@@ -69,7 +70,6 @@ func (c *Controller) GetOneInstrument(r *ghttp.Request) {
 
 func (c *Controller) AddInstrument(r *ghttp.Request) {
 	Instrument := new(instrument.Entity)
-	fmt.Println("---Instrument---", Instrument)
 	if err := r.Parse(Instrument); err != nil {
 		// 数据验证错误
 		if v, ok := err.(*gvalid.Error); ok {
@@ -92,15 +92,16 @@ func (c *Controller) AddInstrument(r *ghttp.Request) {
 	Instrument.ModifiedOn = currentTime
 	Instrument.ModifiedBy = realName
 	Instrument.ModifiedUserId = userId
-
+	hh, _ := time.ParseDuration("1h")
+	Instrument.CalibrationTime = Instrument.CalibrationTime.Add(hh*8)
 	if result, err := instrument.Insert(Instrument); err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, 1, "保存失败")
 	} else {
 		var records response.PagedRecords
 		id, _ := result.LastInsertId()
 		Instrument.Id = int(id)
 		records.Records = Instrument
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "保存成功", records)
 	}
 }
 
@@ -124,15 +125,16 @@ func (c *Controller) UpdateInstrument(r *ghttp.Request) {
 	Instrument.ModifiedOn = currentTime
 	Instrument.ModifiedBy = realName
 	Instrument.ModifiedUserId = userId
-
+	hh, _ := time.ParseDuration("1h")
+	Instrument.CalibrationTime = Instrument.CalibrationTime.Add(hh*8)
 	if _, err := instrument.Replace(Instrument); err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, 1, "保存失败")
 	} else {
 		var records response.PagedRecords
 		//id, _ := result.LastInsertId()
 		//theChargeRecord.Id = int(id)
 		records.Records = Instrument
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "保存成功", records)
 	}
 }
 

backend/src/dashoo.cn/modi_webapi/config/config.toml

@@ -13,12 +13,12 @@
     [[database.default]]
         Debug = true
 #          link = "mysql:modi_user:Y6Ba64w1Hezo@tcp(39.98.34.197:3307)/modi_db"
-        link = "mysql:l_lims_u:TmBT65FNAAqJoBMl@tcp(rm-8vbk16zx2rbfu6jt6uo.mysql.zhangbei.rds.aliyuncs.com)/l_lims"
+        link = "mysql:l_lims_demo_u:365yjd375TTDpPa7@tcp(sh-cdb-jecu4azm.sql.tencentcdb.com:60583)/l_lims_demo"
     [[database.CU6zmPWhZp]]
         Debug = true
 #          link = "mysql:modi_user:Y6Ba64w1Hezo@tcp(39.98.34.197:3307)/modi_db"
-        link = "mysql:l_lims_u:TmBT65FNAAqJoBMl@tcp(rm-8vbk16zx2rbfu6jt6uo.mysql.zhangbei.rds.aliyuncs.com)/l_lims"
-
+       # link = "mysql:l_lims_u:TmBT65FNAAqJoBMl@tcp(rm-8vbk16zx2rbfu6jt6uo.mysql.zhangbei.rds.aliyuncs.com)/l_lims"
+           link = "mysql:l_lims_demo_u:365yjd375TTDpPa7@tcp(sh-cdb-jecu4azm.sql.tencentcdb.com:60583)/l_lims_demo"
 # Redis数据库配置
 [redis]
     default = "127.0.0.1:16379,0,soccer"

frontend_web/.env

@@ -4,17 +4,17 @@
 VUE_APP_TITLE=Lims
 
 # 登录验证地址
-VUE_APP_LOGINAPI=http://192.168.0.252:12005/login
-VUE_APP_LOGOUTAPI=http://192.168.0.252:12005/logout
+VUE_APP_LOGINAPI=http://81.68.138.114:24006/login
+VUE_APP_LOGOUTAPI=http://81.68.138.114:24006/logout
 
 # 网络请求公用地址
 #VUE_APP_API=http://39.98.34.197:9905/api/
-VUE_APP_API=http://192.168.0.252:12005/api/
+VUE_APP_API=http://81.68.138.114:24006/api/
 #VUE_APP_API=http://localhost:9635/api/
 
 # 第二后端API地址
 #VUE_APP_API02=http://39.98.34.197:9915/api/
-VUE_APP_API02=http://192.168.0.252:12002/api/
+VUE_APP_API02=http://81.68.138.114:24007/api/
 #VUE_APP_API02=http://127.0.0.1:9635/api/
 
 # 分模块地址

frontend_web/src/layout/header-aside/layout.vue

@@ -38,7 +38,7 @@
         <div class="d2-header-right"
              flex-box="0">
           <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
-          <d2-header-search @click="handleSearchClick" />
+          <!-- <d2-header-search @click="handleSearchClick" /> -->
           <!--<d2-header-log/>-->
           <d2-header-fullscreen />
           <d2-header-theme />
@@ -106,7 +106,7 @@ import d2MenuSide from './components/menu-side'
 import d2MenuHeader from './components/menu-header'
 import d2Tabs from './components/tabs'
 import d2HeaderFullscreen from './components/header-fullscreen'
-import d2HeaderSearch from './components/header-search'
+// import d2HeaderSearch from './components/header-search'
 import d2HeaderSize from './components/header-size'
 import d2HeaderTheme from './components/header-theme'
 import d2HeaderUser from './components/header-user'
@@ -123,7 +123,7 @@ export default {
     d2MenuHeader,
     d2Tabs,
     d2HeaderFullscreen,
-    d2HeaderSearch,
+    // d2HeaderSearch,
     d2HeaderSize,
     d2HeaderTheme,
     d2HeaderUser

frontend_web/src/setting.js

@@ -35,13 +35,13 @@ export default {
         title: 'd2 经典',
         name: 'd2blue',
         preview: 'image/theme/d2blue/preview@2x.png'
-      },
-      {
-        title: 'dashoo 天空蓝',
-        name: 'dashoo',
-        preview: 'image/theme/dashoo/preview@2x.png'
       }
       // {
+      //   title: 'dashoo 天空蓝',
+      //   name: 'dashoo',
+      //   preview: 'image/theme/dashoo/preview@2x.png'
+      // }
+      // {
       //   title: '经典',
       //   name: 'd2',
       //   preview: 'image/theme/d2/preview@2x.png'

frontend_web/src/views/instrument/components/instrumentadd.vue

@@ -21,7 +21,6 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="设备名称"
-                        required
                         prop="Name"
                         label-width="120px">
             <el-input v-model="testlistform.Name"
@@ -62,30 +61,12 @@
                         label-width="120px"
                         prop="CalibrationTime">
             <el-date-picker v-model="testlistform.CalibrationTime"
-                            type="date"
+                            type="datetime"
                             style="width:100%"
                             placeholder="请选择校验日期">
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="校验使用期限"
-                        label-width="120px">
-            <!-- <el-input    v-model="testlistform.CalibrationDeadline" placeholder="请输入校验使用期限" style="width: 49%"></el-input> -->
-            <el-input-number v-model="testlistform.CalibrationDeadline"
-                             :min="1"
-                             style="width:59%"></el-input-number>
-            <el-select v-model="testlistform.CalibrationDeadlineType"
-                       style="width: 39%;float:right">
-              <el-option v-for="item in timeType"
-                         :key="item.Id"
-                         :label="item.stateName"
-                         :value="item.Id">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="责任人"
                         label-width="120px">
@@ -208,7 +189,6 @@ export default {
         Id: 4
       }],
       rulestestlistform: {
-
         Code: [{
           required: true,
           message: '请输入设备编码',
@@ -218,37 +198,27 @@ export default {
           required: true,
           message: '请输入设备名称',
           trigger: 'blur'
+        }],
+        Model: [{
+          required: true,
+          message: '请输入型号',
+          trigger: 'blur'
+        }],
+        Brand: [{
+          required: true,
+          message: '请输入品牌名称',
+          trigger: 'blur'
+        }],
+        State: [{
+          required: true,
+          message: '请输入设备状态',
+          trigger: 'blur'
+        }],
+        Classification: [{
+          required: true,
+          message: '请输入设备大类',
+          trigger: 'blur'
         }]
-        // SupplierId: [{
-        //   required: true,
-        //   message: '请选择供应商',
-        //   trigger: 'blur'
-        // }],
-        // Model: [{
-        //   required: true,
-        //   message: '请输入型号',
-        //   trigger: 'blur'
-        // }],
-        // Spec: [{
-        //   required: true,
-        //   message: '请输入规格',
-        //   trigger: 'blur'
-        // }],
-        // Brand: [{
-        //   required: true,
-        //   message: '请输入品牌名称',
-        //   trigger: 'blur'
-        // }],
-        // Classification: [{
-        //   required: true,
-        //   message: '请输入设备大类',
-        //   trigger: 'blur'
-        // }],
-        // State: [{
-        //   required: true,
-        //   message: '请输入设备状态',
-        //   trigger: 'blur'
-        // }]
       }
     }
   },
@@ -265,116 +235,42 @@ export default {
       }
       getRoomNumber(params)
         .then(res => {
-          // for (let type of res.info) {
-          //   _this.typeList[type.Value] = type.RoomType
-          // }
           _this.typeList = res.info
-          // this.searchroomdata()
         })
         .catch(err => {
           console.error(err)
         })
     },
-    // 操作规程文件上传
-    uploadrequest (option) {
+    savedata () {
       let _this = this
-      axios.post(this.$uploadFile, {})
-        .then(function (res) {
-          if (res.data && res.data.fid && res.data.fid !== '') {
-            option.action = `http://${res.data.url}/${res.data.fid}`
-            _this.uploadFile = {
-              uid: option.file.uid,
-              url: res.data.publicUrl,
-              fid: res.data.fid
-            }
-            uploadajax(option)
-          } else {
-            _this.$message({
-              type: 'warning',
-              message: '未上传成功！请刷新界面重新上传！'
+      this.$refs.testlistform.validate(valid => {
+        if (valid) {
+          InstrumentApi.AddInstrument(this.testlistform, {})
+            .then(res => {
+              _this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              // this.$emit('closeAddDialog')
+              this.dialogvisible = false
+              this.handleCloseAdd()
+              this.$refs['testlistform'].resetFields()
+              // this.testlistform = []
+              // this.fileList = []
+              // 刷新
             })
-          }
-        })
-        .catch(function (error) {
-          console.log(error)
-          _this.$message({
-            type: 'warning',
-            message: '未上传成功！请重新上传！'
-          })
-        })
-    },
-    handleRemove (file, fileList) {
-      this.testlistform.FileUrl = ''
-      this.testlistform.FileName = ''
-      this.FileUrl = {}
-    },
-    handleUploadSuccess (res, file) {
-      this.testlistform.FileUrl = `${this.uploadFile.url}/${this.uploadFile.fid}`
-      this.testlistform.FileName = file.name
-      this.FileUrl = URL.createObjectURL(file.raw)
-    },
-    savedata () {
-      InstrumentApi.AddInstrument(this.testlistform, {})
-        .then(res => {
-          this.$emit('closeAddDialog')
-          this.dialogvisible = false
-          this.testlistform = []
-          this.fileList = []
-          // 刷新
-        })
-        .catch(err => {
-          // handle error
-          console.error(err)
-        })
+            .catch(err => {
+              console.error(err)
+            })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
-    // // 保存
-    // getCode (formName) {
-    //   let _this = this
-    //   this.$refs[formName].validate((valid) => {
-    //     instrumentGetCode(_this.testlistform.Code)
-    //       .then(function (response) {
-    //         _this.total = response.info.items
-    //         if (_this.total === 0) {
-    //           _this.savedata()
-    //         } else {
-    //           _this.$message({
-    //             type: 'warning',
-    //             message: '设备编号已存在'
-    //           })
-    //         }
-    //         _this.refreshData()
-    //       })
-    //       .catch(function (error) {
-    //         console.log(error)
-    //       })
-    //   })
-    // },
     refreshData () {
       this.$emit('refreshData')
     },
-    // // 获取设备大类
-    // getclassificationlist () {
-    //   let _this = this
-    //   let params = {
-
-    //     code: 'InstrumentItem'
-    //   }
-    //   classificationlist(params)
-    //     .then(res => {
-    //       _this.classificationlist = res.info
-    //     })
-    // },
-    // 获取供应商
-    // getSupplier () {
-    //   let _this = this
-    //   let params = {
-    //     customerName: 'Supplier'
-    //   }
-    //   getsupplierlist(params)
-    //     .then(res => {
-    //       _this.getsupplierlist = res.info
-    //     })
-    // },
     closedialog () {
       this.dialogvisible = false
     },
@@ -384,14 +280,10 @@ export default {
       this.testlistform.Code = ''
       this.testlistform.Name = ''
       this.testlistform.Brand = ''
-      this.testlistform.SupplierId = ''
-      this.testlistform.FactoryNum = ''
       this.testlistform.Responsible = ''
-      this.testlistform.CalibrationDeadline = 1
-      this.testlistform.MaintenCycle = 1
+      this.testlistform.Location = ''
       this.testlistform.Model = ''
       this.testlistform.Remarks = ''
-      this.testlistform.Classification = ''
       this.$emit('closeAddDialog')
     },
 
@@ -418,20 +310,6 @@ export default {
       var time = dates.getFullYear() + '-' + month + '-' + day
       return time
     }
-    // // 查询action
-    // getttriggernow (id, instumentid) {
-    //   gettriggerlist({}, id)
-    //     .then(res => {
-    //       let _this = this
-    //       _this.Advancetime = res.items.Advancetime
-    //       // 查询子表 有效期
-    //       _this.addTriggerl(instumentid, _this.testlistform.Code, _this.testlistform.TimeNotification, _this.testlistform.Name, _this.Advancetime, _this.testlistform.CalibrationTime, _this.testlistform.CalibrationDeadline, _this.testlistform.CalibrationDeadlineType)
-    //     })
-    //     .catch(err => {
-    //       console.error(err)
-    //     })
-    // }
-
   }
 }
 

frontend_web/src/views/instrument/components/instrumentedit.vue

@@ -10,26 +10,8 @@
              ref="testlistform">
       <el-row :gutter="20"
               class="donorsaddformcss">
-        <!-- <el-col :span="8">
-          <el-form-item label="设备大类"
-                        prop="Classification"
-                        label-width="120px">
-            <el-select ref="reftube"
-                       v-model="testlistform.Classification"
-                       placeholder="请输入设备大类"
-                       style="width:100%">
-              <el-option v-for="item in classificationlist"
-                         :label="item.Value"
-                         :value="item.Value"
-                         :key="item.Value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-        </el-col> -->
         <el-col :span="8">
           <el-form-item label="设备编码"
-                        required
                         prop="Code"
                         label-width="120px">
             <el-input v-model="testlistform.Code"
@@ -39,7 +21,6 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="设备名称"
-                        required
                         prop="Name"
                         label-width="120px">
             <el-input v-model="testlistform.Name"
@@ -50,7 +31,6 @@
 
         <el-col :span="8">
           <el-form-item label="型号"
-                        required
                         prop="Model"
                         label-width="120px">
             <el-input v-model="testlistform.Model"
@@ -68,27 +48,8 @@
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
-
-        <!-- <el-col :span="8">
-          <el-form-item label="供应商"
-                        prop="SupplierId"
-                        label-width="120px">
-            <el-select ref="reftube"
-                       v-model="testlistform.SupplierId"
-                       placeholder="请输入设备大类"
-                       style="width:100%">
-              <el-option v-for="item in getsupplierlist"
-                         :label="item.CustomerName"
-                         :value="item.Id"
-                         :key="item.Id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-
         <el-col :span="8">
           <el-form-item label="设备状态"
-                        required
                         prop="State"
                         label-width="120px">
             <el-select v-model="testlistform.State"
@@ -102,7 +63,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="校准时间"
                         label-width="120px"
@@ -114,26 +74,6 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="校准使用期限"
-                        label-width="120px">
-            <el-input v-model="testlistform.CalibrationDeadline"
-                      placeholder="请输入校准使用期限"
-                      style="width: 49%"></el-input>
-
-            <el-select v-model="testlistform.CalibrationDeadlineType"
-                       placeholder="请选择设备状态"
-                       style="width: 49%;float:right">
-              <el-option v-for="item in timeType"
-                         :key="item.Id"
-                         :label="item.stateName"
-                         :value="item.Id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
         <el-col :span="8">
           <el-form-item label="责任人"
                         label-width="120px">
@@ -142,7 +82,6 @@
             </el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="实验室位置"
                         prop="RoomType"
@@ -248,7 +187,6 @@ export default {
         Id: 4
       }],
       rulestestlistform: {
-
         Code: [{
           required: true,
           message: '请输入设备编码',
@@ -259,11 +197,6 @@ export default {
           message: '请输入设备名称',
           trigger: 'blur'
         }],
-        // Supplier: [{
-        //   required: true,
-        //   message: '请输入供应商',
-        //   trigger: 'blur'
-        // }],
         Model: [{
           required: true,
           message: '请输入型号',
@@ -301,9 +234,6 @@ export default {
       }
       getRoomNumber(params)
         .then(res => {
-          // for (let type of res.info) {
-          //   _this.typeList[type.Value] = type.RoomType
-          // }
           _this.typeList = res.info
           // this.searchroomdata()
         })
@@ -350,37 +280,29 @@ export default {
       this.FileUrl = URL.createObjectURL(file.raw)
     },
     savedata () {
-      InstrumentApi.UpdateInstrument(this.testlistform, {})
-        .then(res => {
-          // savedataedit(_this.testlistform.Id, _this.testlistform)
-          // _this.$axios.put('/instrument/saveeditinstument/' + _this.testlistform.Id, _this.testlistform)
-          // .then(res => {
-          // response
-          // if (res.info.code === 0) {
-          // if (_this.TimeNotification) {
-          //   // _this.getttriggernow(4802)
-          // }
-          // _this.$message({
-          //   type: 'success',
-          //   message: res.info.message
-          // })
-          // window.history.go(-1)
-          // } else {
-          // _this.$message({
-          //   type: 'warning',
-          //   message: res.info.message
-          // })
-          // }
-          this.dialogvisible = false
-          this.fileList = []
-          // 刷新
-          // this.$emit('initDatas')
-          this.$emit('closeEditDialog')
-        })
-        .catch(err => {
-          // handle error
-          console.error(err)
-        })
+      let _this = this
+      this.$refs.testlistform.validate(valid => {
+        if (valid) {
+          InstrumentApi.UpdateInstrument(this.testlistform, {})
+            .then(res => {
+              this.dialogvisible = false
+              _this.$message({
+                type: 'success',
+                message: '保存成功'
+              })
+              // 刷新
+              // this.$emit('initDatas')
+              this.$emit('closeEditDialog')
+            })
+            .catch(err => {
+              // handle error
+              console.error(err)
+            })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
     getEntity (pid) {
       let _this = this
@@ -390,7 +312,7 @@ export default {
       InstrumentApi.getOneInstrument(query)
         .then(response => {
           _this.testlistform = response.records
-          _this.testlistform.CalibrationTime = new Date(response.CalibrationTime)
+          // _this.testlistform.CalibrationTime = new Date(response.CalibrationTime)
           if (_this.testlistform.FileName !== '') {
             let file = {
               name: _this.testlistform.FileName,

frontend_web/src/views/instrument/confirmandscrap/_opera/add.vue

@@ -15,7 +15,6 @@
 
           <el-col :span="24">
             <el-form-item label="设备名称"
-                          required
                           prop="InstrumenId"
                           label-width="90px">
               <el-select ref="InstrumenId"
@@ -35,7 +34,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作人"
-                          required
                           prop="OperaUser"
                           label-width="90px">
               <el-input v-model="testlistform.OperaUser"
@@ -46,7 +44,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作类型"
-                          required
                           prop="OperaTpye"
                           label-width="90px">
               <el-select ref="reftube"
@@ -166,7 +163,7 @@ export default {
         }],
         OperaOn: [{
           required: true,
-          message: '请输入品牌名称',
+          message: '请输入操作日期',
           trigger: 'blur'
         }]
 

frontend_web/src/views/instrument/confirmandscrap/_opera/edit.vue

@@ -15,7 +15,6 @@
 
           <el-col :span="24">
             <el-form-item label="设备名称"
-                          required
                           prop="InstrumenId"
                           label-width="90px">
               <el-select ref="InstrumenId"
@@ -36,7 +35,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作人"
-                          required
                           prop="OperaUser"
                           label-width="90px">
               <el-input v-model="testlistform.OperaUser"
@@ -47,7 +45,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作类型"
-                          required
                           prop="OperaTpye"
                           label-width="90px">
               <el-select ref="reftube"
@@ -177,7 +174,7 @@ export default {
         }],
         OperaOn: [{
           required: true,
-          message: '请输入品牌名称',
+          message: '请输入操作日期',
           trigger: 'blur'
         }]
 

frontend_web/src/views/instrument/confirmandscrap/index.vue

@@ -209,6 +209,7 @@ export default {
     // 添加  返回当前页面
     handleCloseAdd () {
       this.$refs.addmaintain.dialogvisible = false
+      console.log('-0------handleCloseAdd---')
       this.searchdata()
     },
     // 编辑  返回当前页面

frontend_web/src/views/instrument/index.vue

@@ -13,9 +13,6 @@
                     v-model="search.Name"
                     placeholder="请输入设备名称"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="创建时间" class="sbutton_margin">
-          <el-date-picker   style="width: 220px" v-model="CalibrationTime" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束日期"></el-date-picker>
-        </el-form-item> -->
         <el-button size="mini"
                    type="primary"
                    @click="initDatas()"
@@ -46,8 +43,6 @@
                        align="center"
                        fixed='right'>
         <template slot-scope="scope">
-          <!-- <router-link :to="'/instrument/' + scope.row.Id + '/instrumentedit'"> -->
-          <!-- <router-link :to="'/instrument/instrumentdetails?id='+scope.row.Id +''"> -->
           <el-button size="mini"
                      title="编辑"
                      type="primary"
@@ -62,29 +57,6 @@
                      style="margin-left:5px;"
                      icon="el-icon-delete"
                      circle></el-button>
-          <!-- <router-link :to="'/instrument/maintainlog?id='+scope.row.Id +''">
-              <el-button size="mini"   title="质量管理" type="warning" style="margin-left:5px;" icon="fa fa-flask" circle>
-              </el-button>
-            </router-link>
-            <router-link :to="'/instrument/instrumenrunrecord?id='+scope.row.Id +''">
-              <el-button size="mini"   title="运行记录" type="warning" style="margin-left:5px;" icon="fa fa-tachometer" circle>
-              </el-button>
-            </router-link> -->
-          <!-- <el-dropdown>
-                <el-button size="mini"   type="success" >
-                  更多
-                  <i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu slot="dropdown">
-
-                  <el-dropdown-item>
-
-                  </el-dropdown-item>
-                  <el-dropdown-item>
-
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown> -->
         </template>
       </el-table-column>
       <el-table-column prop="Code"
@@ -269,14 +241,6 @@ export default {
       if (!_this.CalibrationTime) {
         _this.CalibrationTime = []
       }
-      // 解析时间
-      // if (_this.CalibrationTime.length === 2) {
-      //   _this.CalibrationTime[1].setHours(23)
-      //   _this.CalibrationTime[1].setMinutes(59)
-      //   _this.CalibrationTime[1].setSeconds(59)
-      //   CalibrationTime.push(_this.formatDateTime(_this.CalibrationTime[0]))
-      //   CalibrationTime.push(_this.formatDateTime(_this.CalibrationTime[1]))
-      // }
       let params = {
         current: this.currpage,
         size: this.size,
@@ -287,7 +251,6 @@ export default {
       }
       InstrumentApi.getAllInstrument(params)
         .then(res => {
-          console.log('-----res---', res)
           _this.activities = res.records
           _this.totalsize = res.total
         })
@@ -321,19 +284,6 @@ export default {
       var date = (date2.getTime() - date1.getTime()) / (1000 * 60 * 60 * 24)/* 不用考虑闰年否 */
       return parseInt(date)
     },
-    // // 获取设备大类
-    // getclassificationlist () {
-    //   let _this = this
-    //   let params = {
-
-    //     code: 'InstrumentItem'
-    //   }
-    //   // _this.$axios.get('/items/worditem?code=InstrumentItem', {})
-    //   classificationlist(params)
-    //     .then(res => {
-    //       _this.classificationlist = res.info
-    //     })
-    // },
 
     deleteinstrument (val) {
       let _this = this

frontend_web/src/views/instrument/maintainlog/_opera/add.vue

@@ -15,7 +15,6 @@
 
           <el-col :span="24">
             <el-form-item label="设备名称"
-                          required
                           prop="InstrumenId"
                           label-width="80px">
               <el-select ref="InstrumenId"
@@ -35,7 +34,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作人"
-                          required
                           prop="OperaUser"
                           label-width="80px">
               <el-input v-model="testlistform.OperaUser"
@@ -46,7 +44,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作类型"
-                          required
                           prop="OperaTpye"
                           label-width="80px">
               <el-select ref="reftube"
@@ -198,7 +195,7 @@ export default {
         }],
         OperaOn: [{
           required: true,
-          message: '请输入品牌名称',
+          message: '请输入操作日期',
           trigger: 'blur'
         }]
 

frontend_web/src/views/instrument/maintainlog/_opera/edit.vue

@@ -15,7 +15,6 @@
 
           <el-col :span="24">
             <el-form-item label="设备名称"
-                          required
                           prop="InstrumenId"
                           label-width="80px">
               <el-select ref="InstrumenId"
@@ -36,7 +35,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作人"
-                          required
                           prop="OperaUser"
                           label-width="80px">
               <el-input v-model="testlistform.OperaUser"
@@ -47,7 +45,6 @@
 
           <el-col :span="24">
             <el-form-item label="操作类型"
-                          required
                           prop="OperaTpye"
                           label-width="80px">
               <el-select ref="reftube"
@@ -177,7 +174,7 @@ export default {
         }],
         OperaOn: [{
           required: true,
-          message: '请输入品牌名称',
+          message: '请输入操作日期',
           trigger: 'blur'
         }]
 

frontend_web/src/views/managingrooms/_opera/add.vue

@@ -156,7 +156,6 @@ export default {
     // 保存实验室信息
     savedata () {
       let _this = this
-      console.log('-----_this.testlistform-----', _this.testlistform)
       saveroomdata(_this.testlistform)
         .then(res => {
           this.dialogvisible = false