Merge branch 'apiupdate' of git.sagacloud.cn:web/ibms into apiupdate

src/components/config_point/examine_main.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
-        <select-one @check="typeCheck" :renderData="typeArr" infosKey="EquipmentType" name="原始点位描述中的设备类型关键字"></select-one>
-        <select-one @check="paramCheck" :renderData="identifyArr" infosKey="ownMess" name="原始点位描述中设备参数关键字"></select-one>
+        <select-one @check="typeCheck" :renderData="typeArr" infosKey="EquipmentType" name="原始点位描述中的对象类型关键字"></select-one>
+        <select-one @check="paramCheck" :renderData="identifyArr" infosKey="ownMess" name="原始点位描述中对象参数关键字"></select-one>
         <div class="handson-view saga-border">
             <div v-if="hotData.length" class="h100">
                 <div class="title-view">
@@ -57,7 +57,7 @@
                 EquipmentType: "",
                 EquipmentParameter: "",
                 inputValue: "",
-                header: ['原始点位描述', '值/单位说明', '*识别的设备类型关键字', '*识别的设备参数关键字'],
+                header: ['原始点位描述', '值/单位说明', '*识别的对象类型关键字', '*识别的对象参数关键字'],
                 type: [{
                         data: 'Description',
                         readOnly: true
@@ -121,7 +121,7 @@
             },
             //设备参数被点击
             paramCheck(item) {
-                console.log(item, "设备参数")
+                console.log(item, "对象参数")
                 this.inputValue = ""
                 if (!!item) {
                     this.EquipmentParameter = (item.EquipmentParameter == "空" || !item.EquipmentParameter) ? null : item.EquipmentParameter

src/components/config_point/find_keyword.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="view-find-word">
         <div class="saga-border" style="position:relative;">
-            <p class="center">请从下面的原始点位描述中选择"{{type == 'type' ? "设备类型" : "设备参数"}}"关键字</p>
+            <p class="center">请从下面的原始点位描述中选择"{{type == 'type' ? "对象类型" : "对象参数"}}"关键字</p>
             <div style="position:absolute;top: 0;right: 20px;">
                 <el-switch
                     @change="changeType(type)"

src/components/config_point/step3_edit/auto_handle.vue

@@ -1,6 +1,6 @@
 <template>
     <el-form ref='form' :rules='rules' :model='form' label-width='140px'>
-        <el-form-item v-if='devFlag' ref='form' label='设备标识' prop='EquipmentMark'>
+        <el-form-item v-if='devFlag' ref='form' label='对象标识' prop='EquipmentMark'>
             <el-input v-model='form.EquipmentMark'></el-input>
         </el-form-item>
         <el-form-item
@@ -31,7 +31,7 @@ export default {
                 unit: [],
             },
             rules: {
-                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }],
+                EquipmentMark: [{ required: true, message: '请输入对象标识', trigger: 'blur' }],
             }
         }
     },

src/components/config_point/step3_edit/enum_handle.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='edit-box'>
         <el-form ref='form' :rules='rules' :model='form' label-width='140px'>
-            <el-form-item v-if='devFlag' label='设备标识' prop='EquipmentMark'>
+            <el-form-item v-if='devFlag' label='对象标识' prop='EquipmentMark'>
                 <el-input v-model='form.EquipmentMark'></el-input>
             </el-form-item>
 
@@ -47,7 +47,7 @@ export default {
                 pointArr: [{ from: '', to: '' }]
             },
             rules: {
-                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }]
+                EquipmentMark: [{ required: true, message: '请输入对象标识', trigger: 'blur' }]
             }
         }
     },

src/components/config_point/step3_edit/formula_handle.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='edit-box'>
         <el-form ref='form' :rules='rules' :model='form' label-width='140px'>
-            <el-form-item v-if='devFlag' label='设备标识' prop='EquipmentMark'>
+            <el-form-item v-if='devFlag' label='对象标识' prop='EquipmentMark'>
                 <el-input v-model='form.EquipmentMark'></el-input>
             </el-form-item>
         </el-form>
@@ -53,7 +53,7 @@ export default {
             },
             extract: true,
             rules: {
-                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }]
+                EquipmentMark: [{ required: true, message: '请输入对象标识', trigger: 'blur' }]
             },
             subStrVal: false,
             from: 1,

src/components/config_point/step3_edit/index.vue

@@ -11,11 +11,11 @@
           <span>{{editData.Point.LocationFlag.toString() || '--'}}</span>
         </li>
         <li>
-          <span>设备类型</span>&nbsp;&nbsp;&nbsp;
+          <span>对象类型</span>&nbsp;&nbsp;&nbsp;
           <span>{{editData.Point.KeyEquipmentType || '--'}}</span>
         </li>
         <li>
-          <span>设备参数</span>&nbsp;&nbsp;&nbsp;
+          <span>对象参数</span>&nbsp;&nbsp;&nbsp;
           <span>{{editData.Point.KeyEquipmentParameter || '--'}}</span>
         </li>
         <li>
@@ -213,7 +213,7 @@ export default {
       } else if (this.dictionaryData.length == 4) { //专业系统
         basicParams.SpecialtyCode = this.dictionaryData[1]
         basicParams.Specialty = this.dictionaryNames[1]
-        basicParams.SystemCode = this.dictionaryNames[2]
+        basicParams.SystemCode = this.dictionaryData[2]
         basicParams.System = this.dictionaryNames[2]
       }
       let updateParams = {
@@ -365,38 +365,40 @@ export default {
     },
     handleItemChange(val, cb) {
       if (val.length == 3) {
-        let params = { type: val[2] }
-        getQueryProperty(params, res => {
-          if (res.Result == 'success') {
-            let data = res.Content
-            let arr = data
-              .filter(item => {
-                return item.inputMode == 'L' || item.inputMode == 'M'
+        if(val[2]!='null'){
+          let params = { type: val[2] }
+          getQueryProperty(params, res => {
+            if (res.Result == 'success') {
+              let data = res.Content
+              let arr = data
+                .filter(item => {
+                  return item.inputMode == 'L' || item.inputMode == 'M'
+                })
+                .map(item => {
+                  return {
+                    code: item.infoPointCode,
+                    name: item.infoPointName
+                  }
+                })
+              this.infoDict = {}
+              data.forEach(item => {
+                this.infoDict[item.infoPointCode] = item
               })
-              .map(item => {
-                return {
-                  code: item.infoPointCode,
-                  name: item.infoPointName
-                }
-              })
-            this.infoDict = {}
-            data.forEach(item => {
-              this.infoDict[item.infoPointCode] = item
-            })
-            this.optionObj = {}
-            this.getOptionItem(this.options, val[2])
+              this.optionObj = {}
+              this.getOptionItem(this.options, val[2])
 
-            if (arr.length) {
-              this.optionObj.content = arr
-            } else {
-              this.optionObj.content = undefined
-            }
+              if (arr.length) {
+                this.optionObj.content = arr
+              } else {
+                this.optionObj.content = undefined
+              }
 
-            if (typeof cb == 'function') {
-              cb()
+              if (typeof cb == 'function') {
+                cb()
+              }
             }
-          }
-        })
+          })
+        }
       }
     },
     getOptionItem(arr, code) {
@@ -435,7 +437,7 @@ export default {
     },
     //回显数值
     async showValue(val) {
-      await this.getEqAll()
+      // await this.getEqAll()
       let length = val.RelationList.length
       let eqMark = this.editData.Point.EquipmentMark
       if (length) {

src/components/config_point/step3_edit/no_handle.vue

@@ -1,6 +1,6 @@
 <template>
     <el-form ref='form' :model='form' :rules='rules' label-width='140px'>
-        <el-form-item v-if='devFlag' label='设备标识' prop="EquipmentMark">
+        <el-form-item v-if='devFlag' label='对象标识' prop="EquipmentMark">
             <el-input v-model='form.EquipmentMark'></el-input>
         </el-form-item>
     </el-form>
@@ -15,7 +15,7 @@ export default {
                 EquipmentMark: ''
             },
             rules: {
-                EquipmentMark: [{ required: true, message: '请输入设备标识', trigger: 'blur' }],
+                EquipmentMark: [{ required: true, message: '请输入对象标识', trigger: 'blur' }],
             }
         }
     },

src/components/config_point/step3_edit/split_handle.vue

@@ -1,15 +1,15 @@
 <template>
     <div class='edit-box'>
         <el-form v-if='form.devArr.length' class='form' ref='form' :model='form' label-width='140px'>
-            <el-form-item v-if='devFlag' label='原设备标识' prop="eqMark">
+            <el-form-item v-if='devFlag' label='原对象标识' prop="eqMark">
                 <el-input v-model='form.eqMark' :disabled="true"></el-input>
             </el-form-item>
             <div class='dev-know' v-for='(item,index) in form.devArr' :key='index'>
                 <el-form-item
                     v-if='devFlag'
-                    label='设备标识'
+                    label='对象标识'
                     :prop='"devArr." + index + ".EquipmentMark"'
-                    :rules='{required: true, message: "设备标识不能为空", trigger: "blur"}'>
+                    :rules='{required: true, message: "对象标识不能为空", trigger: "blur"}'>
                     <el-input v-model='item.EquipmentMark'></el-input>
                 </el-form-item>
                 <p class='strsub'>
@@ -20,7 +20,7 @@
                 <i v-if='index > 0' class='el-icon-minus del-sub-icon' @click='delDev(index)'></i>
             </div>
             <div class='add-btn-box'>
-                <el-button type='primary' @click='addDevs'>+添加设备标识</el-button>
+                <el-button type='primary' @click='addDevs'>+添加对象标识</el-button>
             </div>
             <p class='tranf-box'>
                 需要将截取值转换为标准值

src/components/config_point/step3_point/3_identify.vue

@@ -11,11 +11,11 @@
                     <div class="collapse-item">
                         <div style="display: flex;justify-content: space-between; height: 40px; line-height: 40px;padding:0 5px;box-sizing:border-box;">
                             <p>
-                                <el-input  v-model="fillData" placeholder="批量填充空白的设备标识" style="width: 180px; margin-right: 10px;"></el-input>
+                                <el-input  v-model="fillData" placeholder="批量填充空白的对象标识" style="width: 180px; margin-right: 10px;"></el-input>
                                 <el-button @click="fillClick">填充</el-button>
                             </p>
                             <p style="display: flex">
-                                <span style="margin-right: 10px; color: #909399;" >AI建议的设备标识</span>
+                                <span style="margin-right: 10px; color: #909399;" >AI建议的对象标识</span>
                                 <span class='ai-eq' :title="item.EquipmentMark" @click="aiHandle(item.EquipmentMark)">{{item.EquipmentMark || '--'}}</span>
                             </p>
                         </div>
@@ -300,7 +300,7 @@
                     data: 'own'
                 })
                 data.colHeaders.splice(0, 0,'原始点位描述')
-                data.colHeaders.splice(0, 0,'设备标识')
+                data.colHeaders.splice(0, 0,'对象标识')
                 data.columns.push({
                     data: 'LocationFlag',
                     readOnly: true

src/components/config_point/step3_point/3_temps.vue

@@ -3,7 +3,7 @@
     <el-steps :active="activeName" align-center>
       <el-step title="步骤1" description="确定与数据字典中信息点对应"></el-step>
       <el-step title="步骤2" description="确定值得处理方式"></el-step>
-      <el-step title="步骤3" description="确认并维护涉及到得原始点位对应得设备标识"></el-step>
+      <el-step title="步骤3" description="确认并维护涉及到得原始点位对应得对象标识"></el-step>
     </el-steps>
     <div class="collapse-item" v-show="activeName == 0">
       <el-form class="form" :rules="rules" ref="form" :model="form1" label-width="120px">
@@ -219,7 +219,7 @@ export default {
         })
       })
       if (sameFalg) {
-        this.confirm("点位中存在设备标识相同的点位，确认保存吗?", params)
+        this.confirm("点位中存在对象标识相同的点位，确认保存吗?", params)
       } else {
         this.createParam(params)
       }
@@ -323,7 +323,7 @@ export default {
               let setting = {
                 data: this.renderData,
                 maxRows: this.renderData.length,
-                colHeaders: ['设备标识', '原始点位描述', '位置标签', '备注'],
+                colHeaders: ['对象标识', '原始点位描述', '位置标签', '备注'],
                 columns: [{
                   data: 'EquipmentMark'
                 },
@@ -371,7 +371,7 @@ export default {
       } else if (this.dictionaryData.length == 4) { //专业系统
         basicParams.SpecialtyCode = this.dictionaryData[1]
         basicParams.Specialty = this.dictionaryNames[1]
-        basicParams.SystemCode = this.dictionaryNames[2]
+        basicParams.SystemCode = this.dictionaryData[2]
         basicParams.System = this.dictionaryNames[2]
       }
       let otherParams = {}
@@ -486,7 +486,7 @@ export default {
     },
     validateDict(rule, value, cb) {
       if (value.length < 4) {
-        cb(new Error('请选到第四级(可能本设备没有信息点)'))
+        cb(new Error('请选到第四级(可能本对象没有信息点)'))
       } else {
         cb()
       }

src/components/config_point/step3_point/dialog_main.vue

@@ -1,8 +1,8 @@
 <!--steps3的左侧-->
 <template>
     <div class="steps3-dialog-main">
-        <select-one @check="typeCheck" :renderData="typeArr" :isSelected="true" isCheckInfo="EquipmentMarkStandardized" infosKey="EquipmentType" :name="'原始点位描述中识别的设备类型'"></select-one>
-        <select-one @check="paramCheck" :renderData="identifyArr" infosKey="ownMess" :name="'已标准化的设备标识'"></select-one>
+        <select-one @check="typeCheck" :renderData="typeArr" :isSelected="true" isCheckInfo="EquipmentMarkStandardized" infosKey="EquipmentType" :name="'原始点位描述中识别的对象类型'"></select-one>
+        <select-one @check="paramCheck" :renderData="identifyArr" infosKey="ownMess" :name="'已标准化的对象标识'"></select-one>
         <div class="own-collape">
             <ident-collape v-if="!isNull" ref="ident" @saved="resetTwo" :renderData="identDataArr"></ident-collape>
             <div v-else class="h100">
@@ -288,7 +288,7 @@
                             data: 'EquipmentMark'
                         })
                         data.colHeaders.splice(0, 0, '原始点位描述')
-                        data.colHeaders.splice(0, 0, '设备标识')
+                        data.colHeaders.splice(0, 0, '对象标识')
                         data.columns.push({
                             data: 'LocationFlag',
                             readOnly: true

src/components/config_point/step3_point/steps3_main.vue

@@ -1,8 +1,8 @@
 <!--steps3的左侧-->
 <template>
     <div class="steps3-dialog-main">
-        <select-one @check="typeCheck" :renderData="typeArr" :isSelected="true" isCheckInfo="PhysicalRelated" infosKey="EquipmentType" :name="'原始点位描述中识别的设备类型'"></select-one>
-        <select-one @check="paramCheck" :isDel="true" @deleteItem="deleteItem" :renderData="identifyArr" :isSelected="true" isCheckInfo="PhysicalRelated" infosKey="ownMess" :name="'原始点位描述中识别的设备参数'"></select-one>
+        <select-one @check="typeCheck" :renderData="typeArr" :isSelected="true" isCheckInfo="PhysicalRelated" infosKey="EquipmentType" :name="'原始点位描述中识别的对象类型'"></select-one>
+        <select-one @check="paramCheck" :isDel="true" @deleteItem="deleteItem" :renderData="identifyArr" :isSelected="true" isCheckInfo="PhysicalRelated" infosKey="ownMess" :name="'原始点位描述中识别的对象参数'"></select-one>
         <div class="own-collape">
             <temp-collape ref="ident" :renderData="identDataArr" @changed="changed"></temp-collape>
         </div>
@@ -67,7 +67,7 @@
             //删除设备参数
             deleteItem(item) {
                 console.log(item, 'item')
-                this.$confirm(`<p style='text-align:center;'>确定删除设备参数与数字字典的对应关系</p><p style='text-align:center;'>删除需重新配置</p>`, '提示', {
+                this.$confirm(`<p style='text-align:center;'>确定删除对象参数与数字字典的对应关系</p><p style='text-align:center;'>删除需重新配置</p>`, '提示', {
                     dangerouslyUseHTMLString: true
                 }).then(_ => {
                     deleteRelationList({

src/utils/point_edit/handson_header.js

@@ -204,21 +204,21 @@ let common = [{
         FirstTag: ""
     },
     {
-        InfoPointName: "设备类型关键字",
+        InfoPointName: "对象类型关键字",
         InfoPointCode: "KeyEquipmentType",
         InputMode: "B1",
         Visible: true,
         FirstTag: ""
     },
     {
-        InfoPointName: "设备参数关键字",
+        InfoPointName: "对象参数关键字",
         InfoPointCode: "KeyEquipmentParameter",
         InputMode: "B1",
         Visible: true,
         FirstTag: ""
     },
     {
-        InfoPointName: "设备标识",
+        InfoPointName: "对象标识",
         InfoPointCode: "EquipmentMark",
         InputMode: "B1",
         Visible: true,

src/utils/point_edit/steps2.js

@@ -20,14 +20,14 @@ export default [{
         FirstTag: ""
     },
     {
-        InfoPointName: "设备类型关键字",
+        InfoPointName: "对象类型关键字",
         InfoPointCode: "KeyEquipmentType",
         InputMode: "B1",
         Visible: true,
         FirstTag: ""
     },
     {
-        InfoPointName: "设备参数关键字",
+        InfoPointName: "对象参数关键字",
         InfoPointCode: "KeyEquipmentParameter",
         InputMode: "B1",
         Visible: true,

src/utils/point_edit/steps3.js

@@ -13,28 +13,28 @@ export default [{
         FirstTag: ""
     },
     {
-        InfoPointName: "设备类型关键字",
+        InfoPointName: "对象类型关键字",
         InfoPointCode: "KeyEquipmentType",
         InputMode: "B1",
         Visible: true,
         FirstTag: ""
     },
     {
-        InfoPointName: "设备参数关键字",
+        InfoPointName: "对象参数关键字",
         InfoPointCode: "KeyEquipmentParameter",
         InputMode: "B1",
         Visible: true,
         FirstTag: ""
     },
     {
-        InfoPointName: "设备标识",
+        InfoPointName: "对象标识",
         InfoPointCode: "EquipmentMark",
         InputMode: "B1",
         Visible: true,
         FirstTag: ""
     },
     {
-        InfoPointName: "数据字典设备类&信息点",
+        InfoPointName: "数据字典对象类&信息点",
         InfoPointCode: "PhysicalRelated",
         InputMode: "B1",
         Visible: true,

src/views/point/config_point/steps/index.vue

@@ -74,7 +74,6 @@
         },
         methods: {
             resize() {
-                console.log(222)
                 this.activeHeight = this.$refs.pointStep.parentElement.parentElement.parentElement.offsetHeight - 10
             },
             stepClick() {

src/views/point/config_point/steps/step2.vue

@@ -2,8 +2,8 @@
     <div id="handsonStep2">
         <div class="btns-view">
             <el-button style="width:164px" @click="aiDiscern">AI自动识别</el-button>
-            <el-button @click="discern(1)">批量识别设备类型关键字</el-button>
-            <el-button @click="discern(2)">批量识别设备参数关键字</el-button>
+            <el-button @click="discern(1)">批量识别对象类型关键字</el-button>
+            <el-button @click="discern(2)">批量识别对象参数关键字</el-button>
             <el-button style="width:164px" @click="examine">检查&微调</el-button>
             <div style="float:right;">
                 <el-button @click="reset">刷新</el-button>
@@ -144,7 +144,6 @@
             },
             //确认人工识别
             isTrue(){
-                console.log("222")
                 AIFindPoint({
                     data: {
                         DataSourceId: this.datasourceId
@@ -241,10 +240,10 @@
              */
             discern(num) {
                 if (num == 1) {
-                    this.title = "关键内容识别——批量识别设备类型关键字"
+                    this.title = "关键内容识别——批量识别对象类型关键字"
                     this.type = "type"
                 } else if (num == 2) {
-                    this.title = "关键内容识别——批量识别设备参数关键字"
+                    this.title = "关键内容识别——批量识别对象参数关键字"
                     this.type = "arguments"
                 }
                 this.isChangeDo(this.dialogDo,this.elseDo,true)

src/views/point/config_point/steps/step3.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="handsonStep2">
         <div class="btns-view">
-            <el-button @click="dialogShow(1)">根据关键内容批量标准化设备标识</el-button>
+            <el-button @click="dialogShow(1)">根据关键内容批量标准化对象标识</el-button>
             <el-button @click="dialogShow(2)">根据关键内容批量对应数据字典</el-button>
             <el-checkbox style="float:right;" @change="changeChecked" v-model="checked">只显示未标准化得的原始点位</el-checkbox>
         </div>
@@ -14,7 +14,7 @@
         <div v-if="pages.total" class="right">
             <pagination :page="pages" @change="changePage"></pagination>
         </div>
-        <own-dialog :width="'1200px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
+        <own-dialog :width="'1200px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化对象标识' " :dialogVisible="isDialogShow" @cancel="close">
             <dialog-main v-if="!isDataform"></dialog-main>
             <steps-main v-if="isDataform"></steps-main>
         </own-dialog>
@@ -108,7 +108,7 @@
                     this.getData()
                 }
             },
-            //页面显示num1为标准化设备标识，2为对应数据字典
+            //页面显示num1为标准化对象标识，2为对应数据字典
             dialogShow(num) {
                 if (num == 1) {
                     this.isDataform = false
@@ -160,7 +160,17 @@
                     let content = res.Content.map(item => {
                         if (item.RelationList.length) {
                             item.Point.DataRuleType = item.RelationList[0].DataRuleType
-                            item.Point.PhysicalRelated = item.RelationList[0].EquipmentType + '-' + item.RelationList[0].InfomationPoint
+                            item.Point.PhysicalRelated = item.RelationList[0].Type
+                            //设备-部件-空间
+                            if(item.RelationList[0].EquipmentTypeCode&&item.RelationList[0].EquipmentTypeCode!='null'){
+                                item.Point.PhysicalRelated += '-' + item.RelationList[0].EquipmentType
+                            }
+                            //系统
+                            if(item.RelationList[0].SystemCode&&item.RelationList[0].SystemCode!='null'){
+                                item.Point.PhysicalRelated += '-' + item.RelationList[0].Specialty
+                                item.Point.PhysicalRelated += '-' + item.RelationList[0].System
+                            }
+                            item.Point.PhysicalRelated += '-' + item.RelationList[0].InfomationPoint
                         }
                         return item
                     })
@@ -182,7 +192,6 @@
                         })
                     }
                     this.isLoading = false
-                    console.log(this.hot)
                 })
             },
             //刷新数据