Commit 8de9b187 authored by yf's avatar yf
Browse files

fix:新增字段类型

parent 0a679116

src/views/algorithm/camera/index.vue

+29 −3
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ 
        <el-table-column type="selection" width="55" align="center" />

        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->

        <el-table-column label="摄像头名" align="center" prop="cameraName" />

        <el-table-column label="摄像头编号" show-overflow-tooltip align="center" prop="rtsp" />

        <el-table-column label="摄像头编号" show-overflow-tooltip align="center" prop="cameraNo" />

        <el-table-column label="支持的算法类型" show-overflow-tooltip align="center" prop="algorithmType" />

        <el-table-column label="rtsp视频流" show-overflow-tooltip align="center" prop="rtsp" />

        <el-table-column label="所属矿区" align="center" prop="belong" />

        <el-table-column label="创建时间" align="center" prop="createTime" width="160">

            <template slot-scope="scope">
@@ -106,8 +108,21 @@ 
          <el-form-item label="摄像头名" prop="cameraName">

            <el-input v-model="form.cameraName" placeholder="请输入摄像头名" />

          </el-form-item>

          <el-form-item label="摄像头编号" prop="rtsp">

            <el-input v-model="form.rtsp" placeholder="请输入摄像头编号" />

          <el-form-item label="摄像头编号" prop="cameraNo">

            <el-input v-model="form.cameraNo" placeholder="请输入摄像头编号" />

          </el-form-item>

          <el-form-item label="支持的算法类型" prop="algorithmType">

            <el-select multiple filterable  v-model="form.algorithmType" placeholder="请选择支持的算法类型">

                <el-option

                    v-for="item in cameraOptions"

                    :key="item.algorithmKey"

                    :label="item.algorithmName"

                    :value="item.algorithmKey">

                </el-option>

              </el-select>

          </el-form-item>

          <el-form-item label="rtsp视频流" prop="rtsp">

            <el-input v-model="form.rtsp" placeholder="请输入rtsp视频流" />

          </el-form-item>

          <el-form-item label="所属矿区" prop="belong">

            <el-select v-model="form.belong" placeholder="请选择">
@@ -144,6 +159,7 @@ 
  

  <script>

  import { listBase, getBase, delBase, addBase, updateBase } from "@/api/algorithm/camera";

  import { listBase as sflistBase} from "@/api/algorithm/base";

  

  export default {

    name: "Base",
@@ -154,6 +170,8 @@ 
        loading: true,

        // 选中数组

        ids: [],

        //算法类型数组

        cameraOptions: [],

        // 非单个禁用

        single: true,

        // 非多个禁用
@@ -175,6 +193,7 @@ 
          pageNum: 1,

          pageSize: 10,

          cameraName: null,

          cameraNo: null,

          rtsp: null,

          sort: null,

          status: null,
@@ -188,6 +207,7 @@ 
    },

    created() {

      this.getList();

      this.getSfList();

    },

    methods: {

      /** 查询算法摄像头列表 */
@@ -199,6 +219,11 @@ 
          this.loading = false;

        });

      },

      getSfList(){

        sflistBase({ pageNum: 1,pageSize: 9999,}).then(res=>{

         this.cameraOptions=res.rows

        })

      },

      // 取消按钮

      cancel() {

        this.open = false;
@@ -209,6 +234,7 @@ 
        this.form = {

          id: null,

          cameraName: null,

          cameraNo: null,

          rtsp: null,

          sort: null,

          status: null,