阻火器 防雷添加 检测地点 去掉检测

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

@@ -4367,6 +4367,15 @@ func (this *LimsDataEntryController) AddDistrict() {
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	var modeltmp limscustomerposition.LimsCustomerPosition
+	if model.PositionTypeId == "2" {
+		svc.GetEntityByIdBytbl(this.User.AccCode + LimsCustomerpositionName, model.ParentId, &modeltmp)
+		model.ThrUnit = modeltmp.ThrUnit
+		model.ThrUnitId = modeltmp.ThrUnitId
+	}
+
+
 	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
 
 	_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsCustomerpositionName, &model)

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

@@ -228,8 +228,10 @@ func (this *LimsReportElecGroundController) GetAllGradeInfo() {
 	//	thrunits = svc.GetAllThirdChildByTopId(customer[0].DepartmentId, "")
 	//}
 	var thrunits []organize.Base_Organize
-	where = "Id IN (SELECT DISTINCT(ThrUnitId) FROM s5OVELimsCustomerPosition WHERE CustomerId=" + customerId + " AND ThrUnitId != 0)"
-	svc.GetEntities(&thrunits, where)
+	//where = "Id IN (SELECT DISTINCT(ThrUnitId) FROM s5OVELimsCustomerPosition WHERE CustomerId=" + customerId + " AND ThrUnitId != 0)"
+	ids := svc.GetAllChildById(customerId)
+	wheret := "id in (" + ids + ") and Category='ThrUnit'"
+	svc.GetEntities(&thrunits, wheret)
 
 
 	thrunitIds := ""

src/dashoo.cn/frontend_web/src/pages/lims/checkcenter/deviceCenter.vue

@@ -224,22 +224,22 @@
           precent: 70,
           date: '2016-05-02',
           name: 'A001',
-          address: '无游梁式抽油机检测',
+          address: '无游梁式抽油机',
         }, {
           precent: 60,
           date: '2016-05-04',
           name: 'B002',
-          address: '阻火器检测'
+          address: '阻火器'
         }, {
           precent: 66,
           date: '2016-05-01',
           name: 'C003',
-          address: '呼吸阀检测',
+          address: '呼吸阀',
         }, {
           precent: 80,
           date: '2016-05-03',
           name: 'D004',
-          address: '空气泡沫产生器检测'
+          address: '空气泡沫产生器'
         }]
       }
     },

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

@@ -585,20 +585,20 @@ export default {
       options: [{
         label: '特检',
         options: [
-          {Id: 179, FullName: '电气接地装置检测'},
-          {Id: 286, FullName: '防雷装置检测'},
-          {Id: 187, FullName: '防雷装置（等电位）检测'},
-          {Id: 181, FullName: '漏电保护器检测'}
+          {Id: 179, FullName: '电气接地装置'},
+          {Id: 286, FullName: '防雷装置'},
+          {Id: 187, FullName: '防雷装置（等电位）'},
+          {Id: 181, FullName: '漏电保护器'}
         ]
       }, {
         label: '宇信',
         options: [
-          {Id: 156, FullName: '阻火器检测'},
-          {Id: 183, FullName: '呼吸阀检测'},
-          {Id: 154, FullName: '液压安全阀检测'},
-          {Id: 189, FullName: '空气泡沫产生器检测'},
-          {Id: 141, FullName: '游梁式抽油机检测'},
-          {Id: 173, FullName: '无游梁式抽油机检测'}
+          {Id: 156, FullName: '阻火器'},
+          {Id: 183, FullName: '呼吸阀'},
+          {Id: 154, FullName: '液压安全阀'},
+          {Id: 189, FullName: '空气泡沫产生器'},
+          {Id: 141, FullName: '游梁式抽油机'},
+          {Id: 173, FullName: '无游梁式抽油机'}
         ]
       }]
     }

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

@@ -45,18 +45,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">
@@ -337,7 +337,11 @@
         }
         let params = {
           CustomerId: this.EntrustCorp,
-          ParentId: this.formData.TestDepartId,
+          ParentId: 0,
+          ThrUnitId: this.formData.TestDepartId,
+          ThrUnit: this.$refs.selectTestDepart.selectedLabel + '',
+          PositionType: '检测地点',
+          PositionTypeId: '1',
           PositionName: PositionCheck
         }
         if (PositionCheck !== '' && !this.in_array_positionname(PositionCheck, this.PositionCheckOptionsBackUp)) {

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

@@ -31,18 +31,18 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-                <!--<template>-->
-                  <!--<el-popover-->
-                    <!--placement="left"-->
-                    <!--title="添加分布位置"-->
-                    <!--width="150px"-->
-                    <!--trigger="click">-->
-                    <!--<el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>-->
-                    <!--<el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</el-button>-->
-                    <!--<el-button slot="reference"><i class="el-icon-plus"></i>-->
-                    <!--</el-button>-->
-                  <!--</el-popover>-->
-                <!--</template>-->
+                <template>
+                  <el-popover
+                    placement="left"
+                    title="添加分布位置"
+                    width="150px"
+                    trigger="click">
+                    <el-input ref="inputDistrict" v-model="District" size="small" style="width: 70%"></el-input>
+                    <el-button size="small" style="width: 30%; text-align: center" @click="addDistrict">保存</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">
@@ -273,9 +273,11 @@
           return
         }
         let params = {
-          CustomerId: this.formData.EntrustCorp,
-          ParentId: this.formData.PositionCheckId,
-          PositionName: selectDistrict
+          CustomerId: parseInt(this.formData.EntrustCorp),
+          ParentId: parseInt(this.PositionCheckId),
+          PositionName: selectDistrict,
+          PositionType: '安装位置',
+          PositionTypeId: '2'
         }
         if (selectDistrict !== '' && !this.in_array_positionname(selectDistrict, this.DistrictOptions)) {
           this.$axios.post('/limsdataentry/addDistrict', params)

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

@@ -383,7 +383,6 @@
     },
     methods: {
       isPermissionsByCode () {
-        console.log(typeof this.DataStatus, this.DataStatus)
         let code = ''
         if (this.DataStatus == 2) {
           code = 'DATAPREAUDIT'
@@ -398,7 +397,6 @@
         this.$axios.get('/limsdataentry/ispermissionsbycode', {
           params
         }).then(res => {
-          console.log(res.data)
           this.isShow = res.data
         })
           .catch(err => {
@@ -753,7 +751,7 @@
             return
           }
           // 刷新子列表
-          this.$refs['DataoperaCompoment'].resetFormData()
+          this.$refs['DataoperaCompoment'].resetFormData(res.data.PositionCheckId)
           this.$refs['DataoperaCompoment'].dialogVisible = true
         }).catch(error => {
           console.log(error)

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

@@ -32,18 +32,26 @@
                   :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-select ref="selectTestDepart" size="small" v-model="TestDepartId" filterable placeholder="请选择" style="width: 100%">
+                    <el-option
+                      v-for="item in TestDepartOptions"
+                      :key="item.Id"
+                      :label="item.Fullname"
+                      :value="item.Id">
+                    </el-option>
+                  </el-select>
+                  <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">
@@ -86,7 +94,7 @@
               <el-col :span="8">
                 <el-form-item label="安全附件检测仪" label-width="140px" required>
                   <el-select ref="selectStatus" v-model="formData.Instrument1" filterable placeholder="安全附件检测仪"
-                             style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3" @change="changeInstrument">
+                             style="width: 100%" >
                     <el-option
                       v-for="item in SafAccDetectorOptions"
                       :key="item.Id"
@@ -168,6 +176,7 @@
 
     data () {
       return {
+        TestDepartId: '',
         Descdisabled: true,
         activeName: '1',
         checkboxvalues: [],
@@ -185,6 +194,7 @@
         PositionOptionsSelect: [],
         PositionCheckOptionsBackUp: [],
         instrumentgroup: [],
+        TestDepartOptions: [],
         props: {
           label: 'ItemName',
           value: 'ItemName',
@@ -311,10 +321,18 @@
         })
       },
 
+      getAllGrade (customerId) {
+        this.$axios.get('/limsreportelecground/allgradeinfo/' + customerId).then(res => {
+          this.TestDepartOptions = res.data.items['ThiUnits']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
           this.EntrustCorp = res.data.CustomerId
           this.EntrustCorpName = res.data.CustomerName
+          this.getAllGrade(this.EntrustCorp)
           this.getEntrustCorpItems(this.EntrustCorp)
         }).catch(err => {
           // handle error
@@ -377,8 +395,12 @@
         }
         let params = {
           CustomerId: this.EntrustCorp,
-          ParentId: this.formData.TestDepartId,
-          PositionName: PositionCheck
+          ParentId: 0,
+          PositionName: PositionCheck,
+          ThrUnitId: this.TestDepartId,
+          ThrUnit: this.$refs.selectTestDepart.selectedLabel + '',
+          PositionType: '检测地点',
+          PositionTypeId: '1'
         }
         if (PositionCheck !== '' && !this.in_array_positionname(PositionCheck, this.PositionCheckOptionsBackUp)) {
           this.$axios.post('/limsdataentry/addDistrict', params)

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">
@@ -314,6 +314,7 @@
 
     data () {
       return {
+        PositionCheckId: '',
         continueInsertChecked: false,
         Descdisabled: true,
         dialogVisible: false,
@@ -535,8 +536,10 @@
         }
         let params = {
           CustomerId: this.formData.EntrustCorp,
-          ParentId: this.formData.PositionCheckId,
-          PositionName: selectPosition
+          ParentId: this.PositionCheckId,
+          PositionName: selectPosition,
+          PositionType: '安装位置',
+          PositionTypeId: '2'
         }
         if (selectPosition !== '' && !this.in_array_positionname(selectPosition, this.PositionOptions)) {
           this.$axios.post('/limsdataentry/addDistrict', params)
@@ -857,7 +860,8 @@
         this.saveBtnName = '新增'
         this.saveEntity()
       },
-      resetFormData () {
+      resetFormData (PId) {
+        this.PositionCheckId = PId
         Object.assign(this.formData, this.historyData)
         this.saveBtnName = '新增'
         this.formData.Id = 0

src/dashoo.cn/frontend_web/src/pages/lims/secondcenter/deviceCenter.vue

@@ -224,22 +224,22 @@
           precent: 70,
           date: '2016-05-02',
           name: 'A001',
-          address: '无游梁式抽油机检测',
+          address: '无游梁式抽油机',
         }, {
           precent: 60,
           date: '2016-05-04',
           name: 'B002',
-          address: '阻火器检测'
+          address: '阻火器'
         }, {
           precent: 66,
           date: '2016-05-01',
           name: 'C003',
-          address: '呼吸阀检测',
+          address: '呼吸阀',
         }, {
           precent: 80,
           date: '2016-05-03',
           name: 'D004',
-          address: '空气泡沫产生器检测'
+          address: '空气泡沫产生器'
         }]
       }
     },

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

@@ -128,78 +128,78 @@
         },
         ServiceId: '',
         tableData: [{
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号楼'
         }, {
-          name: '阻火器检测',
+          name: '阻火器',
           address: '1号楼'
         }, {
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '1号楼'
         }, {
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '1号楼'
         }, {
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号楼'
         }, {
-          name: '阻火器检测',
+          name: '阻火器',
           address: '1号楼'
         }, {
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '1号楼'
         }, {
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '1号楼'
         }],
 
         tableData2: [{
           seqNo: '1',
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号位',
           address2: '大连制表厂',
           address3: 'A001'
         }, {
           seqNo: '2',
-          name: '阻火器检测',
+          name: '阻火器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'B002'
         }, {
           seqNo: '3',
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'C003'
 
         }, {
           seqNo: '4',
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'D004'
         },{
           seqNo: '5',
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号位',
           address2: '大连制表厂',
           address3: 'A001'
         }, {
           seqNo: '6',
-          name: '阻火器检测',
+          name: '阻火器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'B002'
         }, {
           seqNo: '7',
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'C003'
 
         }, {
           seqNo: '8',
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'D004'

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

@@ -401,51 +401,51 @@
         },
         tableData2: [{
           seqNo: '1',
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号位',
           address2: '大连制表厂',
           address3: 'A001'
         }, {
           seqNo: '2',
-          name: '阻火器检测',
+          name: '阻火器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'B002'
         }, {
           seqNo: '3',
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'C003'
 
         }, {
           seqNo: '4',
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'D004'
         }, {
           seqNo: '5',
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号位',
           address2: '大连制表厂',
           address3: 'A001'
         }, {
           seqNo: '6',
-          name: '阻火器检测',
+          name: '阻火器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'B002'
         }, {
           seqNo: '7',
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'C003'
 
         }, {
           seqNo: '8',
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'D004'
@@ -456,20 +456,20 @@
         options: [{
           label: '特检',
           options: [
-            {Id: 179, FullName: '电气接地装置检测'},
-            {Id: 286, FullName: '防雷装置检测'},
-            {Id: 187, FullName: '防雷装置（等电位）检测'},
-            {Id: 181, FullName: '漏电保护器检测'}
+            {Id: 179, FullName: '电气接地装置'},
+            {Id: 286, FullName: '防雷装置'},
+            {Id: 187, FullName: '防雷装置（等电位）'},
+            {Id: 181, FullName: '漏电保护器'}
           ]
         }, {
           label: '宇信',
           options: [
-            {Id: 156, FullName: '阻火器检测'},
-            {Id: 183, FullName: '呼吸阀检测'},
-            {Id: 154, FullName: '液压安全阀检测'},
-            {Id: 189, FullName: '空气泡沫产生器检测'},
-            {Id: 141, FullName: '游梁式抽油机检测'},
-            {Id: 173, FullName: '无游梁式抽油机检测'}
+            {Id: 156, FullName: '阻火器'},
+            {Id: 183, FullName: '呼吸阀'},
+            {Id: 154, FullName: '液压安全阀'},
+            {Id: 189, FullName: '空气泡沫产生器'},
+            {Id: 141, FullName: '游梁式抽油机'},
+            {Id: 173, FullName: '无游梁式抽油机'}
           ]
         }],
         deliverTitle: '',

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

@@ -184,20 +184,20 @@
         options: [{
           label: '特检',
           options: [
-            {Id: 179, FullName: '电气接地装置检测'},
-            {Id: 286, FullName: '防雷装置检测'},
-            {Id: 187, FullName: '防雷装置（等电位）检测'},
-            {Id: 181, FullName: '漏电保护器检测'}
+            {Id: 179, FullName: '电气接地装置'},
+            {Id: 286, FullName: '防雷装置'},
+            {Id: 187, FullName: '防雷装置（等电位）'},
+            {Id: 181, FullName: '漏电保护器'}
           ]
         }, {
           label: '宇信',
           options: [
-            {Id: 156, FullName: '阻火器检测'},
-            {Id: 183, FullName: '呼吸阀检测'},
-            {Id: 154, FullName: '液压安全阀检测'},
-            {Id: 189, FullName: '空气泡沫产生器检测'},
-            {Id: 141, FullName: '游梁式抽油机检测'},
-            {Id: 173, FullName: '无游梁式抽油机检测'}
+            {Id: 156, FullName: '阻火器'},
+            {Id: 183, FullName: '呼吸阀'},
+            {Id: 154, FullName: '液压安全阀'},
+            {Id: 189, FullName: '空气泡沫产生器'},
+            {Id: 141, FullName: '游梁式抽油机'},
+            {Id: 173, FullName: '无游梁式抽油机'}
           ]
         }],
         departmentId: '',

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

@@ -547,20 +547,20 @@
         options: [{
           label: '特检',
           options: [
-            {Id: 179, FullName: '电气接地装置检测'},
-            {Id: 286, FullName: '防雷装置检测'},
-            {Id: 187, FullName: '防雷装置（等电位）检测'},
-            {Id: 181, FullName: '漏电保护器检测'}
+            {Id: 179, FullName: '电气接地装置'},
+            {Id: 286, FullName: '防雷装置'},
+            {Id: 187, FullName: '防雷装置（等电位）'},
+            {Id: 181, FullName: '漏电保护器'}
           ]
         }, {
           label: '宇信',
           options: [
-            {Id: 156, FullName: '阻火器检测'},
-            {Id: 183, FullName: '呼吸阀检测'},
-            {Id: 154, FullName: '液压安全阀检测'},
-            {Id: 189, FullName: '空气泡沫产生器检测'},
-            {Id: 141, FullName: '游梁式抽油机检测'},
-            {Id: 173, FullName: '无游梁式抽油机检测'}
+            {Id: 156, FullName: '阻火器'},
+            {Id: 183, FullName: '呼吸阀'},
+            {Id: 154, FullName: '液压安全阀'},
+            {Id: 189, FullName: '空气泡沫产生器'},
+            {Id: 141, FullName: '游梁式抽油机'},
+            {Id: 173, FullName: '无游梁式抽油机'}
           ]
         }],
         status_flag: false,
@@ -1493,19 +1493,19 @@
         //   })
         if (this.tjz) {
           this.projectTypeList = [
-            {Id: 179, FullName: '电气接地装置检测', TemplateCode: 'DAYT.ElecGround.Report'},
-            {Id: 286, FullName: '防雷装置检测', TemplateCode: 'DAYT.LightProtect.Report'},
-            {Id: 187, FullName: '防雷装置（等电位）检测', TemplateCode: 'DAYT.Equipotent.Report'},
-            {Id: 181, FullName: '漏电保护器检测', TemplateCode: 'DAYT.LeakProtect.Report'}
+            {Id: 179, FullName: '电气接地装置', TemplateCode: 'DAYT.ElecGround.Report'},
+            {Id: 286, FullName: '防雷装置', TemplateCode: 'DAYT.LightProtect.Report'},
+            {Id: 187, FullName: '防雷装置（等电位）', TemplateCode: 'DAYT.Equipotent.Report'},
+            {Id: 181, FullName: '漏电保护器', TemplateCode: 'DAYT.LeakProtect.Report'}
           ]
         } else {
           this.projectTypeList = [
-            {Id: 156, FullName: '阻火器检测', TemplateCode: ''},
-            {Id: 183, FullName: '呼吸阀检测', TemplateCode: ''},
-            {Id: 154, FullName: '液压安全阀检测', TemplateCode: ''},
-            {Id: 189, FullName: '空气泡沫产生器检测', TemplateCode: ''},
-            {Id: 141, FullName: '游梁式抽油机检测', TemplateCode: ''},
-            {Id: 173, FullName: '无游梁式抽油机检测', TemplateCode: ''}
+            {Id: 156, FullName: '阻火器', TemplateCode: ''},
+            {Id: 183, FullName: '呼吸阀', TemplateCode: ''},
+            {Id: 154, FullName: '液压安全阀', TemplateCode: ''},
+            {Id: 189, FullName: '空气泡沫产生器', TemplateCode: ''},
+            {Id: 141, FullName: '游梁式抽油机', TemplateCode: ''},
+            {Id: 173, FullName: '无游梁式抽油机', TemplateCode: ''}
           ]
         }
       },

src/dashoo.cn/frontend_web/src/pages/prototype/deviceList.vue

@@ -158,51 +158,51 @@
         height: 400,
         tableData2: [{
           seqNo: '1',
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号位',
           address2: '大连制表厂',
           address3: 'A001'
         }, {
           seqNo: '2',
-          name: '阻火器检测',
+          name: '阻火器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'B002'
         }, {
           seqNo: '3',
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'C003'
 
         }, {
           seqNo: '4',
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'D004'
         },{
           seqNo: '5',
-          name: '无游梁式抽油机检测',
+          name: '无游梁式抽油机',
           address: '1号位',
           address2: '大连制表厂',
           address3: 'A001'
         }, {
           seqNo: '6',
-          name: '阻火器检测',
+          name: '阻火器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'B002'
         }, {
           seqNo: '7',
-          name: '呼吸阀检测',
+          name: '呼吸阀',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'C003'
 
         }, {
           seqNo: '8',
-          name: '空气泡沫产生器检测',
+          name: '空气泡沫产生器',
           address: '2号位',
           address2: '大连制表厂',
           address3: 'D004'

src/dashoo.cn/frontend_web/src/pages/prototype/leaderTowLevelCenter.vue

@@ -246,22 +246,22 @@
           precent: 70,
           date: '2016-05-02',
           name: 'A001',
-          address: '无游梁式抽油机检测',
+          address: '无游梁式抽油机',
         }, {
           precent: 60,
           date: '2016-05-04',
           name: 'B002',
-          address: '阻火器检测'
+          address: '阻火器'
         }, {
           precent: 66,
           date: '2016-05-01',
           name: 'C003',
-          address: '呼吸阀检测',
+          address: '呼吸阀',
         }, {
           precent: 80,
           date: '2016-05-03',
           name: 'D004',
-          address: '空气泡沫产生器检测'
+          address: '空气泡沫产生器'
         }]
       }
     }

src/dashoo.cn/frontend_web/src/pages/prototype/outerUnitCenter.vue

@@ -376,22 +376,22 @@
           precent: 70,
           date: '2016-05-02',
           name: 'A001',
-          address: '无游梁式抽油机检测',
+          address: '无游梁式抽油机',
         }, {
           precent: 60,
           date: '2016-05-04',
           name: 'B002',
-          address: '阻火器检测'
+          address: '阻火器'
         }, {
           precent: 66,
           date: '2016-05-01',
           name: 'C003',
-          address: '呼吸阀检测',
+          address: '呼吸阀',
         }, {
           precent: 80,
           date: '2016-05-03',
           name: 'D004',
-          address: '空气泡沫产生器检测'
+          address: '空气泡沫产生器'
         }]
       }
     }

src/dashoo.cn/frontend_web/src/pages/prototype/safeCheck.vue

@@ -169,22 +169,22 @@
           precent: 70,
           date: '2016-05-02',
           name: 'A001',
-          address: '无游梁式抽油机检测',
+          address: '无游梁式抽油机',
         }, {
           precent: 60,
           date: '2016-05-04',
           name: 'B002',
-          address: '阻火器检测'
+          address: '阻火器'
         }, {
           precent: 66,
           date: '2016-05-01',
           name: 'C003',
-          address: '呼吸阀检测',
+          address: '呼吸阀',
         }, {
           precent: 80,
           date: '2016-05-03',
           name: 'D004',
-          address: '空气泡沫产生器检测'
+          address: '空气泡沫产生器'
         }]
       }
     }