Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 admin/src/views/business/sites.vue

@@ -8,7 +8,7 @@
      <el-form-item label="站点名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入站点名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      

      <!-- <el-form-item label="编码" prop="id">
        <el-input v-model="searchForm.id" placeholder="请输入编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
@@ -30,7 +30,7 @@
      <el-form-item label="备注" prop="info">
        <el-input v-model="searchForm.info" placeholder="请输入备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      

      <el-form-item label="状态 0正常 1禁用" prop="status">
        <el-input v-model="searchForm.status" placeholder="请输入状态 0正常 1禁用" @keypress.enter.native="search"></el-input>
      </el-form-item>
@@ -51,7 +51,7 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:sites:create']">
        <li><el-button type="primary" @click="$refs.operaSitesWindow.open('新建站点信息表')" icon="el-icon-plus" v-permissions="['business:sites:create']">新建</el-button></li>
        <li><el-button type="primary" @click="$refs.operaSitesWindow.open('新建站点')" icon="el-icon-plus" v-permissions="['business:sites:create']">新建</el-button></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
@@ -61,9 +61,9 @@
      >
        <el-table-column prop="code" label="站点编号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="name" label="站点名称" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="ip" label="站点ip" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="port" label="端口号" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="editDate" label="最后通讯时间" min-width="100px" align="center"></el-table-column>
        <!-- <el-table-column prop="ip" label="站点ip" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="port" label="端口号" min-width="100px" align="center"></el-table-column> -->
        <el-table-column prop="lastLinkDate" label="最后通讯时间" min-width="100px" align="center"></el-table-column>
        <el-table-column prop="status" label="状态" min-width="100px" align="center">
          <template slot-scope="{row}">
            <div v-if="row.status==0" style="color: green;">正常</div>
@@ -85,7 +85,8 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaSitesWindow.open('编辑站点信息表', row)" icon="el-icon-edit" v-permissions="['business:sites:update']">编辑</el-button>
            <el-button type="text" @click="$refs.QRcode.open('查看二维码', row.code)" icon="el-icon-picture-outline-round">查看二维码</el-button>
            <el-button type="text" @click="$refs.operaSitesWindow.open('编辑站点', row)" icon="el-icon-edit" v-permissions="['business:sites:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:sites:delete']">删除</el-button>
          </template>
        </el-table-column>
@@ -99,6 +100,8 @@
    </template>
    <!-- 新建/修改 -->
    <OperaSitesWindow ref="operaSitesWindow" @success="handlePageChange"/>
    <!--  查看二维码  -->
    <QRcode ref="QRcode" />
  </TableLayout>
</template>

@@ -107,10 +110,11 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaSitesWindow from '@/components/business/OperaSitesWindow'
import QRcode from '@/components/business/QRcode'
export default {
  name: 'Sites',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaSitesWindow },
  components: { TableLayout, Pagination, OperaSitesWindow, QRcode },
  data () {
    return {
      // 搜索