Merge branch 'refs/heads/master' into dev/1078-newUI

web/src/views/dialog/configInfo.vue

@@ -2,7 +2,7 @@
   <div id="configInfo">
     <el-dialog
       v-el-drag-dialog
-      title="系统信息"
+      title="接入信息"
       width="=80%"
       top="2rem"
       :close-on-click-modal="false"
@@ -11,7 +11,7 @@
       @close="close()"
     >
       <div id="shared" style="margin-top: 1rem;margin-right: 100px;">
-        <el-descriptions v-if="configInfoData.sip" title="国标服务信息" :span="2">
+        <el-descriptions v-if="(!key || key === 'sip') && configInfoData.sip" title="国标服务信息" :span="2">
           <el-descriptions-item label="编号">{{ configInfoData.sip.id }}</el-descriptions-item>
           <el-descriptions-item label="域">{{ configInfoData.sip.domain }}</el-descriptions-item>
           <el-descriptions-item label="IP">{{ configInfoData.sip.showIp }}</el-descriptions-item>
@@ -20,6 +20,12 @@
             <el-tag size="small">{{ configInfoData.sip.password }}</el-tag>
           </el-descriptions-item>
         </el-descriptions>
+        <el-descriptions v-if="key === 'jt1078Config' && configInfoData.jt1078Config" title="部标服务信息" :span="2">
+          <el-descriptions-item label="端口">{{ configInfoData.jt1078Config.port }}</el-descriptions-item>
+          <el-descriptions-item label="密码">
+            <el-tag size="small">{{ configInfoData.jt1078Config.password }}</el-tag>
+          </el-descriptions-item>
+        </el-descriptions>
       </div>
     </el-dialog>
   </div>
@@ -36,6 +42,7 @@ export default {
   data() {
     return {
       showDialog: false,
+      key: null,
       configInfoData: {
         sip: {}
 
@@ -45,9 +52,10 @@ export default {
   computed: {},
   created() {},
   methods: {
-    openDialog: function(data) {
+    openDialog: function(data, key) {
       console.log(data)
       this.showDialog = true
+      this.key = key
       this.configInfoData = data
     },
     close: function() {