Merge branch 'master' of http://122.9.151.159:9090/r/smart-web

lzhe

2024-09-09 a958e950dc675c7a3e9cbbbc66e6656669d3a34b

 src/views/console/workstation/index.vue

@@ -7,11 +7,10 @@
                  <el-aside width="200px" v-loading="showGrouploading">
                     <el-container>
                        <el-main class="nopadding">
                           <el-tree ref="group" class="menu" node-key="id" :data="group"
                              :current-node-key="treeCheckKey" :highlight-current="true"
                              :expand-on-click-node="false" :check-on-click-node="true"
                              :default-expanded-keys="[1]" :render-content="renderContent"
                              @node-click="groupClick1"></el-tree>
                           <el-tree :expand-on-click-node="false" ref="group" class="menu" node-key="id"
                              :data="group" :current-node-key="treeCheckKey" :highlight-current="true"
                              :check-on-click-node="true" :default-expanded-keys="[1]"
                              :render-content="renderContent" @node-click="groupClick1"></el-tree>
                        </el-main>
                     </el-container>
                  </el-aside>
@@ -94,7 +93,9 @@
                                 <el-tabs tab-position="top" class="custom-tabs" v-model="normal">
                                    <el-tab-pane label="机器信息" name="1">
                                       <el-container>
                                          <el-header>基础数据</el-header>
                                          <el-header>
                                             <h2>基础数据</h2>
                                          </el-header>
                                          <el-main>
                                             <el-row>
                                                <el-col :span="4">
@@ -126,14 +127,14 @@
                                       </el-container>
                                       <el-container>
                                          <el-header>
                                             <span>采集信息</span>
                                             <el-button @click="editFlag = !editFlag"
                                                style="margin-left: auto;" text type="primary"
                                                size="small">配置工位采集</el-button>
                                             <h2>采集信息</h2>
                                             <el-button v-show="list.length > 0"
                                                @click="editFlag = !editFlag" style="margin-left: auto;"
                                                text type="primary" size="small">配置工位采集</el-button>
                                             <el-button v-show="editFlag" @click="saveInfo" text
                                                type="primary" size="small">保存</el-button>
                                             <el-button text type="primary"
                                                size="small">修改DMP配置</el-button>
                                             <el-button text type="primary" size="small"
                                                @click="editDMP">修改DMP配置</el-button>
                                          </el-header>
                                          <el-main>
                                             <el-table :data="list" height="200px">
@@ -492,6 +493,15 @@
      this.queryList()
   },
   methods: {
      editDMP() {
         this.$HTTP.get(`/api/blade-system/param/detail?paramKey=system.dmp.url`).then(res => {
            if (res.success) {
               window.open(res.data.paramValue)
            } else {
               this.$message.error(res.msg)
            }
         })
      },
      renderContent(h, { data }) {
         let img = data.groupTag == 'fms_beltline'
         return h('span', {