Kaynağa Gözat

更改监控,更改免登录首页,更改人员请假,更改人力资源

sunyanqiang 3 yıl önce
ebeveyn
işleme
39444352b1

+ 27 - 0
src/App.vue

@@ -7,6 +7,14 @@
 <script>
 export default {
   name: "App",
+  data() {
+    return {
+      loginForm: {
+        username: "fsdd",
+        password: "123456",
+      },
+    };
+  },
   metaInfo() {
     return {
       title:
@@ -19,6 +27,25 @@ export default {
       },
     };
   },
+  created() {
+    // 获取当前地址的名字
+    var url = window.document.location.pathname;
+    // 获取当前地址之后的目录
+    var url1 = window.document.location.hash;
+    console.log( window.document.location);
+    console.log( url );
+    if (url === "/admin") {
+      this.getloing();
+    }
+  },
+  methods: {
+    getloing() {
+      this.$store.dispatch("Login", this.loginForm).then(() => {
+        this.$router.push({ path: "/pt" }).catch(() => {});
+        window.document.location.pathname='/123'
+      });
+    },
+  },
 };
 </script>
 

+ 3 - 0
src/assets/styles/global.css

@@ -922,6 +922,9 @@ body #app .sidebar-container .theme-dark .nest-menu .el-submenu>.el-submenu__tit
 .input_xiala:hover {
   color: #000 !important;
 }
+.ren_yuan{
+  width: 510px !important;
+}
 
 
 /* 要事日记数据盒子的位置 */

+ 63 - 0
src/components/flv/index.vue

@@ -0,0 +1,63 @@
+<template>
+  <video
+    autoplay
+    controls
+    style="
+      width: 100%;
+      height: 100%;
+      margin-left: 5px;
+      margin-bottom: 5px;
+      position: relative;
+    "
+    :id="id"
+  ></video>
+</template>
+
+<script>
+import flvjs from "flv.js";
+export default {
+    name: 'faith',
+  props: ["id", "url"],
+  data() {
+    return {
+        flvPlayer: null,
+    };
+  },
+  created() {
+    console.log(this.url);
+  },
+  mounted() {
+    this.singleplayvideo();
+  },
+  methods: {
+    singleplayvideo() {
+      if (flvjs.isSupported()) {
+        var videoElement = document.getElementById(this.id);
+        this.flvPlayer = flvjs.createPlayer({
+          type: "flv",
+          url: this.url,
+        });
+        this.flvPlayer.attachMediaElement(videoElement);
+        this.flvPlayer.load();
+        this.flvPlayer.play();
+      }
+    },
+    destoryVideo(flvPlayer) {
+      flvPlayer.pause();
+      flvPlayer.unload();
+      flvPlayer.detachMediaElement();
+      flvPlayer.destroy();
+      flvPlayer = null;
+    },
+  },
+  watch: {
+    url(newname) {
+      this.destoryVideo(this.flvPlayer)
+      this.singleplayvideo();
+    },
+  },
+};
+</script>
+
+<style>
+</style>

+ 2 - 0
src/main.js

@@ -32,6 +32,7 @@ import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
 import RightToolbar from "@/components/RightToolbar"
 // 富文本组件
+import flv from "@/components/flv"
 import Editor from "@/components/Editor"
 // 文件上传组件
 import FileUpload from "@/components/FileUpload"
@@ -89,6 +90,7 @@ Vue.component('RightToolbar', RightToolbar)
 Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
+Vue.component('flv', flv)
 
 Vue.use(directive)
 Vue.use(plugins)

+ 1 - 1
src/utils/request.js

@@ -10,7 +10,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 30000
 })
 // request拦截器
 service.interceptors.request.use(config => {

+ 1 - 1
src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -919,7 +919,7 @@ export default {
                 }
               }
               if (num1 === num) {
-                pdateBdglweekwork(this.form).then((response) => {
+                updateBdglweekwork(this.form).then((response) => {
                   this.$modal.msgSuccess("修改成功");
                   this.open = false;
                   this.getList();

+ 3 - 3
src/views/login.vue

@@ -38,7 +38,7 @@
           />
         </el-input>
       </el-form-item>
-      <el-form-item v-if="captchaOnOff" v-show="false">
+      <!-- <el-form-item v-if="captchaOnOff" v-show="false">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -55,7 +55,7 @@
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item style="width: 100%">
         <el-button
           :loading="loading"
@@ -125,7 +125,7 @@ export default {
     },
   },
   created() {
-    this.getCode();
+    // this.getCode();
     this.getCookie();
   },
   methods: {

+ 65 - 779
src/views/monitoring/camera/index.vue

@@ -1,262 +1,24 @@
 <template>
-  <div class="app-container">
-    <!-- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="摄像头名称" prop="cname">
-        <el-input
-          v-model="queryParams.cname"
-          placeholder="请输入摄像头名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="访问地址" prop="caddr">
-        <el-input
-          v-model="queryParams.caddr"
-          placeholder="请输入访问地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="cstatus">
-        <el-select v-model="queryParams.cstatus" placeholder="请选择状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.createtime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="单位id" prop="unitid">
-        <el-input
-          v-model="queryParams.unitid"
-          placeholder="请输入单位id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="unitname">
-        <el-input
-          v-model="queryParams.unitname"
-          placeholder="请输入单位名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="存入菜单ID" prop="powerArea">
-        <el-input
-          v-model="queryParams.powerArea"
-          placeholder="请输入存入菜单ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form> -->
-
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['monitoring:camera:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['monitoring:camera:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitoring:camera:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['monitoring:camera:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
-    <!-- 
-    <el-table v-loading="loading" :data="cameraList" @selection-change="handleSelectionChange">
-      <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="cname" />
-      <el-table-column label="访问地址" align="center" prop="caddr" />
-      <el-table-column label="状态" align="center" prop="cstatus" />
-      <el-table-column label="创建时间" align="center" prop="createtime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createtime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位id" align="center" prop="unitid" />
-      <el-table-column label="单位名称" align="center" prop="unitname" />
-      <el-table-column label="存入菜单ID" align="center" prop="powerArea" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['monitoring:camera:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['monitoring:camera:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table> -->
-
-    <!-- <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    /> -->
-
-    <!-- 添加或修改安防监控对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="800px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
-        <el-form-item label="摄像头名称" prop="cname">
-          <el-input v-model="form.cname" placeholder="请输入摄像头名称" />
-        </el-form-item>
-        <el-form-item label="访问地址" prop="caddr">
-          <el-input v-model="form.caddr" placeholder="请输入访问地址" />
-        </el-form-item>
-
-        <!-- <el-form-item label="单位id" prop="unitid">
-          <el-input v-model="form.unitid" placeholder="请输入单位id" />
-        </el-form-item> -->
-        <el-form-item label="单位名称" prop="unitname">
-          <!-- <el-input v-model="form.unitname" placeholder="请输入单位名称" /> -->
-          <treeselect
-            v-model="form.unitid"
-            :options="users"
-            placeholder="请选择单位"
-            class="threeselects"
-            @select="selectPeo"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="cstatus">
-          <!-- <el-radio-group v-model="form.cstatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-
-          </el-radio-group> -->
-          <el-switch
-            v-model="form.cstatus"
-            active-color="#13ce66"
-            inactive-color="#ccc"
-            active-value="1"
-            inactive-value="0"
-          >
-          </el-switch>
-          <span class="greed" v-if="form.cstatus == '1'"></span>
-          <span class="CCC" v-if="form.cstatus == '0'"></span>
-        </el-form-item>
-        <!-- <el-form-item label="存入菜单ID" prop="powerArea">
-          <el-input v-model="form.powerArea" placeholder="请输入存入菜单ID" />
-        </el-form-item> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 视频播放窗口 -->
-
+  <div>
     <el-row>
-      <el-col :span="1.5">
-        <!-- <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['monitoring:camera:add']"
-          >新增</el-button
-        > -->
-      </el-col>
+      <el-col :span="1.5"> </el-col>
       <el-col :span="1.5" class="isSubmit">
-        <!-- <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun"> -->
         <button
-          @click="one"
+          @click="faith_one"
           id="onevideos"
           class="single"
-          :class="this.btn == 0 ? 'bg' : ''"
+          :class="!this.isfour ? 'bg' : ''"
         >
           单屏
         </button>
-        <!-- <button
-          
-          class="singles"
-          :class="this.btn == 1 ? 'bg' : ''"
-        >
-          四分屏
-        </button> -->
-        <!-- <el-radio-button label="2">九分屏</el-radio-button> -->
-        <!-- <el-radio-button label="3" class="allFlv1">十六分屏</el-radio-button> -->
         <button
-          @click="four"
+          @click="faith_four"
           id="allvideos"
           class="allFlv"
-          :class="this.btn == 1 ? 'bg' : ''"
+          :class="this.isfour ? 'bg' : ''"
         >
           全通道FLV
         </button>
-        <!-- <el-radio-button label="5" class="fullscreen">全屏</el-radio-button> -->
-        <!-- </el-radio-group> -->
       </el-col>
     </el-row>
     <hr />
@@ -271,26 +33,13 @@
           摄像头
         </div>
         <div class="tree">
-          <!-- <el-tree
-            class="userAgrees"
-            style="height: calc(100vh - 240px); overflow: auto"
-            :data="rtsplist"
-            :props="defaultProps"
-            @node-click="clickhandleitem(item,index)"
-            default-expand-all
-            highlight-current
-            :expand-on-click-node="false"
-          ></el-tree> -->
           <!-- 左侧 -->
           <div class="videolist">
             <div class="userAgrees">
-              <ul
-                style="height: calc(100vh - 240px); overflow: auto"
-                v-if="this.as == true"
-              >
+              <ul style="height: calc(100vh - 240px); overflow: auto">
                 <li
                   style="margin-left: -40px; padding-left: 40px"
-                  v-for="(item, index) in cameraList"
+                  v-for="(item, index) in fourVideo"
                   :key="item.id"
                   @click="clickhandleitem(item, index)"
                 >
@@ -298,20 +47,14 @@
                   {{ item.cname }}
                 </li>
               </ul>
-              <!-- <div id="aa">
-              {{cameraList.query}}
-            </div> -->
             </div>
           </div>
         </div>
       </el-col>
-      <!-- </el-row> -->
       <el-col :span="19" :xs="24">
         <!-- 单屏播放 -->
-        <div style="position: relative" v-if="this.btn == 0">
+        <div style="position: relative" v-if="!isfour">
           <div
-            v-for="(i, index) in 1"
-            :key="index"
             style="
               width: 100%;
               height: calc(100vh - 200px);
@@ -320,548 +63,91 @@
               position: relative;
             "
           >
-            <!-- <button
-              style="position: absolute; left: 5px; z-index: 999"
-              class="choose"
-              @click="chooselu"
-            >
-              选择通道
-            </button> -->
-            <!-- :id="'videoElement' + i" -->
-            <video
-              autoplay
-              controls
-              style="
-                width: 100%;
-                height: 100%;
-                margin-left: 5px;
-                margin-bottom: 5px;
-                position: relative;
-              "
-              id="singleplay"
-            ></video>
+            <flv id="faith" :url="onevideoUrl.caddr" />
           </div>
         </div>
         <!-- 四屏播放 -->
         <!-- <keep-alive> -->
-        <div class="video1" v-if="this.btn == 1 && this.dan == false">
-          <div
-            v-for="(i, index) in this.fourvideo"
-            :key="index"
-            class="fourscreen"
-          >
-            <video
-              autoplay
-              controls
-              style="
-                width: 100%;
-                height: 100%;
-                margin-left: 5px;
-                margin-bottom: 5px;
-                position: relative;
-              "
-              :id="'singleplay' + index"
-            ></video>
-          </div>
-        </div>
-        <div class="video1" v-if="this.btn == 1 && this.dan == true">
-          <div v-for="(i, index) in 1" :key="index" class="fullscreen">
-            <video
-              autoplay
-              controls
-              style="width: 100%; height: 100%; position: relative"
-              :id="'singleplay' + index"
-            ></video>
+        <div class="video1" v-else>
+          <div v-for="(item, index) in arr" :key="index" class="fourscreen">
+            <flv :id="index" :url="arr[index].caddr" />
           </div>
         </div>
       </el-col>
     </el-row>
+
+    <!-- <div  v-else v-for="(item, index) in fourVideo" :key="index">
+      <flv :id="index" :url="item.caddr"/>
+    </div> -->
   </div>
 </template>
 
 <script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
-import flvjs from "flv.js";
-import {
-  listCamera,
-  getCamera,
-  delCamera,
-  addCamera,
-  updateCamera,
-  exportCamera,
-} from "@/api/monitoring/camera";
+import { listCamera } from "@/api/monitoring/camera";
 export default {
-  name: "Camera",
-  components: {
-    Treeselect,
-  },
+  name: "Stui",
   data() {
     return {
-      // 树形配置
-      defaultProps: {
-        children: "children",
-        label: "rtsp",
-      },
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 安防监控表格数据
-      cameraList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        cname: null,
-        caddr: null,
-        cstatus: null,
-        createtime: null,
-        unitid: null,
-        unitname: null,
-        powerArea: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {},
-      rtsplist: [
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream0.flv",
-          player: null,
-        },
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream1.flv",
-          player: null,
-        },
-
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream0.flv",
-          player: null,
-        },
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream1.flv",
-          player: null,
-        },
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream0.flv",
-          player: null,
-        },
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream1.flv",
-          player: null,
-        },
-
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream1.flv",
-          player: null,
-        },
-        {
-          rtsp: "http://192.168.5.187/hdl/live/stream1.flv",
-          player: null,
-        },
-      ],
-      // 单视频
-      flvPlayer1: null,
-      flvPlayer: null,
-      inputvalue: "",
-      devicename: "60",
-      url: "",
-      list: [],
-      count: 1, // 当前点击标识
-      flvPlayerList: [],
-      datalist: [],
-      screen: 1,
-      // 单个视频播放
-      url1: "http://192.168.5.187/hdl/live/stream0.flv",
-      // 获取单位
-      users: [],
-      flvPlayerList1: [],
-      fourvideo: 4,
-      videourl: [
-        "http://192.168.5.187/hdl/live/stream0.flv",
-        "http://192.168.5.187/hdl/live/stream1.flv",
-        "http://192.168.5.187/hdl/live/stream0.flv",
-        "http://192.168.5.187/hdl/live/stream1.flv",
-      ],
-      btn: 0,
-      clickindex: "",
-      sixvideo: 6,
-      dan: false,
-      as: true,
-      belongLocal: "",
-      ad: 0,
+      isfour: false,
+      onevideoUrl: null,
+      fourVideo: [],
+      faith: 0,
+      arr:[]
     };
   },
-  mounted() {
-    listCamera(this.queryParams).then((response) => {
-      this.url1 = response.rows[0].caddr;
-    });
-    // 单个视频播放
-    // this.singleplayvideo();
-    this.oneVideo();
-    // 点击
-    this.$bus.$on("Click", (cameraList) => {
-      listCamera({ belongLocal: cameraList.query }).then((response) => {
-        this.cameraList = response.rows;
-        this.ad = 1;
-        this.getList(cameraList.query);
-      });
-    });
-  },
   created() {
-    this.queryParams.type = 0;
-    // debugger
-    this.aa();
-    // 获取执行单位列表
-    getDept2().then((res) => {
-      this.users = res.data;
-    });
+    this.jiekou();
   },
   methods: {
-    // 调用List接口
-    aa() {
-      if (this.$route.path == "/monitoring/camera") {
-        this.getList(1);
-      } else {
-        var index = this.$route.path.lastIndexOf("/");
-        let str = this.$route.path.substring(
-          index + 1,
-          this.$route.path.length
-        );
-
-        // const a = this.$route.path.substring(this.$route.path.lastIndexOf("/"));
-        this.getList(str);
-      }
-    },
-    // 初始化视频
-    singleplayvideo(name, url, num) {
-      if (flvjs.isSupported()) {
-        // debugger;
-        name = flvjs.createPlayer(
-          {
-            type: "flv",
-            url: url, //你的url地址
-          },
-          {
-            enableWorker: false, //不启用分离线程
-            enableStashBuffer: false, //关闭IO隐藏缓冲区
-            reuseRedirectedURL: true, //重用301/302重定向url,用于随后的请求,如查找、重新连接等。
-            autoCleanupSourceBuffer: true, //自动清除缓存
-            fixAudioTimestampGap: false,
-          }
-        );
-        this.$nextTick(() => {
-          // 可以使用回调函数的写法
-          // 这个函数中DOM必定渲染完成
-          let videoElement1 = document.getElementById("singleplay" + num);
-          // debugger;
-          name.attachMediaElement(videoElement1);
-          // name.load();
-          // name.play();
-          if (url !== "" && url !== null) {
-            name.load();
-            name.play();
-          }
-          //定时方法是为了用户离开页面视频是实时播放的,暂停按钮无用
-          setInterval(function () {
-            if (videoElement1.buffered.length > 0) {
-              const end = videoElement1.buffered.end(0); // 视频结尾时间
-              const current = videoElement1.currentTime; //  视频当前时间
-              const diff = end - current; // 相差时间
-
-              const diffCritical = 4; // 这里设定了超过4秒以上就进行跳转
-              const diffSpeedUp = 1; // 这里设置了超过1秒以上则进行视频加速播放
-              const maxPlaybackRate = 4; // 自定义设置允许的最大播放速度
-              let playbackRate = 1.0; // 播放速度
-              if (diff > diffCritical) {
-                //  this.flvPlayer.load();
-                // console.log("相差超过4秒,进行跳转");
-                videoElement1.currentTime = end - 1.5;
-                playbackRate = Math.max(1, Math.min(diffCritical, 16));
-              } else if (diff > diffSpeedUp) {
-                // console.log("相差超过1秒,进行加速");
-                playbackRate = Math.max(1, Math.min(diff, maxPlaybackRate, 16));
-              }
-              videoElement1.playbackRate = playbackRate;
-              if (videoElement1.paused) {
-                setTimeout(() => {
-                  videoElement1.play();
-                }, 10);
-              }
-            }
-          }, 1000);
-
-          name.on(flvjs.Events.ERROR, (errType, errDetail) => {
-            // alert("网络波动,正在尝试连接中...");
-            if (name) {
-              this.reloadVideo(name);
-            }
-          });
-          this.flvPlayerList1.push(name);
-        });
-      }
-      // this.destoryVideo(this.flvPlayerList1[0])
+    faith_one() {
+      this.isfour = false;
     },
-    // 单视屏
-    oneVideo() {
-      this.singleplayvideo("flvPlayer1", this.url1, "");
+    faith_four() {
+      this.isfour = true;
     },
-    // 单分屏点击事件。
-    // 单分屏点击事件。
-    clickhandleitem(data, index) {
-      if (this.btn == 0) {
-        for (var j of this.flvPlayerList1) {
-          this.destoryVideo(this.flvPlayerList1[0]);
-          this.flvPlayerList1.shift();
-        }
-
-        this.url1 = this.cameraList[index].caddr;
-        this.singleplayvideo("flvPlayer1", this.url1, "");
-      } else if (this.btn == 1) {
-        for (var j of this.flvPlayerList1) {
-          this.destoryVideo(this.flvPlayerList1[0]);
-          this.flvPlayerList1.shift();
+    jiekou() {
+      var index = this.$route.path.split("/")[2];
+      listCamera({ belongLocal: index }).then((response) => {
+        this.fourVideo = response.rows;
+        if (this.fourVideo.length >= 4) {
+         this.fourVideo.forEach((item,i)=>{
+           if (i <= 3){
+             this.arr.push(item)
+           }
+          });
+        }else {
+          this.fourVideo.forEach((item,i)=>{
+           if (i <= 3){
+             this.arr.push(item)
+           }
+          });
         }
-        this.fourvideo = 1;
-        this.clickindex = index;
-        for (var i of this.flvPlayerList1) {
-          this.destoryVideo(this.flvPlayerList1[0]);
-          this.flvPlayerList1.shift();
+        if (
+          response.rows != undefined ||
+          response.rows != null ||
+          response.rows != "" ||
+          response.rows != response.rows.lenght > 0
+        ) {
+          this.onevideoUrl = [...response.rows][0];
         }
-        // if (this.flvPlayerList1.length > 3) {
-        //   this.destoryVideo(this.flvPlayerList1[0]);
-        //   this.flvPlayerList1.shift();
-        // }
-        this.url1 = this.cameraList[index].caddr;
-        this.dan = true;
-        this.singleplayvideo("flvPlayer1", this.url1, 0);
-      }
-    },
-    // 播放
-    play(flvPlayer) {
-      flvPlayer.play();
-    },
-    // 单分屏播放
-    one() {
-      this.btn = 0;
-      $("#allvideos").removeAttr("disabled");
-      $("#onevideos").attr({ disabled: "disabled" });
-      for (var i of this.flvPlayerList1) {
-        this.destoryVideo(this.flvPlayerList1[0]);
-        this.flvPlayerList1.shift();
-      }
-      this.oneVideo();
+      });
     },
-    // 四分屏播放
-    four() {
-      this.fourvideo = 4;
-      this.btn = 1;
-      this.dan = false;
-      $("#allvideos").attr({ disabled: "disabled" });
-      $("#onevideos").removeAttr("disabled");
-
-      for (var i of this.flvPlayerList1) {
-        this.destoryVideo(this.flvPlayerList1[0]);
-        this.flvPlayerList1.shift();
-      }
-
-      if (this.cameraList.length < this.fourvideo) {
-        for (var i = 0; i < this.cameraList.length; i++) {
-          this.url1 = this.cameraList[i].caddr;
 
-          // 报错原因是这个地址没有视频
-          // console.log(this.url1);
-          this.singleplayvideo("flvPlayer" + i, this.url1, i);
-        }
+    // 单分屏点击事件。
+    clickhandleitem(data, index) {
+      if (!this.isfour) {
+        this.onevideoUrl = [...this.fourVideo][index];
       } else {
-        for (var i = 0; i < this.fourvideo; i++) {
-          this.url1 = this.cameraList[i].caddr;
-          // 报错原因是这个地址没有视频
-          // console.log(this.url1);
-          this.singleplayvideo("flvPlayer" + i, this.url1, i);
+        this.arr[this.faith].caddr = this.fourVideo[index].caddr
+        this.faith += 1
+        if (this.faith == 4){
+          this.faith = 0
+          var index = this.$route.path.split("/")[2];
+      listCamera({ belongLocal: index }).then((response) => {
+        this.fourVideo = response.rows;})
         }
       }
     },
-    /** 查询安防监控列表 */
-    getList(a) {
-      // debugger
-      this.loading = true;
-      listCamera({ belongLocal: a }).then((response) => {
-        this.cameraList = response.rows;
-        this.url1 = this.cameraList[0].caddr;
-
-        this.total = response.total;
-        this.loading = false;
-        // this.queryParams.type==""
-      });
-    },
-    // 操作类型
-    caoZuoTypefun() {
-      this.getList();
-    },
-    reloadVideo(flvPlayer) {
-      this.destoryVideo(flvPlayer);
-      try {
-        this.createVideo();
-      } finally {
-        this.algain();
-      }
-    },
-    algain() {
-      if (this.createVideo() !== error) {
-        return;
-      } else {
-        try {
-          this.createVideo();
-        } catch (e) {}
-      }
-    },
-    // 全通道
-    // all() {
-    //   this.sixvideo = 6;
-    //   this.btn = 1;
-    //   this.dan=false
-    //   for (var i of this.flvPlayerList1) {
-    //     this.destoryVideo(this.flvPlayerList1[0]);
-    //     this.flvPlayerList1.shift();
-    //   }
-    //
-    //   for (var i = 0; i < this.sixvideo; i++) {
-    //     this.url1 = this.cameraList[i].caddr;
-    //     this.singleplayvideo("flvPlayer" + i, this.url1, i);
-    //   }
-    // },
-    // reloadVideo(flvPlayer) {
-    //   this.destoryVideo(flvPlayer);
-    //   this.createVideo();
-    //   // this.singleplayvideo();
-    // },
-    destoryVideo(flvPlayer) {
-      flvPlayer.pause();
-      flvPlayer.unload();
-      flvPlayer.detachMediaElement();
-      flvPlayer.destroy();
-      flvPlayer = null;
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        cname: null,
-        caddr: null,
-        cstatus: "0",
-        createtime: null,
-        unitid: null,
-        unitname: null,
-        powerArea: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    selectPeo(item) {
-      this.form.unitname = item.label;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加安防监控";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      getCamera(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改安防监控";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateCamera(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.aa();
-            });
-          } else {
-            addCamera(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.aa();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除安防监控编号为"' + ids + '"的数据项?')
-        .then(function () {
-          return delCamera(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal
-        .confirm("是否确认导出所有安防监控数据项?")
-        .then(() => {
-          this.exportLoading = true;
-          return exportCamera(queryParams);
-        })
-        .then((response) => {
-          this.$download.name(response.msg);
-          this.exportLoading = false;
-        })
-        .catch(() => {});
-    },
   },
 };
 </script>
@@ -1247,4 +533,4 @@ video {
   margin-bottom: 5px;
   position: relative;
 }
-</style>
+</style>

+ 1 - 1
src/views/monitoring/cameracp/index.vue

@@ -237,7 +237,7 @@
           <el-input v-model="form.caddr" placeholder="请输入访问地址" />
         </el-form-item>
 
-        <el-form-item label="是否显示">
+        <el-form-item label="单屏">
           <el-switch
             v-model="form.cstatus"
             active-color="#13ce66"

+ 119 - 161
src/views/peopleChuRu/bdglLeave/index.vue

@@ -396,24 +396,6 @@
             @open="blurSelect"
           />
         </el-form-item>
-        <el-form-item label="请假人员" prop="peopleId">
-          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请输入请假人员"
-            ref="headerSearchSelect"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen(item.name)"
-              class="input_xiala"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
 
         <el-form-item label="请假开始时间" prop="startTime">
           <el-date-picker
@@ -549,6 +531,27 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="请假人员" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入请假人员"
+            ref="headerSearchSelect"
+            multiple
+            class="ren_yuan"
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <div class="jiben">请假原因</div>
         <el-form-item prop="leaveReason">
           <el-input
@@ -557,39 +560,11 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <div class="jiben" v-if="statussp == '1'">驳回原因</div>
-        <el-form-item v-if="statussp == '1'" prop="reasons">
-          <el-input
-            v-model="form.reasons"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben" v-if="statussp == '2'">驳回原因</div>
-        <el-form-item v-if="statussp == '2'" prop="reasons">
-          <el-input
-            v-model="form.reasons"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben" v-if="statussp == '2'">特殊审批原因</div>
-        <el-form-item v-if="statussp == '2'" prop="reasons">
-          <el-input
-            v-model="form.specialApproval"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer" v-if="statussp == '0'">
+      <div slot="footer" class="dialog-footer" >
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
-      <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
-        <el-button type="primary" @click="submitForms">通过</el-button>
-        <el-button @click="boHui" size="btn">驳回</el-button>
-      </div>
     </el-dialog>
 
     <!-- 修改人员请假对话框 -->
@@ -619,25 +594,6 @@
             :disabled="xiugai"
           />
         </el-form-item>
-        <el-form-item label="请假人员" prop="peopleId">
-          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请输入请假人员"
-            ref="headerSearchSelect"
-            :disabled="xiugai"
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen(item.name)"
-              class="input_xiala"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
 
         <el-form-item label="请假开始时间" prop="startTime">
           <el-date-picker
@@ -777,6 +733,28 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="请假人员" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入请假人员"
+            ref="headerSearchSelect"
+            :disabled="xiugai"
+            multiple
+            class="ren_yuan"
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
         <div class="jiben">请假原因</div>
         <el-form-item prop="leaveReason">
           <el-input
@@ -785,39 +763,11 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <div class="jiben" v-if="statussp == '1'">驳回原因</div>
-        <el-form-item v-if="statussp == '1'" prop="reasons">
-          <el-input
-            v-model="form.reasons"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben" v-if="statussp == '2'">驳回原因</div>
-        <el-form-item v-if="statussp == '2'" prop="reasons">
-          <el-input
-            v-model="form.reasons"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben" v-if="statussp == '2'">特殊审批原因</div>
-        <el-form-item v-if="statussp == '2'" prop="reasons">
-          <el-input
-            v-model="form.specialApproval"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer" v-if="statussp == '0'">
+      <div slot="footer" class="dialog-footer" >
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
-      <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
-        <el-button type="primary" @click="submitForms">通过</el-button>
-        <el-button @click="boHui" size="btn">驳回</el-button>
-      </div>
     </el-dialog>
 
     <!-- 审批人员请假对话框 -->
@@ -847,25 +797,6 @@
             disabled
           />
         </el-form-item>
-        <el-form-item label="请假人员" prop="peopleId">
-          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请输入请假人员"
-            ref="headerSearchSelect"
-            disabled
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen(item.name)"
-              class="input_xiala"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
 
         <el-form-item label="请假开始时间" prop="startTime">
           <el-date-picker
@@ -1013,6 +944,29 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="请假人员" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入请假人员"
+            ref="headerSearchSelect"
+            disabled
+            multiple
+            class="ren_yuan"
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <div class="jiben">请假原因</div>
         <el-form-item prop="leaveReason">
           <el-input
@@ -1022,36 +976,16 @@
             disabled
           />
         </el-form-item>
-        <div class="jiben" v-if="statussp == '1'">驳回原因</div>
-        <el-form-item v-if="statussp == '1'" prop="reasons">
-          <el-input
-            v-model="form.reasons"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben" v-if="statussp == '2'">驳回原因</div>
-        <el-form-item v-if="statussp == '2'" prop="reasons">
+        <div class="jiben">驳回原因</div>
+        <el-form-item  prop="reasons">
           <el-input
             v-model="form.reasons"
             type="textarea"
             placeholder="请输入内容"
           />
         </el-form-item>
-        <div class="jiben" v-if="statussp == '2'">特殊审批原因</div>
-        <el-form-item v-if="statussp == '2'" prop="reasons">
-          <el-input
-            v-model="form.specialApproval"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer" v-if="statussp == '0'">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
-      </div>
-      <div v-if="statussp == '1'" class="dialog-footer" slot="footer">
+      <div  class="dialog-footer" slot="footer">
         <el-button type="primary" @click="submitForms">通过</el-button>
         <el-button @click="boHui" size="btn">驳回</el-button>
       </div>
@@ -1080,23 +1014,6 @@
             disabled
           />
         </el-form-item>
-        <el-form-item label="请假人员" prop="peopleId">
-          <el-select
-            v-model="form.peopleId"
-            placeholder="请选择请假人员"
-            ref="headerSearchSelect"
-            disabled
-          >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen(item.name)"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
 
         <el-form-item label="请假开始时间" prop="startTime">
           <el-date-picker
@@ -1232,6 +1149,27 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="请假人员" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请选择请假人员"
+            ref="headerSearchSelect"
+            disabled
+            multiple
+            class="ren_yuan"
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
         <div class="jiben">请假原因</div>
         <el-form-item prop="leaveReason">
           <el-input
@@ -1414,6 +1352,8 @@ export default {
       open1: false,
       // 修改审批人禁止修改
       xiugai: false,
+      // 修改拿到的数据
+      result: {},
       // 审批弹出层显示与隐藏
       open2: false,
     };
@@ -1448,13 +1388,15 @@ export default {
     // // 特殊审批按钮触发
     handleUpdatess(row) {
       this.teShu = row;
-      this.statussp = "2";
       this.getBuMeng();
       // 获取字典类型
       this.getdict();
       this.reset();
       const id = row.id || this.ids;
       getBdglLeave(id).then((response) => {
+        this.result = response.data;
+        this.result.peopleId = this.result.peopleId.split(",");
+        this.result.peopleId = this.result.peopleId.map(Number);
         this.form = response.data;
         this.form.specialApproval = null;
         this.getYong(this.form.unitId);
@@ -1466,13 +1408,15 @@ export default {
     // 审批按钮操作
     handleUpdates(row) {
       this.shenPis = row;
-      this.statussp = "1";
       this.getBuMeng();
       // 获取字典类型
       this.getdict();
       this.reset();
       const id = row.id || this.ids;
       getBdglLeave(id).then((response) => {
+        this.result = response.data;
+        this.result.peopleId = this.result.peopleId.split(",");
+        this.result.peopleId = this.result.peopleId.map(Number);
         this.form = response.data;
         this.getYong(this.form.unitId);
         this.getRen(this.form.unitId);
@@ -1503,7 +1447,7 @@ export default {
     },
     // 请假人选中
     qingRen(name) {
-      this.form.peopleName = name;
+      // this.form.peopleName = name;
     },
     // 一级审批人选中
     oneRen(name) {
@@ -1578,6 +1522,7 @@ export default {
         this.form.status4 = 1;
         this.form.contents = "四级审批通过";
       }
+      this.form.peopleId =this.form.peopleId.join(',')
       updateBdglLeave(this.form).then((response) => {
         this.$modal.msgSuccess("审批成功");
         this.open2 = false;
@@ -1601,6 +1546,7 @@ export default {
             this.form.status4 = 2;
             return (this.shenPis.form.contents = "四级审批驳回");
           }
+           this.form.peopleId =this.form.peopleId.join(',')
           updateBdglLeave(this.form).then((response) => {
             this.$modal.msgSuccess("审批成功");
             this.open2 = false;
@@ -1631,6 +1577,7 @@ export default {
             this.form.contents = "四级审批通过";
           }
           if (this.form.id != null) {
+             this.form.peopleId =this.form.peopleId.join(',')
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");
               this.opens = false;
@@ -1662,6 +1609,7 @@ export default {
             this.form.contents = "四级审批驳回";
           }
           if (this.form.id != null) {
+             this.form.peopleId =this.form.peopleId.join(',')
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("审批成功");
               this.opens = false;
@@ -1721,7 +1669,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.statussp = "0";
       (this.renYuan = []),
         // 获取单位树形
         this.getBuMeng();
@@ -1733,7 +1680,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.statussp = "0";
       if (
         row.status1 != 0 ||
         row.status2 != 0 ||
@@ -1741,14 +1687,22 @@ export default {
         row.status4 != 0
       ) {
         this.xiugai = true;
-      }
+      }else if( row.status1 == 0 ||
+        row.status2 == 0 ||
+        row.status3 == 0 ||
+        row.status4 == 0) {
+          this.xiugai=false
+        }
       this.getBuMeng();
       // 获取字典类型
       this.getdict();
       this.reset();
       const id = row.id || this.ids;
       getBdglLeave(id).then((response) => {
-        this.form = response.data;
+        this.result = response.data;
+        this.result.peopleId = this.result.peopleId.split(",");
+        this.result.peopleId = this.result.peopleId.map(Number);
+        this.form = this.result;
         this.getYong(this.form.unitId);
         this.getRen(this.form.unitId);
         this.open1 = true;
@@ -1760,6 +1714,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.peopleId = this.form.peopleId.join(",");
             updateBdglLeave(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -1774,6 +1729,9 @@ export default {
               this.form.peopleId3 ||
               this.form.peopleId4
             ) {
+              if (this.form.peopleId.length > 0) {
+                this.form.peopleId = this.form.peopleId.join(",");
+              }
               addBdglLeave(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;

+ 2 - 2
src/views/system/user/index.vue

@@ -36,9 +36,9 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item prop="userName">
+          <el-form-item prop="nickName">
             <el-input
-              v-model="queryParams.userName"
+              v-model="queryParams.nickName"
               placeholder="请输入用户名称"
               size="small"
               style="width: 240px"