委托单位检索 console.log

src/dashoo.cn/backend/api/controllers/lims/limsreportelecground.go

@@ -222,11 +222,15 @@ func (this *LimsReportElecGroundController) GetAllGradeInfo() {
 	where := "Id=" + customerId
 	svc.GetEntitysByWhere(this.User.AccCode + CustomerName,where, &customer)
 
-	// 三级单位==受检单位
+	//// 三级单位==受检单位
+	//var thrunits []organize.Base_Organize
+	//if customer != nil && len(customer) > 0 {
+	//	thrunits = svc.GetAllThirdChildByTopId(customer[0].DepartmentId, "")
+	//}
 	var thrunits []organize.Base_Organize
-	if customer != nil && len(customer) > 0 {
-		thrunits = svc.GetAllThirdChildByTopId(customer[0].DepartmentId, "")
-	}
+	where = "Id IN (SELECT DISTINCT(ThrUnitId) FROM s5OVELimsCustomerPosition WHERE CustomerId=" + customerId + " AND ThrUnitId != 0)"
+	svc.GetEntities(&thrunits, where)
+
 
 	thrunitIds := ""
 	for _,org := range thrunits {

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage.vue

@@ -44,18 +44,18 @@
                   <div class="ulbgcolor" v-for="g in Math.ceil(selectdtedanguan.ColumnNum / 21)" style="width:50px;float:left;margin-left:1px">
                     <div v-for="b in selectdtedanguan.ColumnNum">
                       <div class="hoverdiv" v-if="(b <= g*21) && (b > (g - 1)*21)" @click="handleclk(b-1, 0, selectdtedanguan.YStation, selectdtedanguan.XStation)"
-                        v-bind:style="{ 
-                        backgroundColor: xbox == b && ybox == 1 && 
-                        xshelf == selectdtedanguan.YStation && yshelf == selectdtedanguan.XStation ? COLORARR[2] : 
-                        (selectdtedanguan['A'+b] == -2 ? COLORARR[0] : 
-                        (selectdtedanguan['A'+b] == -1 ? COLORARR[1] : 
-                        (selectdtedanguan['A'+b] > 0 && 
-                        selectdtedanguan['A'+b] <= 25 ? COLORARR[3] : 
-                        (selectdtedanguan['A'+b] > 25 && 
-                        selectdtedanguan['A'+b] <= 50 ? COLORARR[4] : 
-                        (selectdtedanguan['A'+b] > 50 && 
-                        selectdtedanguan['A'+b] <= 75 ? COLORARR[5] : 
-                        (selectdtedanguan['A'+b] > 75 ? COLORARR[6] : 
+                        v-bind:style="{
+                        backgroundColor: xbox == b && ybox == 1 &&
+                        xshelf == selectdtedanguan.YStation && yshelf == selectdtedanguan.XStation ? COLORARR[2] :
+                        (selectdtedanguan['A'+b] == -2 ? COLORARR[0] :
+                        (selectdtedanguan['A'+b] == -1 ? COLORARR[1] :
+                        (selectdtedanguan['A'+b] > 0 &&
+                        selectdtedanguan['A'+b] <= 25 ? COLORARR[3] :
+                        (selectdtedanguan['A'+b] > 25 &&
+                        selectdtedanguan['A'+b] <= 50 ? COLORARR[4] :
+                        (selectdtedanguan['A'+b] > 50 &&
+                        selectdtedanguan['A'+b] <= 75 ? COLORARR[5] :
+                        (selectdtedanguan['A'+b] > 75 ? COLORARR[6] :
                         COLORARR[7])))))) }"
                         style="margin: 1px;width:50px; height:20px;"></div>
                     </div>
@@ -78,20 +78,20 @@
                           <div v-if="samplelist[index].XStation === k2+1 && samplelist[index].YStation === k1+1">
                             <div v-for="rowindex in samplelist[index].RowNum">
                               <div class="hoverdiv" v-for=" colindex in samplelist[index].ColumnNum">
-                                <div v-bind:style="{ 
+                                <div v-bind:style="{
                                 width: (unitwidth/colorTableWidth/samplelist[index].ColumnNum-2.5) + 'px',
                                 height: (unitheight/colorTableHeight/samplelist[index].RowNum-2.5) + 'px',
-                                backgroundColor: xbox == colindex && ybox == rowindex && 
-                                xshelf == k1+1 && yshelf == k2+1 ? COLORARR[2] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -2 ? COLORARR[0] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -1 ? COLORARR[1] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 0 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 25 ? COLORARR[3] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 25 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 50 ? COLORARR[4] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 50 && 
-                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 75 ? COLORARR[5] : 
-                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 75 ? COLORARR[6] : 
+                                backgroundColor: xbox == colindex && ybox == rowindex &&
+                                xshelf == k1+1 && yshelf == k2+1 ? COLORARR[2] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -2 ? COLORARR[0] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] == -1 ? COLORARR[1] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 0 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 25 ? COLORARR[3] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 25 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 50 ? COLORARR[4] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 50 &&
+                                samplelist[index][numtoengs[rowindex-1]+colindex] <= 75 ? COLORARR[5] :
+                                (samplelist[index][numtoengs[rowindex-1]+colindex] > 75 ? COLORARR[6] :
                                 COLORARR[7])))))) }"
                                   style="margin: 1px" @click="handleclk(colindex-1, rowindex-1, k1+1, k2+1)"></div>
                               </div>
@@ -632,7 +632,7 @@
             return false // time.getTime() < Date.now() - 8.64e7
           }
         },
-        
+
         groupList: [],
         GroupIdOption: [],
         GroupId: '',
@@ -1170,7 +1170,6 @@
         _this.$axios.get('/sampleorgan/gettreelist', {})
           .then(res => {
             _this.organlist2 = window.toolfun_gettreejson(res.data, 'id', 'pId', 'id,name,code')
-            console.log("1111",_this.organlist2)
           })
           .catch(err => {
             // handle error
@@ -1340,7 +1339,7 @@
            } else {
             this.fristseach = false
           }
-        }    
+        }
         this.dchxtable = y
         this.dchytable = x
         this.xtable = x
@@ -1444,7 +1443,7 @@
             }
           })
       },
-      
+
       gettykzandtovalue(val) {
         // 获取特有扩展并赋值
         if (val && val.SampleType > 0) {
@@ -1460,7 +1459,7 @@
             })
         }
       },
-     
+
       getautobarcode(samptype, samporg) {
         // 获取自动编码
         let _this = this
@@ -2044,7 +2043,7 @@
             // 清空上传数据
             this.$refs.refuploadattach.clearFiles()
             this.achmentlist = []
-          }     
+          }
       },
       deletedata() {
         let _this = this
@@ -2157,8 +2156,8 @@
             type: 'warning',
             message: '请先添加冻存盒!'
           })
-          return 
-        } 
+          return
+        }
 
         let _this = this
         _this.$axios.get('/sampleoperation/templateNames', {})
@@ -2401,7 +2400,6 @@
         this.imagefiles = ''
       },
       handleRemove(file, fileList) {
-        console.log(this.imagefilelist);
         for (var i = 0; i < this.imagefilelist.length; i++) {
           if (this.imagefilelist[i].uid != file.uid) {
             this.imagenewlist = this.imagenewlist + this.imagefilelist[i].url.substring(7, 42) + `|`
@@ -2413,7 +2411,7 @@
           }
         }
       },
-      
+
       getGrouplist() {
         let _this = this
         _this.$axios.get('/samplesgroup/grouplist', {})

src/dashoo.cn/frontend_web/src/pages/instrument/_opera/instrumentedit.vue

@@ -78,7 +78,7 @@
           </el-col>
 
 
-          
+
 
             <el-col :span="8">
               <el-form-item label="校准使用期限" label-width="120px">
@@ -195,7 +195,7 @@
           //   required: true,
           //   message: '请输入设备状态',
           //   trigger: 'blur'
-          // }], 
+          // }],
           // Classification: [{
           //   required: true,
           //   message: '请输入设备大类',
@@ -249,10 +249,9 @@
         let _this = this
         _this.$axios.get('/instrument/editinstumentinfo/' + pid)
           .then(function (response) {
-            
+
             _this.testlistform = response.data
-            console.log("=============",)
-            
+
         _this.testlistform.CalibrationTime=new Date(response.data.CalibrationTime)
         //_this.mainForm.HeartbeatTime=new Date(res.data.items.HeartbeatTime)
           })
@@ -266,7 +265,7 @@
           })
       }
 
-      
+
     }
   }
 

src/dashoo.cn/frontend_web/src/pages/instrument/index.vue

@@ -362,7 +362,6 @@
       },
       //增加证书
       savecertify() {
-        console.log("----this.certifForm--",this.certifForm)
         api.addEntity(this.certifForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/lims/createreport/_opera/office_report.vue

@@ -39,7 +39,6 @@
       let _this = this
       _this.key = this.$route.params.opera
       _this.Address =  this.$route.query.Address
-      console.log("------------doc-------------",_this.key,_this.Address)
     },
     mounted() {
       // initial data
@@ -141,7 +140,6 @@
         // strArr.push(data.substr(4, 2))
         // strArr.push(data.substr(6, 2))
         _this.currentdate = year + "" + month + "" + strDate
-        console.log("-----data----", _this.currentdate)
       },
 
     }

src/dashoo.cn/frontend_web/src/pages/lims/createreport/_opera/operation.vue

@@ -355,7 +355,6 @@
           })
           return
         }
-        console.log("------list---",this.reportList)
         api.createReport(this.reportList, this.$axios)
                 .then(res => {
                   // response

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/_opera/office.vue

@@ -48,7 +48,6 @@
       this.RealName = this.$route.query.RealName
       this.edit = this.$route.query.Edit
       this.docurl = this.$route.query.Address
-      console.log("------------doc-------------",this.key,this.DocId,this.DocType,this.edit)
     },
     mounted() {
       // initial data
@@ -58,7 +57,6 @@
     methods: {
 
       onlyoffice_test(mykey) {
-        console.log("----------this.DocType-----",this.docurl)
         let config = {
           document: {
             fileType: "xlsx",

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/_opera/office_history.vue

@@ -37,10 +37,8 @@
       }
     },
     created() {
-      console.log("------------doc-------------",this.$route.query)
       this.key = this.$route.params.opera
       this.Address =  this.$route.query.Address
-      console.log("------------doc-------------",this.key,this.Address)
     },
     mounted() {
       // initial data
@@ -142,7 +140,6 @@
         // strArr.push(data.substr(4, 2))
         // strArr.push(data.substr(6, 2))
         _this.currentdate = year + "" + month + "" + strDate
-        console.log("-----data----", _this.currentdate)
       },
 
     }

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/alltask.vue

@@ -465,7 +465,6 @@ export default {
         })
           .then(res => {
             _this.taskbalacelist = res.data.items
-            console.log('------task---', _this.taskbalacelist)
             _this.currentItemCount = res.data.currentItemCount
           })
           .catch(err => {
@@ -522,7 +521,6 @@ export default {
         return cmd
       },
       handleChange (value) {
-        console.log(value)
       },
       // 工具下载
       tooldownload () {
@@ -560,7 +558,6 @@ export default {
           }) */
       },
       ViewDocPdf (row) {
-        console.log('--------row---', row)
         api.docexport(row.Id, this.$axios)
           .then(res => {
             // response
@@ -568,7 +565,6 @@ export default {
               let docurl = res.data.item
               let furl = docurl.DocUrl
               this.changepdfpage(row, furl)
-              console.log(res.data.item)
             }
           }).catch(err => {
             console.error(err)
@@ -583,7 +579,6 @@ export default {
           dataentryId: row.Id,
           docname: row.DocName
         }
-        console.log('---queryParams-----', queryParams)
         _this.$router.push({
           path: '/lims/dataentry/docviewframe',
           query: queryParams
@@ -606,11 +601,9 @@ export default {
           })
       },
       datadownload (val) {
-        console.log('--------val0----', val)
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
-            console.log('-----reponse=---', res.date)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
@@ -621,7 +614,6 @@ export default {
               let furl = docurl.DocAddress
               let fdocurl = docurl.DocUrl
               let fname = docurl.DocName
-              console.log('---------docurl', res.data.item.DocUrl)
               location.href = 'http://' + fdocurl
             }
           }).catch(err => {
@@ -630,11 +622,9 @@ export default {
       },
       // 数据录入导出
       docdownload (val) {
-        console.log('--------val0----', val)
         api.docexport(val.Id, this.$axios)
           .then(res => {
             // response
-            console.log('-----reponse=---', res.date)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
@@ -644,7 +634,6 @@ export default {
               this.dataentryid = docurl.DataEntryId
               let furl = docurl.DocAddress
               let fname = docurl.DocName
-              console.log('---------docurl', res.data.item.DocUrl)
               location.href = 'petrotool://furl=' + furl + '&fname=' + fname + '&doctype=data&id=' + this.dataentryid +
                 '&act=edit'
           }
@@ -882,7 +871,6 @@ export default {
         }
       },
       handleselectentry (val) {
-        console.log('------val--', val)
         let params = {
           eid: this.eid,
           tbid: this.tbid,
@@ -1151,7 +1139,6 @@ export default {
       },
       historyhandleCurrentChange (value) {
         this.historycurrentPage = value
-        console.log('-----page---', value)
         this.refreshdataentrydata()
       },
       historyhandleSizeChange (value) {

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/docviewframe.vue

@@ -49,7 +49,6 @@
       this.key = this.$route.query.key+''+Date.parse(new Date())
       this.docurl = this.$route.query.docurl
       this.docname = this.$route.query.docname
-      console.log("-----this.docname1----",this.docname)
       this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
 
     },

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/onlyofficesframe.vue

@@ -93,7 +93,6 @@ export default {
       // this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
       this.iframeSrc = './pdfshow?key=' + this.key + '&docurl=http://' + this.docurl + '&docname=' + this.docname
       // this.iframeSrc = "http://" + this.docurl
-      console.log('------ifane===', this.iframeSrc)
     },
     methods: {
       // 返回

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/onlyofficeshow.vue

@@ -42,7 +42,6 @@
     created() {
       this.key = this.$route.query.key
       this.docurl = this.$route.query.docurl
-      console.log("----docurl",this.docurl)
     },
     mounted() {
       // initial data

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/pdfshow.vue

@@ -29,7 +29,6 @@
         addressUrl: this.docurl
       }
       this.docnamear = this.docname.split(".")
-      console.log("-----this.docnamear[1]---",this.docnamear[1])
       if (this.docnamear[1] == "xlsx") {
         this.$axios.post('limsdataentry/excel-to-pdf', params)
           .then(function (res) {

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/showreportframe.vue

@@ -67,7 +67,6 @@
       this.docname = this.$route.query.docname
       //this.iframeSrc = "./onlyofficeshow?key=" + this.key + "&docurl=http://" + this.docurl
       this.iframeSrc = "./pdfshow?key=" + this.key + "&docurl=http://" + this.docurl +"&docname=" + this.docname
-      console.log("------ifane===",this.iframeSrc)
 
     },
     methods: {

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -462,7 +462,6 @@
       // 数据录入添加确认按钮
       makesureaddata () {
         this.adddataentryFrom.ConUserBy = this.$refs.selectConUserId.selectedLabel + ''
-        console.log('-----dataentryfrom---', this.adddataentryFrom)
         api.adddataentry(this.adddataentryFrom, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.$message({
@@ -576,7 +575,6 @@
               let docurl = res.data.item
               let furl = docurl.DocUrl
               this.changepage(row, furl)
-              console.log(res.data.item)
             }
           }).catch(err => {
             console.error(err)
@@ -608,7 +606,6 @@
         this.historyVisible = true
       },
       handleChange (value) {
-        console.log(value)
       },
       OpenOrignDataInput (row) {
         this.CheckStatus = row.CheckStatus
@@ -647,7 +644,6 @@
               let docurl = res.data.item
               let furl = docurl.DocUrl
               this.changepdfpage(row, furl)
-              console.log(res.data.item)
             }
           }).catch(err => {
             console.error(err)

src/dashoo.cn/frontend_web/src/pages/lims/preparation/index.vue

@@ -314,7 +314,6 @@
           })
           .then(res => {
             if (res.data instanceof Array && res.data.length > 0) {
-              console.log(res.data)
               res.data.forEach(element => {
                 _this.permissions[element.Code] = element.Isperm
               });

src/dashoo.cn/frontend_web/src/pages/lims/principal/subdata/customerposition.vue

@@ -460,7 +460,6 @@
 
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          console.log(res.data.items)
           this.thrUnitList = res.data.items['ThrUnitList']
         }).catch(err => {
           console.error(err)

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/datalist.vue

@@ -421,7 +421,6 @@
     methods: {
       // 打开校核弹窗
       jiaoheshowdialog () {
-        console.log('------jioahe')
         this.jiaoheForm.DataEntryId = this.DataEntryId
         this.jiaoheshow = true
       },

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/datamain.vue

@@ -27,18 +27,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <template>
-                <el-popover
-                  placement="left"
-                  title="添加检测地点"
-                  width="200"
-                  trigger="click">
-                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
-                  </el-button>
-                </el-popover>
-              </template>
+              <!--<template>-->
+                <!--<el-popover-->
+                  <!--placement="left"-->
+                  <!--title="添加检测地点"-->
+                  <!--width="200"-->
+                  <!--trigger="click">-->
+                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
+                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
+                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
+                  <!--</el-button>-->
+                <!--</el-popover>-->
+              <!--</template>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/dataopera.vue

@@ -2,7 +2,7 @@
   <div>
     <el-dialog
       title="空气泡沫信息"
-      :visible.sync="dialogVisible" 
+      :visible.sync="dialogVisible"
       width="80%" >
 
       <el-form ref="EntityForm" :model="formData" label-width="120px">
@@ -28,18 +28,18 @@
                   </el-option>
                 </el-option-group>
               </el-select>
-              <template>
-                <el-popover
-                  placement="left"
-                  title="添加安装位置"
-                  width="200"
-                  trigger="click">
-                  <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
-                  <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
-                  <el-button slot="reference"><i class="el-icon-plus"></i>
-                  </el-button>
-                </el-popover>
-              </template>
+              <!--<template>-->
+                <!--<el-popover-->
+                  <!--placement="left"-->
+                  <!--title="添加安装位置"-->
+                  <!--width="200"-->
+                  <!--trigger="click">-->
+                  <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
+                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
+                  <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
+                  <!--</el-button>-->
+                <!--</el-popover>-->
+              <!--</template>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorbendetect/_opera/operation.vue

@@ -753,13 +753,11 @@
       // } else {
       //   this.formData.Id = 0;
       // }
-      console.log('--------')
     },
     methods: {
       initDatas () {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log('------res------', res.data)
             this.formData = res.data.mainitem
           this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》'
             this.formData.StandardDesc = '可燃气体检测报警器检定装置'
@@ -836,9 +834,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log('jkkfddf', response.data.items)
             _this.DeviceList = response.data.items
-            console.log('-_this._this.DeviceList------', _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -890,7 +886,6 @@
           return item.id === value
       })
       this.formData.StanDevice = obj.name
-        console.log(obj.name)
       let _this = this
         _this.InstrumentNo = value
         // 访问接口
@@ -1015,9 +1010,7 @@
           var v6 = (parseFloat(row.AvgValue) - parseFloat(row.Value6)).toFixed(2)
           var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
           var sqthen = Math.sqrt(sumsq / 5)
-          console.log('--sqthen----', sqthen)
           row.RepeatValue = Number((parseFloat(sqthen) / parseFloat(row.AvgValue) * 100).toFixed(2))
-          console.log('--row.RepeatValue----', row.RepeatValue)
         } else {
           row.RepeatValue = 0
         }
@@ -1152,7 +1145,6 @@
       },
       // 保存信息
       saveEntity () {
-        console.log('------this.formData.Id----', this.formData.Id)
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
@@ -1168,7 +1160,6 @@
       // 添加数据
       addEntityMain () {
         let _this = this
-        console.log('-------this.formdata---', this.formData)
         if (this.certificateData != null && this.formData.StanDevice != '') {
           for (var i = 0; i < this.certificateData.length; i++) {
             this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
@@ -1223,7 +1214,6 @@
           ShiftArrayList: this.ShiftData // 添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log('---------addallform===', allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -1246,7 +1236,6 @@
 
       updateEntity () {
         let _this = this
-        console.log('------updatethis.formData.Id----', this.formData.Id)
         if (this.certificateData != null) {
           for (var i = 0; i < this.certificateData.length; i++) {
             this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
@@ -1301,7 +1290,6 @@
           ShiftArrayList: this.ShiftData // 添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log('------updataallform----', allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -1330,7 +1318,6 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorcarbondetect/_opera/operation.vue

@@ -707,10 +707,8 @@
     },
     methods: {
       initDatas() {
-        console.log("------re3s------", this.formData)
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             this.formData.DetectBasis = 'JJG 915-2008《一氧化碳检测报警器》检定规程'
             this.formData.StandardDesc = '一氧化碳检测报警器检定装置'
@@ -777,9 +775,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log("jkkfddf", response.data.items)
             _this.DeviceList = response.data.items
-            console.log("-_this._this.DeviceList------", _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -834,7 +830,6 @@
         });
         this.formData.StanDevice = obj.name
         this.formData.InstrumentNo = value
-        console.log(obj.name);
         let _this = this
         _this.InstrumentNo = value
         //访问接口
@@ -960,9 +955,7 @@
           var v6 = (parseFloat(row.AvgValue) - parseFloat(row.Value6)).toFixed(2)
           var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
           var sqthen = Math.sqrt(sumsq / 5)
-          console.log("--sqthen----", sqthen)
           row.RepeatValue = Number((parseFloat(sqthen) / parseFloat(row.AvgValue) * 100).toFixed(2))
-          console.log("--row.RepeatValue----", row.RepeatValue)
         } else {
           row.RepeatValue = 0
         }
@@ -1082,7 +1075,6 @@
       },
       //保存信息
       saveEntity() {
-        console.log("------this.formData.Id----", this.formData.Id)
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
@@ -1098,7 +1090,6 @@
       },
       //添加数据
       addEntityMain() {
-        console.log("-------this.formdata---", this.formData)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1138,7 +1129,6 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("---------allform", allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1161,7 +1151,6 @@
 
 
       updateEntity() {
-        console.log("------updatethis.formData.Id----", this.formData.Id)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1201,7 +1190,6 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("-----allform-----", allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1230,7 +1218,6 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
@@ -1241,7 +1228,7 @@
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorfhgasdetect/_opera/operation.vue

@@ -115,7 +115,6 @@
     },
     methods: {
       handleClick(tab, event) {
-        console.log(tab, event);
         // if (tab.name == "first"){
         //       this.$refs['OxygenoperaCompoment'].initDatas()
         // }
@@ -137,7 +136,6 @@
             if (res.data instanceof Array && res.data.length > 0) {
               this.acceptUsers = res.data
             }
-            console.log("----this.acceptUsers-----", this.acceptUsers)
           })
           .catch(err => {
             // handle error
@@ -245,7 +243,6 @@
         })
       },
       checkstatus() {
-        console.log("--vthis.shenhesubmitForm---",this.shenhesubmitForm)
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = parseInt(this.queryParams.DataEntryId)
         let params = this.shenhesubmitForm
@@ -282,7 +279,6 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
@@ -293,7 +289,7 @@
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorkrgasdetect/_opera/operation.vue

@@ -73,7 +73,7 @@
               <el-input v-model="formData.FactoryNum" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="12">
             <el-form-item label="检定依据:">
               <el-input v-model="formData.DetectBasis" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
@@ -773,10 +773,8 @@
     },
     methods: {
       initDatas () {
-        console.log(this.formData.DataEntryId, 'this.formData.DataEntryId')
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, '', this.$axios).then(res => {
-            console.log('------res------', res.data)
             this.formData = res.data.mainitem
             this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》检定规程'
             this.formData.StandardDesc = '可燃气体检测报警器检定装置'
@@ -802,7 +800,6 @@
               this.formData.StanDevice = res.data.ceritem[0].StanDevice
               this.formData.InstrumentNo = res.data.ceritem[0].StanDevice
             }
-            console.log('-----this.formData---', this.formData)
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
                 this.alerValData[i] = res.data.alvalitem[i]
@@ -853,9 +850,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log('jkkfddf', response.data.items)
             _this.DeviceList = response.data.items
-            console.log('-_this._this.DeviceList------', _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -906,7 +901,6 @@
           return item.id === value
         })
         this.formData.StanDevice = obj.name
-        console.log(obj.name)
         let _this = this
         _this.InstrumentNo = value
         // 访问接口
@@ -1030,9 +1024,7 @@
           var v6 = (parseFloat(row.AvgValue) - parseFloat(row.Value6)).toFixed(2)
           var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
           var sqthen = Math.sqrt(sumsq / 5)
-          console.log('--sqthen----', sqthen)
           row.RepeatValue = Number((parseFloat(sqthen) / parseFloat(row.AvgValue) * 100).toFixed(2))
-          console.log('--row.RepeatValue----', row.RepeatValue)
         } else {
           row.RepeatValue = 0
         }
@@ -1238,7 +1230,6 @@
           ShiftArrayList: this.ShiftData // 添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log('---------allform', allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -1315,7 +1306,6 @@
           ShiftArrayList: this.ShiftData // 添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log('-------allform--------', allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -1343,7 +1333,7 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
+        //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(

src/dashoo.cn/frontend_web/src/pages/lims/reportammeter/_opera/operation.vue

@@ -285,7 +285,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
@@ -318,7 +317,6 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-            console.log(this.formData)
             if (!this.formData.Id) {
                 this.addEntity();
             } else {

src/dashoo.cn/frontend_web/src/pages/lims/reportammeter/subdata/dataopera.vue

@@ -490,7 +490,6 @@
             this.formData.DetectBasis = this.$refs.selectDetectBasisCheck.selectedLabel + '';
             this.formData.EquipmentName = this.$refs.selectEquipmentNameCheck.selectedLabel + '';
             this.formData.PositionCheck = this.$refs.selectPositionCheck.selectedLabel + '';
-            console.log(this.formData)
             if (!this.formData.Id) {
               this.addEntity();
             } else {

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datamain.vue

@@ -32,18 +32,18 @@
                     :value="item.Id">
                   </el-option>
                 </el-select>
-                <template>
-                  <el-popover
-                    placement="left"
-                    title="添加检测地点"
-                    width="200"
-                    trigger="click">
-                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
-                    </el-button>
-                  </el-popover>
-                </template>
+                <!--<template>-->
+                  <!--<el-popover-->
+                    <!--placement="left"-->
+                    <!--title="添加检测地点"-->
+                    <!--width="200"-->
+                    <!--trigger="click">-->
+                    <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
+                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
+                    <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
+                    <!--</el-button>-->
+                  <!--</el-popover>-->
+                <!--</template>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -33,18 +33,18 @@
                   </el-option>
                 </el-option-group>
               </el-select>
-              <template>
-                <el-popover
-                  placement="left"
-                  title="添加安装位置"
-                  width="200"
-                  trigger="click">
-                  <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
-                  <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
-                  <el-button slot="reference"><i class="el-icon-plus"></i>
-                  </el-button>
-                </el-popover>
-              </template>
+              <!--<template>-->
+                <!--<el-popover-->
+                  <!--placement="left"-->
+                  <!--title="添加安装位置"-->
+                  <!--width="200"-->
+                  <!--trigger="click">-->
+                  <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
+                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
+                  <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
+                  <!--</el-button>-->
+                <!--</el-popover>-->
+              <!--</template>-->
             </el-form-item>
           </el-col>
 

src/dashoo.cn/frontend_web/src/pages/lims/reportbeampumpingUnits/_opera/operation.vue

@@ -350,7 +350,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();

src/dashoo.cn/frontend_web/src/pages/lims/reportbeampumpingUnits/subdata/datalist.vue

@@ -493,7 +493,6 @@
           let tmpRow = {}
           Object.assign(tmpRow, oldRow)
           noChange = cmp(this.rowHistory, tmpRow)
-          console.log(tmpRow, 'tmpRow')
         }
         if (oldRow && oldRow.Id > 0 && !noChange) {
           this.updateTableRow(oldRow)
@@ -569,7 +568,6 @@
       checkstatus () {
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = this.DataEntryId
-        console.log('------shenhe ', this.shenhesubmitForm)
         let params = this.shenhesubmitForm
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/lims/reportbeampumpingUnits/subdata/dataopera.vue

@@ -60,18 +60,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <template>
-                  <el-popover
-                    placement="left"
-                    title="添加检测地点"
-                    width="200"
-                    trigger="click">
-                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>
-                    </el-button>
-                  </el-popover>
-                </template>
+                <!--<template>-->
+                  <!--<el-popover-->
+                    <!--placement="left"-->
+                    <!--title="添加检测地点"-->
+                    <!--width="200"-->
+                    <!--trigger="click">-->
+                    <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
+                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
+                    <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>-->
+                    <!--</el-button>-->
+                  <!--</el-popover>-->
+                <!--</template>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -747,7 +747,6 @@
               type: 'success',
               message: res.data.message
             }) */
-            console.log('main save success')
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorHSgas/_opera/operation.vue

@@ -736,7 +736,6 @@
       initDatas() {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("---------res.data---", res.data)
             this.formData = res.data.mainitem;
             this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》检定规程'
             this.formData.StandardDesc = '可燃气体检测报警器检定装置'
@@ -809,9 +808,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log("jkkfddf", response.data.items)
             _this.DeviceList = response.data.items
-            console.log("-_this._this.DeviceList------", _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -864,13 +861,11 @@
           return item.id === value;
         });
         this.formData.StanDevice = obj.name
-        console.log(obj.name);
         let _this = this
         _this.InstrumentNo = value
-        //访问接口
-        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+        // 访问接口
+        instapi.getList(_this.InstrumentNo, '', this.$axios).then(res => {
           this.certificateDataform = res.data.items
-          console.log("---this.certificateDataform------", res.data.items)
           for (var i = 0; i < this.certificateDataform.length; i++) {
             this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
             this.certificateData[i].Uncertainty = this.certificateDataform[i].Uncertainty
@@ -1011,9 +1006,7 @@
           var v6 = (parseFloat(row.AvgValue) - parseFloat(row.Value6)).toFixed(2)
           var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
           var sqthen = Math.sqrt(sumsq / 5)
-          console.log("--sqthen----", sqthen)
           row.RepeatValue = Number((parseFloat(sqthen) / parseFloat(row.AvgValue) * 100).toFixed(2))
-          console.log("--row.RepeatValue----", row.RepeatValue)
         } else {
           row.RepeatValue = 0
         }
@@ -1069,7 +1062,7 @@
         //   } else if (row.ValueType === '量程示值') {
         //     row.ShowValue = shift
         //     row.ZeroValue = "/"
-        //   } 
+        //   }
         // }
       },
       setProoFreadShow() {
@@ -1194,7 +1187,6 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("-------allform---", allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1267,7 +1259,6 @@
           RepeatArrayList: this.RepeatData, //添加重复性数据
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
-        console.log("-------allform---", allform)
         allform = Object.assign(allform, this.formCertificateData)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -1296,7 +1287,7 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
+        //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
@@ -1307,7 +1298,7 @@
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorelectoxygen/_opera/operation.vue

@@ -650,7 +650,6 @@
       initDatas() {
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
-            console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             this.formData.DetectBasis = 'JJG 365-2008《 电化学氧测定仪》检定规程'
             this.formData.StandardDesc = '电化学氧测定仪检定装置'
@@ -717,9 +716,7 @@
         let _this = this
         _this.$axios.get('/instrument/initlistdata', {})
           .then(function (response) {
-            console.log("jkkfddf", response.data.items)
             _this.DeviceList = response.data.items
-            console.log("-_this._this.DeviceList------", _this.DeviceList)
             if (!_this.DeviceList) {
               return false
             }
@@ -885,9 +882,7 @@
           var v6 = (parseFloat(row.AvgValue) - parseFloat(row.Value6)).toFixed(2)
           var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
           var sqthen = Math.sqrt(sumsq / 5)
-          console.log("--sqthen----", sqthen)
           row.RepeatValue = Number((parseFloat(sqthen) / parseFloat(row.AvgValue) * 100).toFixed(2))
-          console.log("--row.RepeatValue----", row.RepeatValue)
         } else {
           row.RepeatValue = 0
         }
@@ -1008,7 +1003,6 @@
 
       //保存信息
       saveEntity() {
-        console.log("------this.formData.Id----", this.formData.Id)
         this.$refs['formData'].validate((valid) => {
           if (valid) {
             if (!this.formData.Id) {
@@ -1024,7 +1018,6 @@
       },
       //添加数据
       addEntityMain() {
-        console.log("-------this.formdata---", this.formData)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1063,7 +1056,6 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
-        console.log("---------allform", allform)
         api.addEntity(allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1086,7 +1078,6 @@
 
 
       updateEntity() {
-        console.log("------updatethis.formData.Id----", this.formData.Id)
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
@@ -1153,7 +1144,6 @@
         column,
         _self
       }) {
-        console.log(createElement) //  function (a, b, c, d) { return createElement(vm, a, b, c, d, true); };
         const label = column.label
         const labelArr = label.split(',')
         return createElement(
@@ -1164,7 +1154,7 @@
                 type: 'text'
               }
             }, [labelArr[0]]),
-            createElement('p', { // 创建第二个元素的标签可随意 
+            createElement('p', { // 创建第二个元素的标签可随意
               attrs: {
                 type: 'text',
                 style: 'font-size:12px'

src/dashoo.cn/frontend_web/src/pages/lims/reportelecground/_opera/operation.vue

@@ -32,121 +32,121 @@
               </el-select>
             </el-form-item>
           </el-col>-->
-		  
+
           <!-- <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="委托单ID">
-              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="任务分配表ID">
-              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="数据记录表ID">
-              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col> -->
-		  
+
           <el-col :span="8">
             <el-form-item label="检测地点">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PositionCheck" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="分布区域">
-              <el-input v-model="formData.District" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.District" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="序号">
-              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="装置部位名称">
-              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="接地类型">
-              <el-input v-model="formData.GroundType" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.GroundType" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="装置及连接状况">
-              <el-input v-model="formData.LinkStatus" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.LinkStatus" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="接地电阻值">
-              <el-input v-model="formData.ResistanceVal" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ResistanceVal" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="检测结果">
-              <el-input v-model="formData.CheckResult" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CheckResult" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
         </el-row>
       </el-form>
     </el-card>
@@ -189,7 +189,7 @@
 		ModifiedOn: '',
 		ModifiedUserId: '',
 		ModifiedBy: '',
-		
+
         },
 
         //下拉选择项
@@ -201,7 +201,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
@@ -321,4 +320,4 @@
 
 <style lang="scss">
 
-</style>
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/reportelecground/subdata/datalist.vue

@@ -475,13 +475,13 @@
           this.TestDepartOptions = []
           this.TestDepartOptionsBackUp.filter((item) => {
             if (escape(val).indexOf('%u') !== -1) {
-              if (item.PositionName.indexOf(val) > -1) {
+              if (item.Fullname.indexOf(val) > -1) {
                 this.TestDepartOptions.push(item)
               }
             } else {
-              let arrlen = makePy(item.PositionName).length
+              let arrlen = makePy(item.Fullname).length
               for (let i = 0; i < arrlen; i++) {
-                if (makePy(item.PositionName)[i].toLowerCase().substring(0, len) === val) {
+                if (makePy(item.Fullname)[i].toLowerCase().substring(0, len) === val) {
                   this.TestDepartOptions.push(item)
                   break
                 }
@@ -895,67 +895,14 @@
             this.PositionCheckOptions.push(this.PositionCheckOptionsBackUp[j])
           }
         }
-        console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp==')
-        console.log(this.PositionCheckOptions, 'this.PositionCheckOptions==')
-        // ===========lnd
-        // // 更新检测地点
-        // this.PositionCheckOptions = []
-        // this.PositionCheckOptionsBackUp = []
-        // this.formData.PositionCheckId = ''
-        // for (let j = 0; j < this.AllGradeInfo.length; j++) {
-        //   if (this.AllGradeInfo[j].ParentId === Id) {
-        //     this.PositionCheckOptionsBackUp.push(this.AllGradeInfo[j])
-        //   }
-        // }
-        // Object.assign(this.PositionCheckOptions, this.PositionCheckOptionsBackUp)
-        // // 检测地点、安装地点 都默认为第一个
-        // if (this.PositionCheckOptions.length > 0) {
-        //   this.formData.PositionCheckId = this.PositionCheckOptions[0].Id
-        // }
-        // this.TestDepartOptions = this.TestDepartOptionsBackUp
-        // ===========lnd
       },
       // 根据委托单位Id获取所有级联信息
       getAllGrade (customerId) {
         this.$axios.get('/limsreportelecground/allgradeinfo/' + customerId).then(res => {
-          console.log(res.data)
           this.TestDepartOptions = res.data.items['ThiUnits']
           this.PositionCheckOptions = res.data.items['PositionCheck']
+          Object.assign(this.TestDepartOptionsBackUp, this.TestDepartOptions)
           Object.assign(this.PositionCheckOptionsBackUp, this.PositionCheckOptions)
-          console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp')
-          // ========ln
-          // this.AllGradeInfo = res.data.items['AllGradeInfo']
-          // this.TestDepartOptions = []
-          // this.TestDepartOptionsBackUp = []
-          // if (!this.formData.TestDepartId) {
-          //   this.formData.TestDepartId = ''
-          // }
-          // if (!this.formData.PositionCheckId) {
-          //   this.formData.PositionCheckId = ''
-          // }
-          // this.PositionCheckOptions = []
-          // if (this.AllGradeInfo === null) {
-          //   return
-          // }
-          // // 受检单位
-          // for (let i = 0; i < this.AllGradeInfo.length; i++) {
-          //   if (this.AllGradeInfo[i].ParentId === 0) {
-          //     this.TestDepartOptionsBackUp.push(this.AllGradeInfo[i])
-          //   }
-          // }
-          // Object.assign(this.TestDepartOptions, this.TestDepartOptionsBackUp)
-          // // 检测地点
-          // if (this.TestDepartOptions.length > 0) {
-          //   for (let i = 0; i < this.TestDepartOptions.length; i++) {
-          //     for (let j = 0; j < this.AllGradeInfo.length; j++) {
-          //       if (this.AllGradeInfo[j].ParentId === this.TestDepartOptions[i].Id) {
-          //         this.PositionCheckOptionsBackUp.push(this.AllGradeInfo[j])
-          //       }
-          //     }
-          //   }
-          // }
-          // Object.assign(this.PositionCheckOptions, this.PositionCheckOptionsBackUp)
-          // ========ln
           this.getDataEntry()
         }).catch(err => {
           console.error(err)

src/dashoo.cn/frontend_web/src/pages/lims/reportelecground/subdata/dataopera.vue

@@ -231,7 +231,6 @@
       }
     },
     created () {
-      console.log("132")
       this.getDictOptions()
       if (this.serviceId > 0) {
         this.formData.Id = this.serviceId
@@ -463,7 +462,6 @@
         this.saveEntity()
       },
       resetFormData (PId) {
-        console.log(PId, 'PId')
         this.PositionCheckId = PId
         Object.assign(this.formData, this.historyData)
         this.saveBtnName = '新增'

src/dashoo.cn/frontend_web/src/pages/lims/reportequipotent/subdata/datamain.vue

@@ -181,13 +181,13 @@
           this.TestDepartOptions = []
           this.TestDepartOptionsBackUp.filter((item) => {
             if (escape(val).indexOf('%u') !== -1) {
-              if (item.PositionName.indexOf(val) > -1) {
+              if (item.Fullname.indexOf(val) > -1) {
                 this.TestDepartOptions.push(item)
               }
             } else {
-              let arrlen = makePy(item.PositionName).length
+              let arrlen = makePy(item.Fullname).length
               for (let i = 0; i < arrlen; i++) {
-                if (makePy(item.PositionName)[i].toLowerCase().substring(0, len) === val) {
+                if (makePy(item.Fullname)[i].toLowerCase().substring(0, len) === val) {
                   this.TestDepartOptions.push(item)
                   break
                 }
@@ -216,7 +216,6 @@
       },
       InspecCorpChange (Id) {
         // 更新检测地点
-        console.log(Id)
         this.PositionCheckOptions = []
         this.formData.PositionCheckId = ''
         for (let j = 0; j < this.PositionCheckOptionsBackUp.length; j++) {
@@ -224,8 +223,6 @@
             this.PositionCheckOptions.push(this.PositionCheckOptionsBackUp[j])
           }
         }
-        console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp==')
-        console.log(this.PositionCheckOptions, 'this.PositionCheckOptions==')
       },
       setPositionCheckOptions (Id) {
         // 更新检测地点
@@ -237,7 +234,7 @@
         }
       },
       getDictOptions () {
-        api.getDictList(this.$axios).then(res => {
+        api.getDictList(this.$axios).then(res => {f
           this.EntrustCorpOptions = res.data.items['EntrustCorp']
           this.MainProductsList = res.data.items['MainProducts']
         }).catch(err => {
@@ -246,11 +243,10 @@
       },
       getAllGrade (customerId) {
         this.$axios.get('/limsreportelecground/allgradeinfo/' + customerId).then(res => {
-          console.log(res.data)
           this.TestDepartOptions = res.data.items['ThiUnits']
           this.PositionCheckOptions = res.data.items['PositionCheck']
+          Object.assign(this.TestDepartOptionsBackUp, this.TestDepartOptions)
           Object.assign(this.PositionCheckOptionsBackUp, this.PositionCheckOptions)
-          console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp')
           this.getDataEntry(this.DataEntryId)
         }).catch(err => {
           console.error(err)

src/dashoo.cn/frontend_web/src/pages/lims/reportequipotent/subdata/dataopera.vue

@@ -422,7 +422,6 @@
         this.saveEntity()
       },
       resetFormData (PId) {
-        console.log(PId, 'PId')
         this.PositionCheckId = PId
         Object.assign(this.formData, this.historyData)
         this.saveBtnName = '新增'

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/datalist.vue

@@ -431,7 +431,6 @@
     methods: {
       // 打开校核弹窗
       jiaoheshowdialog () {
-        console.log('------jioahe')
         this.jiaoheForm.DataEntryId = this.DataEntryId
         this.jiaoheshow = true
       },

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/datamain.vue

@@ -31,18 +31,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <template>
-                <el-popover
-                  placement="left"
-                  title="添加检测地点"
-                  width="200"
-                  trigger="click">
-                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
-                  </el-button>
-                </el-popover>
-              </template>
+              <!--<template>-->
+                <!--<el-popover-->
+                  <!--placement="left"-->
+                  <!--title="添加检测地点"-->
+                  <!--width="200"-->
+                  <!--trigger="click">-->
+                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
+                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
+                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
+                  <!--</el-button>-->
+                <!--</el-popover>-->
+              <!--</template>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/dataopera.vue

@@ -29,18 +29,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <template>
-                  <el-popover
-                    placement="left"
-                    title="添加安装位置"
-                    width="200"
-                    trigger="click">
-                    <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
-                    <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
-                    <el-button slot="reference"><i class="el-icon-plus"></i>
-                    </el-button>
-                  </el-popover>
-                </template>
+                <!--<template>-->
+                  <!--<el-popover-->
+                    <!--placement="left"-->
+                    <!--title="添加安装位置"-->
+                    <!--width="200"-->
+                    <!--trigger="click">-->
+                    <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
+                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
+                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
+                    <!--</el-button>-->
+                  <!--</el-popover>-->
+                <!--</template>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/lims/reportleakprotect/subdata/datamain.vue

@@ -171,13 +171,13 @@
           this.TestDepartOptions = []
           this.TestDepartOptionsBackUp.filter((item) => {
             if (escape(val).indexOf('%u') !== -1) {
-              if (item.PositionName.indexOf(val) > -1) {
+              if (item.Fullname.indexOf(val) > -1) {
                 this.TestDepartOptions.push(item)
               }
             } else {
-              let arrlen = makePy(item.PositionName).length
+              let arrlen = makePy(item.Fullname).length
               for (let i = 0; i < arrlen; i++) {
-                if (makePy(item.PositionName)[i].toLowerCase().substring(0, len) === val) {
+                if (makePy(item.Fullname)[i].toLowerCase().substring(0, len) === val) {
                   this.TestDepartOptions.push(item)
                   break
                 }
@@ -205,7 +205,6 @@
       },
       InspecCorpChange (Id) {
         // 更新检测地点
-        console.log(Id)
         this.PositionCheckOptions = []
         this.formData.PositionCheckId = ''
         for (let j = 0; j < this.PositionCheckOptionsBackUp.length; j++) {
@@ -213,8 +212,6 @@
             this.PositionCheckOptions.push(this.PositionCheckOptionsBackUp[j])
           }
         }
-        console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp==')
-        console.log(this.PositionCheckOptions, 'this.PositionCheckOptions==')
       },
       setPositionCheckOptions (Id) {
         // 更新检测地点
@@ -256,8 +253,8 @@
           console.log(res.data)
           this.TestDepartOptions = res.data.items['ThiUnits']
           this.PositionCheckOptions = res.data.items['PositionCheck']
+          Object.assign(this.TestDepartOptionsBackUp, this.TestDepartOptions)
           Object.assign(this.PositionCheckOptionsBackUp, this.PositionCheckOptions)
-          console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp')
           this.getDataEntry(this.DataEntryId)
         }).catch(err => {
           console.error(err)

src/dashoo.cn/frontend_web/src/pages/lims/reportleakprotect/subdata/dataopera.vue

@@ -444,7 +444,6 @@
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data
-            console.log(this.formData, 'this.formData')
             this.MainProductsNoOptions = res.data.MainProductsNo.split('、')
             // 获取所有等级信息
             // this.getAllGrade(this.formData.EntrustCorp)
@@ -564,7 +563,6 @@
         this.saveEntity()
       },
       resetFormData (PId) {
-        console.log(PId, 'PId')
         this.PositionCheckId = PId
         Object.assign(this.formData, this.historyData)
         this.saveBtnName = '新增'

src/dashoo.cn/frontend_web/src/pages/lims/reportlightprotect/_opera/operation.vue

@@ -31,127 +31,127 @@
               </el-select>
             </el-form-item>
           </el-col>-->
-		  
+
           <!-- <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col> -->
-		  
+
           <!-- <el-col :span="8">
             <el-form-item label="委托单ID">
-              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="任务分配表ID">
-              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="数据记录表ID">
-              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col> -->
-		  
+
           <el-col :span="8">
             <el-form-item label="检测地点">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.PositionCheck" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="分布区域">
-              <el-input v-model="formData.District" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.District" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="序号">
-              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="装置部位名称">
-              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="接闪器及情况">
-              <el-input v-model="formData.ReceiveLightStatus" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ReceiveLightStatus" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="装置及连接状况">
-              <el-input v-model="formData.LinkStatus" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.LinkStatus" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="具体方位">
-              <el-input v-model="formData.Direction" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Direction" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="接地电阻值">
-              <el-input v-model="formData.ResistanceVal" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ResistanceVal" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="检测结果">
-              <el-input v-model="formData.CheckResult" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CheckResult" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
         </el-row>
       </el-form>
     </el-card>
@@ -195,7 +195,7 @@
 		ModifiedOn: '',
 		ModifiedUserId: '',
 		ModifiedBy: '',
-		
+
         },
 
         //下拉选择项
@@ -207,7 +207,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
@@ -327,4 +326,4 @@
 
 <style lang="scss">
 
-</style>
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/reportlightprotect/subdata/datamain.vue

@@ -197,8 +197,6 @@
             this.PositionCheckOptions.push(this.PositionCheckOptionsBackUp[j])
           }
         }
-        console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp==')
-        console.log(this.PositionCheckOptions, 'this.PositionCheckOptions==')
       },
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
@@ -212,11 +210,10 @@
       },
       getAllGrade (customerId) {
         this.$axios.get('/limsreportelecground/allgradeinfo/' + customerId).then(res => {
-          console.log(res.data)
           this.TestDepartOptions = res.data.items['ThiUnits']
           this.PositionCheckOptions = res.data.items['PositionCheck']
+          Object.assign(this.TestDepartOptionsBackUp, this.TestDepartOptions)
           Object.assign(this.PositionCheckOptionsBackUp, this.PositionCheckOptions)
-          console.log(this.PositionCheckOptionsBackUp, 'this.PositionCheckOptionsBackUp')
           this.getDataEntry(this.DataEntryId)
         }).catch(err => {
           console.error(err)
@@ -297,13 +294,13 @@
           this.TestDepartOptions = []
           this.TestDepartOptionsBackUp.filter((item) => {
             if (escape(val).indexOf('%u') !== -1) {
-              if (item.PositionName.indexOf(val) > -1) {
+              if (item.Fullname.indexOf(val) > -1) {
                 this.TestDepartOptions.push(item)
               }
             } else {
-              let arrlen = makePy(item.PositionName).length
+              let arrlen = makePy(item.Fullname).length
               for (let i = 0; i < arrlen; i++) {
-                if (makePy(item.PositionName)[i].toLowerCase().substring(0, len) === val) {
+                if (makePy(item.Fullname)[i].toLowerCase().substring(0, len) === val) {
                   this.TestDepartOptions.push(item)
                   break
                 }

src/dashoo.cn/frontend_web/src/pages/lims/reportlightprotect/subdata/dataopera.vue

@@ -461,7 +461,6 @@
         this.saveEntity()
       },
       resetFormData (PId) {
-        console.log(PId, 'PId')
         this.PositionCheckId = PId
         Object.assign(this.formData, this.historyData)
         this.saveBtnName = '新增'

src/dashoo.cn/frontend_web/src/pages/lims/reportliquidtransportation/_opera/operation.vue

@@ -785,7 +785,6 @@
       },
       // 提交校核
       makesure () {
-        console.log(this.formData.Id, '====')
         if (!this.formData.Id || this.formData.Id < 0) {
           this.$message.warning('没有保存，不能提交！')
           return
@@ -797,7 +796,6 @@
         })
           .then(() => {
             this.ProoFreadShow = false
-            console.log('1')
             this.checkstatus()
           })
           .catch(() => {})

src/dashoo.cn/frontend_web/src/pages/lims/reportnobeampumpingUnits/_opera/operation.vue

@@ -31,253 +31,253 @@
               </el-select>
             </el-form-item>
           </el-col>-->
-		  
+
           <!-- <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="委托单ID">
-              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.EId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="任务分配表ID">
-              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.TaskBalanceId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col> -->
-		  
+
           <el-col :span="8">
             <el-form-item label="数据记录表ID">
-              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DataEntryId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="序号">
-              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.OrderNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="安装位置">
-              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Position" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="出厂编号">
-              <el-input v-model="formData.CustNo" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CustNo" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="出厂日期">
-              <el-input v-model="formData.ProductDate" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ProductDate" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="规格型号">
-              <el-input v-model="formData.Spec" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Spec" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="制造厂家">
-              <el-input v-model="formData.Manufacturer" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Manufacturer" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="产品状态">
-              <el-input v-model="formData.Status" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Status" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="检测时间">
-              <el-input v-model="formData.CheckDate" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CheckDate" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="环境温度C">
-              <el-input v-model="formData.Temperature" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Temperature" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="检测依据">
-              <el-input v-model="formData.DetectBasis" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DetectBasis" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="主要检测仪器名称">
-              <el-input v-model="formData.MainProducts" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MainProducts" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="外观检查1">
-              <el-input v-model="formData.FaceCheck1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.FaceCheck1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="外观检查2">
-              <el-input v-model="formData.FaceCheck2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.FaceCheck2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="减速器密封性">
-              <el-input v-model="formData.Retarder" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Retarder" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="机架纵向振幅mm">
-              <el-input v-model="formData.LongSwing" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.LongSwing" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="机架横向振幅mm">
-              <el-input v-model="formData.TransSwing" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.TransSwing" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="减速器轴承温度C">
-              <el-input v-model="formData.RetarderTemp" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.RetarderTemp" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="整机噪声1(A计权声级)dB">
-              <el-input v-model="formData.MachineNoise1" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MachineNoise1" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="整机噪声2(A计权声级)dB">
-              <el-input v-model="formData.MachineNoise2" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MachineNoise2" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="整机噪声3(A计权声级)dB">
-              <el-input v-model="formData.MachineNoise3" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MachineNoise3" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="x轴下止点mm">
-              <el-input v-model="formData.DownX" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DownX" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="x轴中下止点mm">
-              <el-input v-model="formData.MidDownX" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MidDownX" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="x轴中止点mm">
-              <el-input v-model="formData.MiddleX" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MiddleX" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="x轴中上止点mm">
-              <el-input v-model="formData.MidUpX" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MidUpX" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="x轴上止点mm">
-              <el-input v-model="formData.UpX" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.UpX" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="y轴下止点mm">
-              <el-input v-model="formData.DownY" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.DownY" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="y轴中下止点mm">
-              <el-input v-model="formData.MidDownY" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MidDownY" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="y轴中止点mm">
-              <el-input v-model="formData.MiddleY" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MiddleY" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="y轴中上止点mm">
-              <el-input v-model="formData.MidUpY" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.MidUpY" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="y轴上止点mm">
-              <el-input v-model="formData.UpY" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.UpY" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
           <el-col :span="8">
             <el-form-item label="">
-              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>  
-            </el-form-item>			  
+              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
           </el-col>
-		  
+
         </el-row>
       </el-form>
     </el-card>
@@ -342,7 +342,7 @@
 		ModifiedOn: '',
 		ModifiedUserId: '',
 		ModifiedBy: '',
-		
+
         },
 
         //下拉选择项
@@ -354,7 +354,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
@@ -474,4 +473,4 @@
 
 <style lang="scss">
 
-</style>
+</style>

src/dashoo.cn/frontend_web/src/pages/lims/reportnobeampumpingUnits/subdata/datalist.vue

@@ -344,7 +344,6 @@
       checkstatus () {
         this.shenhesubmitForm.SuccessStatus = 1
         this.shenhesubmitForm.DataEntryId = this.DataEntryId
-        console.log('------shenhe ', this.shenhesubmitForm)
         let params = this.shenhesubmitForm
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/lims/reportnobeampumpingUnits/subdata/dataopera.vue

@@ -66,18 +66,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <template>
-                  <el-popover
-                    placement="left"
-                    title="添加检测地点"
-                    width="200"
-                    trigger="click">
-                    <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                    <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                    <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>
-                    </el-button>
-                  </el-popover>
-                </template>
+                <!--<template>-->
+                  <!--<el-popover-->
+                    <!--placement="left"-->
+                    <!--title="添加检测地点"-->
+                    <!--width="200"-->
+                    <!--trigger="click">-->
+                    <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
+                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
+                    <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3 && DataStatus!=7"><i class="el-icon-plus"></i>-->
+                    <!--</el-button>-->
+                  <!--</el-popover>-->
+                <!--</template>-->
               </el-form-item>
             </el-col>
 
@@ -1114,7 +1114,6 @@
           this.formData.LongSwing = '0'
         }
         if (this.formData.Temperature === '') {
-          console.log(this.formData.Temperature, '----')
           this.formData.Temperature = '0'
         }
         if (this.formData.MachineNoise1 === '') {

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/_opera/operation.vue

@@ -237,7 +237,6 @@
     created() {
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
-      console.log(this.serviceId);
       if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
         this.initDatas();

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/datamain.vue

@@ -31,18 +31,18 @@
                   :value="item.Id">
                 </el-option>
               </el-select>
-              <template>
-                <el-popover
-                  placement="left"
-                  title="添加检测地点"
-                  width="200"
-                  trigger="click">
-                  <el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>
-                  <el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>
-                  <el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>
-                  </el-button>
-                </el-popover>
-              </template>
+              <!--<template>-->
+                <!--<el-popover-->
+                  <!--placement="left"-->
+                  <!--title="添加检测地点"-->
+                  <!--width="200"-->
+                  <!--trigger="click">-->
+                  <!--<el-input ref="inputPositionCheck" v-model="PositionCheck" size="small" style="width: 70%"></el-input>-->
+                  <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPositionCheck">保存</el-button>-->
+                  <!--<el-button slot="reference" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"><i class="el-icon-plus"></i>-->
+                  <!--</el-button>-->
+                <!--</el-popover>-->
+              <!--</template>-->
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/dataopera.vue

@@ -29,18 +29,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <template>
-                  <el-popover
-                    placement="left"
-                    title="添加安装位置"
-                    width="200"
-                    trigger="click">
-                    <el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>
-                    <el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>
-                    <el-button slot="reference"><i class="el-icon-plus"></i>
-                    </el-button>
-                  </el-popover>
-                </template>
+                <!--<template>-->
+                  <!--<el-popover-->
+                    <!--placement="left"-->
+                    <!--title="添加安装位置"-->
+                    <!--width="200"-->
+                    <!--trigger="click">-->
+                    <!--<el-input ref="inputPosition" v-model="Position" size="small" style="width: 70%"></el-input>-->
+                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addPosition">保存</el-button>-->
+                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
+                    <!--</el-button>-->
+                  <!--</el-popover>-->
+                <!--</template>-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -1100,7 +1100,6 @@
         }
       },
       PyPapotCheck () {
-        console.log('2')
         this.formData.PyPapot = this.formData.PyPapot.replace(/[^0-9./]/g, '')
       }
     }

src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/_opera/operation.vue

@@ -1513,15 +1513,15 @@
             _this.entypeList = res.data
           })
       },
-      //委托方名称下拉
-      getCustomer() {
+      // 委托方名称下拉
+      getCustomer () {
         let _this = this
         _this.$axios.get('/customer/customerlist', {})
           .then(res => {
             // response
             _this.customerList = res.data.items
             for (var i = 0; i < res.data.items.length; i++) {
-              if (res.data.items[i].ViceBusiness == '大港油田') {
+              if (res.data.items[i].ViceBusiness === '大港油田') {
                 _this.groupOptions[0].options.push(res.data.items[i])
               } else {
                 _this.groupOptions[1].options.push(res.data.items[i])
@@ -1529,8 +1529,9 @@
             }
           })
       },
-      //下拉选择委托方
-      chooseCustomer() {
+      // 下拉选择委托方
+      chooseCustomer () {
+        console.log(this.mainForm, 'this.mainForm')
         let _this = this
         for (var i = 0; i < _this.customerList.length; i++) {
           if (_this.customerList[i].Id == _this.mainForm.CustomerId) {
@@ -1542,8 +1543,8 @@
         }
         this.getAddress(_this.mainForm.CustomerId)
       },
-      //检测地点下拉
-      getAddress(CId) {
+      // 检测地点下拉
+      getAddress (CId) {
         let _this = this
         this.$axios.get('/limsreporthuxf/getEntrustCorp/' + CId)
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/report/index.vue

@@ -121,7 +121,6 @@
         var listTable = urlincode(this.$refs.listTable.bodyWrapper.innerHTML);
         var strBody = escape('<table style="border:1px"><tr><td>212</td><td>1221</td></tr></table>');
 
-        console.log("1111111111111111111", listTable)
         location.href =
           'foxmail.url.mailto:406824643@qq.com?subject=test&cc=likecht@hotmail.com&body=' + strBody;
       }

src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -521,7 +521,6 @@
           _size: this.setrolesize
         }
         this.$axios.get('role/getauditerbydept/' + deptid, {params}).then(res => {
-          console.log(res, 'res')
           this.userOptions = res.data.items
           this.currentSetRoleItemCount = res.data.currentItemCount
             //this.adminuserlistfilter()