sunyanqiang hace 2 años
padre
commit
6764e857dd

+ 9 - 0
src/api/grassrootsregistration/bdgldiary.js

@@ -76,4 +76,13 @@ export function getUserzs(params) {
     method: 'get',
     params
   })
+}
+
+// 要是日记导出
+export function exportDaily(query) {
+  return request({
+    url: '/grassrootsregistration/inspect/exportDaily',
+    method: 'get',
+    params:query
+  })
 }

BIN
src/assets/images/jiankong.png


+ 110 - 90
src/components/look_word/bdgldiary.vue

@@ -112,22 +112,22 @@
         </tr>
         <!-- 训练、教育或者执行其他任务情况 -->
         <tr class="JR_tr" align="center">
-          <td :rowspan="number" class="JR_left" width="48">
+          <td rowspan="6" class="JR_left" width="48">
             <p align="center" style="margin: 0 15px; font-family: '宋体'">
-              训 <br/>
-              练 <br/>
-              、 <br/>
-              教 <br/>
-              育 <br/>
-              或 <br/>
-              者 <br/>
-              执 <br/>
-              行 <br/>
-              其 <br/>
-              他 <br/>
-              任 <br/>
-              务 <br/>
-              情 <br/>
+              训 <br />
+              练 <br />
+              、 <br />
+              教 <br />
+              育 <br />
+              或 <br />
+              者 <br />
+              执 <br />
+              行 <br />
+              其 <br />
+              他 <br />
+              任 <br />
+              务 <br />
+              情 <br />
             </p>
           </td>
@@ -137,7 +137,7 @@
             class="JR_left"
             style="font-family: '宋体'"
           >
-            区<br/>
+            区<br />
           </td>
           <td
@@ -203,7 +203,7 @@
         <tr class="JR_tr" height="61">
           <td colspan="2" class="JR_left">
             <p align="center" style="font-family: '宋体'">
-              人员或 <br/>
+              人员或 <br />
               装备变动
             </p>
           </td>
@@ -220,15 +220,15 @@
         <tr class="JR_tr" height="207">
           <td rowspan=":count($xlian)" colspan="2" class="JR_left">
             <p align="center" style="font-family: '宋体'">
-              武 、 <br/>
-              器 内 <br/>
-              装 务 <br/>
-              备 卫 <br/>
-              、 生 <br/>
-              军 检 <br/>
-              容 查 <br/>
-              风 情 <br/>
-              纪 况<br/>
+              武 、 <br />
+              器 内 <br />
+              装 务 <br />
+              备 卫 <br />
+              、 生 <br />
+              军 检 <br />
+              容 查 <br />
+              风 情 <br />
+              纪 况<br />
             </p>
           </td>
           <td
@@ -254,9 +254,9 @@
         <tr class="JR_tr" style="font-family: '宋体'">
           <td :rowspan="chapu.rowspan" class="JR_left" width="57">
             <p align="center" style="font-family: '宋体'">
-              查 <br/>
-              铺 <br/>
-              查 <br/>
+              查 <br />
+              铺 <br />
+              查 <br />
             </p>
           </td>
@@ -318,15 +318,15 @@
         <tr class="JR_tr" style="font-family: '宋体'">
           <td class="JR_left" rowspan="4">
             <p align="center" style="font-family: '宋体'">
-              派 <br/>
-              班 <br/>
-              情 <br/>
+              派 <br />
+              班 <br />
+              情 <br />
             </p>
           </td>
           <td class="JR_left" height="26">
             <span align="center" style="font-family: '宋体'; height: 20px"
-            >职务</span
+              >职务</span
             >
           </td>
           <td class="JR_left">
@@ -387,8 +387,8 @@
           >
             <div style="margin-bottom: 10px">交接时间</div>
             <span v-if="message.dutyDate">{{
-                message.dutyDate | dataFormatshiF
-              }}</span>
+              message.dutyDate | dataFormatshiF
+            }}</span>
             <span v-else>时 分</span>
           </td>
           <td class="JR_right" colspan="8">
@@ -419,11 +419,11 @@
         <tr class="JR_tr" style="font-family: '宋体'">
           <td :rowspan="qinshu.rowspan" class="JR_left">
             <span align="center" style="font-family: '宋体'">
-              临 <br/>
-              时 <br/>
-              来 <br/>
-              队 <br/>
-              亲 <br/>
+              临 <br />
+              时 <br />
+              来 <br />
+              队 <br />
+              亲 <br />
             </span>
           </td>
@@ -512,14 +512,14 @@
         <tr class="JR_tr" align="center" style="font-family: '宋体'">
           <td :rowspan="qingjia.rowspan" class="JR_left">
             <span align="center" style="font-family: '宋体'">
-              请 <br/>
-              假 <br/>
-              外 <br/>
-              出 <br/>
-              、 <br/>
-              探 <br/>
-              亲 <br/>
-              休 <br/>
+              请 <br />
+              假 <br />
+              外 <br />
+              出 <br />
+              、 <br />
+              探 <br />
+              亲 <br />
+              休 <br />
             </span>
           </td>
@@ -531,23 +531,23 @@
             事&nbsp;&nbsp;&nbsp; 由
           </td>
           <td class="JR_left" colspan="1" style="font-family: '宋体'">
-            时数或 <br/>
+            时数或 <br />
             天&nbsp; 数
           </td>
           <td class="JR_left" colspan="2" style="font-family: '宋体'">
-            准假部 <br/>
+            准假部 <br />
             门(人)
           </td>
           <td class="JR_left" colspan="2" style="font-family: '宋体'">
-            离 队 <br/>
+            离 队 <br />
             时 间
           </td>
           <td class="JR_left" colspan="2" style="font-family: '宋体'">
-            归 队 <br/>
+            归 队 <br />
             时 间
           </td>
           <td class="JR_left" colspan="3" style="font-family: '宋体'">
-            超(误)假 <br/>
+            超(误)假 <br />
             时(天)数
           </td>
         </tr>
@@ -562,27 +562,27 @@
           </td>
           <td class="JR_right">
             <p align="center">
-              {{ item.job }}
+              {{ item.postName }}
               <!-- <dict-tag :options="dict.type.post_Level" :value="item.postId" /> -->
             </p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center">{{ item.reason }}</p>
+            <p align="center">{{ item.leaveReason }}</p>
           </td>
           <td class="JR_right" colspan="1">
-            <p align="center">{{ item.leaveDuration }}</p>
+            <p align="center">{{ item.shiShu }}</p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center">{{ item.leaveApprover }}</p>
+            <p align="center">{{ item.approvalDepartment }}</p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center">{{ item.departureTime }}</p>
+            <p align="center">{{ item.departureTime | dataFormatshiF }}</p>
           </td>
           <td class="JR_right" colspan="2">
-            <p align="center">{{ item.backTime }}</p>
+            <p align="center">{{ item.returnTime | dataFormatshiF }}</p>
           </td>
           <td class="JR_right" colspan="3">
-            <p align="center">{{ item.overTime }}</p>
+            <p align="center">{{ item.chao }}</p>
           </td>
         </tr>
         <tr
@@ -613,19 +613,19 @@
             style="font-family: '宋体'"
           >
             <span align="center" style="font-family: '宋体'">
-              上 <br/>
-              级 <br/>
-              通 <br/>
-              知 <br/>
-              、 <br/>
-              指 <br/>
-              示 <br/>
-              及 <br/>
-              其 <br/>
-              他 <br/>
-              重 <br/>
-              要 <br/>
-              事 <br/>
+              上 <br />
+              级 <br />
+              通 <br />
+              知 <br />
+              、 <br />
+              指 <br />
+              示 <br />
+              及 <br />
+              其 <br />
+              他 <br />
+              重 <br />
+              要 <br />
+              事 <br />
             </span>
           </td>
@@ -732,7 +732,7 @@ export default {
       xia: [],
       wan: [],
       bdglDiaryWeekworkRegisterList: [],
-      typeTime: ["早上", "上午", "下午", "晚上"]
+      typeTime: ["早上", "上午", "下午", "晚上"],
     };
   },
   created() {
@@ -743,24 +743,44 @@ export default {
     this.xunlian();
     this.qingjias();
     this.xunlians();
-    // this.xunlianRen();
-    if (this.message.bdglDiaryLeaveList) {
-      if (this.message.bdglDiaryLeaveList.length >= 6) {
+    this.tiemSGui();
+    if (this.message.bdglLeaveOneList) {
+      if (this.message.bdglLeaveOneList.length >= 6) {
         this.num = 0;
       } else {
-        this.num = 7 - this.message.bdglDiaryLeaveList.length;
+        this.num = 7 - this.message.bdglLeaveOneList.length;
       }
     } else {
       this.num = 7;
     }
   },
-  mounted() {
-  },
+  mounted() {},
 
   methods: {
+    // 计算天数
+    tiemSGui() {
+      var nums = null;
+      var chao = null;
+      if (this.message.bdglLeaveOneList != null) {
+        this.message.bdglLeaveOneList.forEach((item, i) => {
+          nums =
+            Date.parse(new Date(item.endTime)) -
+            Date.parse(new Date(item.startTime));
+          chao =
+            Date.parse(new Date(item.returnTime)) -
+            Date.parse(new Date(item.endTime));
+          nums = nums / 3600 / 1000;
+          if (chao >= 0) {
+            chao = chao / 3600 / 1000;
+            this.message.bdglLeaveOneList[i].chao = chao;
+          }
+          this.message.bdglLeaveOneList[i].shiShu = nums;
+        });
+      }
+    },
     xunlianRen(...args) {
       for (let i = 0; i < args.length; i++) {
-        this.bdglDiaryWeekworkRegisterList.push(this.tool(args[i]))
+        this.bdglDiaryWeekworkRegisterList.push(this.tool(args[i]));
       }
     },
 
@@ -771,14 +791,14 @@ export default {
         shouldArrive = "",
         percentage = "";
       i.forEach((item) => {
-        dateline = item.dateline
-        contents += (item.contents + "<br/>")
-        realTo += (item.realTo + "<br/>")
-        shouldArrive += (item.shouldArrive + "<br/>")
-        percentage += (item.percentage + "<br/>")
-      })
-      console.log({dateline,contents, realTo, shouldArrive, percentage})
-      return {dateline,contents, realTo, shouldArrive, percentage}
+        dateline = item.dateline;
+        contents += item.contents + "<br/>";
+        realTo += item.realTo + "<br/>";
+        shouldArrive += item.shouldArrive + "<br/>";
+        percentage += item.percentage + "<br/>";
+      });
+      console.log({ dateline, contents, realTo, shouldArrive, percentage });
+      return { dateline, contents, realTo, shouldArrive, percentage };
     },
 
     daochu() {
@@ -1053,7 +1073,7 @@ export default {
 .box1 {
   position: absolute;
   right: 30px;
-  top: 80px;
+  top: -60px;
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }

+ 91 - 15
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -55,6 +55,18 @@
             >新增</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="['grassrootsregistration:inspect:export']"
+            >导出</el-button
+          >
+        </el-col>
         <div class="shuJu" @click="dengJI">
           <span class="box44 public"> 当前数据为 : {{ tiems }}</span>
           <span class="box5 public">
@@ -110,7 +122,6 @@
         :header-cell-style="{ background: '#003C69', color: 'white' }"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <!-- <el-table-column label="序号" align="center" prop="id" /> -->
         <el-table-column label="序号" type="index" width="50" align="center">
           <template scope="scope">
             <span>{{
@@ -376,7 +387,7 @@
                   <td height="60">
                     <el-input v-model="item.dateline" placeholder=""></el-input>
                   </td>
-                  <td rowspan="2" colspan="2">
+                  <td rowspan="1" colspan="2">
                     <el-input
                       type="textarea"
                       :rows="1"
@@ -986,6 +997,59 @@
           </div>
         </div>
       </el-dialog>
+
+      <!-- 导出查铺查哨 -->
+      <el-dialog
+        :visible.sync="exportOpen"
+        title="导出查铺查哨"
+        append-to-body
+        :close-on-click-modal="false"
+        custom-class="exportDialog"
+      >
+        <el-form
+          ref="form3"
+          :model="form3"
+          :rules="rules1"
+          label-width="80px"
+          inline
+        >
+          <el-form-item label="单位" prop="unitId">
+            <treeselect
+              v-model="form3.unitId"
+              :options="rese"
+              placeholder="请选择单位"
+            />
+          </el-form-item>
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form3.startTime"
+              type="datetime"
+              placeholder="选择开始时间"
+              class="text"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form3.endTime"
+              type="datetime"
+              placeholder="选择结束时间"
+              class="text"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFormTi">确 定</el-button>
+          <el-button @click="reserexport" size="btn">关闭</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -998,9 +1062,9 @@ import {
   delBdgldiary,
   addBdgldiary,
   updateBdgldiary,
-  exportBdgldiary,
   exportBdgShuju,
   updateBdglShenPi,
+  exportDaily,
 } from "@/api/grassrootsregistration/bdgldiary";
 
 import {
@@ -1022,7 +1086,6 @@ import { getUserzs } from "@/api/grassrootsregistration/bdgldiary";
 import { getUserProfile } from "@/api/system/user";
 // 获取时间状态
 import { listDiary } from "@/api/system/diary";
-import { runInThisContext } from "vm";
 export default {
   components: { Treeselect, bdgldiary },
   name: "Bdgldiary",
@@ -1268,6 +1331,10 @@ export default {
       },
       // 训练列表
       xunList: [],
+      // 导出
+      exportOpen: false,
+      form3: {},
+      rules1: {},
     };
   },
   created() {
@@ -1919,9 +1986,7 @@ export default {
           if (
             this.xunlian[0].dateline != null &&
             this.xunlian[0].contents != null &&
-            this.xunlian[0].percentage != null &&
-            this.xunlian[0].shouldArrive!=null &&
-            this.xunlian.realTo
+            this.xunlian[0].percentage != null
           ) {
             this.form.bdglDiaryWeekworkRegisterList = this.xunlian;
           }
@@ -1993,16 +2058,26 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      this.exportOpen = true;
+    },
+    // 关闭导出弹框
+    reserexport() {
+      this.exportOpen = false;
+      this.form3 = {};
+    },
+    submitFormTi() {
+      const queryParams = this.form3;
+      // console.log(this.form3);
       this.$modal
         .confirm("是否确认导出所有要事日记数据项?")
         .then(() => {
           this.exportLoading = true;
-          return exportBdgldiary(queryParams);
+          return exportDaily(queryParams);
         })
         .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
+          this.reserexport();
         })
         .catch(() => {});
     },
@@ -2012,7 +2087,7 @@ export default {
 
 <style scoped>
 ::v-deep .el-dialog {
-  width: 1060px !important;
+  width: 1060px;
   background-color: #004d86;
   margin: auto;
 }
@@ -2390,11 +2465,6 @@ export default {
   margin-right: 20px;
 }
 
-/* 增加按钮弹框 */
-::v-deep .el-dialog {
-  width: 1060px !important;
-}
-
 ::v-deep .el-dialog__body {
   padding-left: 0px !important;
   padding-right: 0px !important;
@@ -2580,4 +2650,10 @@ export default {
   top: 47px;
   right: 64px;
 }
+::v-deep .exportDialog {
+  width: 500px;
+}
+::v-deep .exportDialog .el-dialog__footer {
+  margin-right: 83px;
+}
 </style>

+ 10 - 2
src/views/materialManagement/archives/index.vue

@@ -228,7 +228,15 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号" type="index" width="50" align="center">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize +
+            scope.$index +
+            1
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="物品类型" align="center" prop="wuPinType">
         <!-- <template slot-scope="scope">
           <dict-tag
@@ -332,7 +340,7 @@
         </el-form-item>
 
         <el-form-item label="责任人" prop="personLiableId">
-          <el-select v-model="form.personLiableId" placeholder="请选择责任人">
+          <el-select v-model="form.personLiableId" placeholder="请选择责任人"   filterable>
             <el-option
               class="input_xiala"
               v-for="(item, i) in renYuan"

+ 1 - 1
src/views/materialManagement/distribution/index.vue

@@ -466,7 +466,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="接收人" prop="recipient" v-if="ren">
-          <el-select v-model="form.recipient" placeholder="请选择接收人" @change="rens">
+          <el-select v-model="form.recipient" placeholder="请选择接收人" @change="rens"   filterable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"

+ 1 - 1
src/views/materialManagement/equipmentReceiving/index.vue

@@ -477,7 +477,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="接收人" prop="recipientId" v-if="ren">
-          <el-select v-model="form.recipientId" placeholder="请选择接收人">
+          <el-select v-model="form.recipientId" placeholder="请选择接收人"   filterable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"

+ 9 - 1
src/views/materialManagement/materialRegistration/index.vue

@@ -253,7 +253,15 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号" type="index" width="50" align="center">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize +
+            scope.$index +
+            1
+          }}</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="物品类型" align="center" prop="wuPinType">
         <template slot-scope="scope">
           <dict-tag

+ 223 - 212
src/views/monitoring/brigadecamera/index.vue

@@ -1,51 +1,96 @@
 <template>
   <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5" style="padding-top: 32px">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['monitoring:brigadecamera:add']"
+          >新增</el-button
+        >
+      </el-col>
+    </el-row>
+
     <div class="box">
       <ul>
         <li class="oneUl" v-for="(item, i) in cabinetList" :key="i">
           <div
-            style="
-              width: 265px;
-              height: 230px;
-              cursor: pointer;
-              text-align: center;
-            "
+            style="width: 265px; cursor: pointer; text-align: center"
+            @click="opens(item.cameraaddress)"
           >
-            <div class="title">摄像头</div>
-            <div style="margin-top: 34%">
-              <el-button size="btcks" @click="opens">查看</el-button>
-            </div>
+            <div class="title">{{ item.cameraname }}</div>
+          </div>
+          <div style="margin-top: 8px; margin-left: -14px;">
+            <el-button
+              size="btcks"
+              @click.prevent="handleUpdate(item)"
+              v-hasPermi="['monitoring:brigadecamera:edit']"
+              >修改</el-button
+            >
           </div>
         </li>
       </ul>
     </div>
+
+    <!-- 添加或修改摄像头管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+        style="padding-left: 54px"
+      >
+        <el-form-item label="名称" prop="cameraname">
+          <el-input v-model="form.cameraname" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="单位名称" prop="unitname">
+          <el-input v-model="form.unitname" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="摄像头地址" prop="cameraaddress">
+          <el-input
+            v-model="form.cameraaddress"
+            placeholder="请输入摄像头地址"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="cretetime">
+          <el-date-picker
+            clearable
+            v-model="form.cretetime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择创建时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-right: 108px">
+        <el-button size="btcksti" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import axios from "axios";
 import {
-  getCabinet,
-  delCabinet,
-  addCabinet,
-  updateCabinet,
-  exportCabinet,
-  xianPhone,
-  xianPhoneGeZi,
-  xianPhoneOppe,
-  getToken,
-} from "@/api/phone/cabinet";
-import { from } from "../../../../public/assets/libs/moment/src/lib/moment/from";
-import Cookies from "js-cookie";
+  listBrigadecamera,
+  getBrigadecamera,
+  delBrigadecamera,
+  addBrigadecamera,
+  updateBrigadecamera,
+} from "@/api/monitoring/brigadecamera";
 
 export default {
-  name: "Cabinet",
+  name: "Brigadecamera",
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -56,50 +101,47 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 手机柜表格数据
-      cabinetList: [
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-        { number: 1, ip: 2, gridCount: "你好" },
-      ],
-      // 手机柜格子列表
-      gridList: [],
+      // 摄像头管理表格数据
+      brigadecameraList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
-        pageNo: 1,
+        pageNum: 1,
         pageSize: 10,
-        number: null,
-        address: null,
-        gridNumber: null,
-        storageQuantity: null,
-        exceptionsNumber: null,
-        unitId: null,
-        unitName: null,
+        cameraname: null,
+        unitname: null,
+        cameraaddress: null,
+        cretetime: null,
       },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 手机柜表格数据
+      cabinetList: [],
+      // 手机柜格子列表
+      gridList: [],
     };
   },
   created() {
-    // this.getList();
+    this.getList();
   },
   methods: {
-    opens() {
-      console.log(1);
+    opens(url) {
+     window.open(url) 
+      console.log(url);
     },
-    /** 查询摄像头列表 */
+    /** 查询摄像头管理列表 */
     getList() {
-      xianPhone().then((res) => {
-        this.cabinetList = res.data.infos;
+      this.loading = true;
+      listBrigadecamera(this.queryParams).then((response) => {
+        console.log(response.rows);
+        this.cabinetList = response.rows;
+        this.total = response.total;
+        this.loading = false;
       });
     },
     // 取消按钮
@@ -111,13 +153,10 @@ export default {
     reset() {
       this.form = {
         id: null,
-        number: null,
-        address: null,
-        gridNumber: null,
-        storageQuantity: null,
-        exceptionsNumber: null,
-        unitId: null,
-        unitName: null,
+        cameraname: null,
+        unitname: null,
+        cameraaddress: null,
+        cretetime: null,
       };
       this.resetForm("form");
     },
@@ -131,10 +170,97 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加摄像头管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getBrigadecamera(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) {
+            updateBrigadecamera(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBrigadecamera(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除摄像头管理编号的数据项?")
+        .then(function () {
+          return delBrigadecamera(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
   },
 };
 </script>
 <style scoped>
+/* 调整表单间距 */
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 200px;
+}
+::v-deep .el-dialog {
+  width: 500px !important;
+  background-color: #004d86;
+  margin: auto;
+}
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+  margin: auto;
+}
+
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+
 * {
   padding: 0;
 }
@@ -146,24 +272,25 @@ ul {
   flex-flow: wrap; */
   display: flex;
   flex-flow: wrap;
-  margin-left: 2%;
+  margin-left: 3%;
   padding-left: -1%;
   padding-top: 28px;
 }
 .oneUl {
   flex: 1;
   /* display: inline-block; */
-  background: url("../../../assets/images/柜子2.png") no-repeat;
+  background: url("../../../assets/images/jiankong.png") no-repeat;
   /* width: 306px; */
-  height: 285px;
+  height: 219px;
   padding: 22px;
   min-width: 308px;
-  margin-bottom: 40px;
 }
 .title {
   color: #fff;
   height: 16px;
   display: inline-table;
+  margin-right: 35%;
+  margin-top: 15%;
 }
 .table {
   margin-top: 18px;
@@ -176,25 +303,12 @@ ul {
   margin-bottom: 20px;
   margin-top: 10px;
 }
+/* 表单背景 */
 ::v-deep .el-input__inner {
+  background-color: transparent !important;
   color: #fff;
-  /* width: 200px; */
-  height: 36px;
-}
-.red {
-  background: url("../../../assets/images/抽屉-红色1.png") no-repeat !important;
-}
-.greed {
-  background: url("../../../assets/images/抽屉-绿色1.png") no-repeat !important;
-}
-.yellow {
-  background: url("../../../assets/images/抽屉-黄色1.png") no-repeat !important;
-}
-.grey {
-  background: url("../../../assets/images/柜子-灰.png") no-repeat !important;
-}
-.orging {
-  background: url("../../../assets/images/柜子-灰.png") no-repeat;
+  /* border: 1px solid white !important; */
+  border-color: #fff !important;
 }
 
 .box1 {
@@ -207,19 +321,8 @@ ul {
   margin-right: 22px;
   margin-bottom: 43px;
   min-width: 175px;
-
-  /* margin-bottom: 43px;
-  flex: 1;
-  max-width: 173px;
-  margin-right: 2%; */
 }
 .twoUl {
-  /* display: inline-block;
-  padding-left: 0px;
-  margin-left: 10px;
-  margin-top: 0px;
-  margin-bottom: 38px;
-  margin-right: 14px; */
   padding-left: 12px;
   display: flex;
   flex-flow: wrap;
@@ -232,13 +335,8 @@ ul {
   color: #fff;
 }
 ::v-deep .el-button--mini {
-  margin-left: 25px !important;
+  margin-left: 53px !important;
   margin-top: 6px !important;
-  background: #1263aa;
-  border-color: #1263aa;
-  color: #ffffff;
-  width: 82px;
-  height: 30px;
 }
 .shuJu {
   height: 16px;
@@ -249,116 +347,6 @@ ul {
   font-size: 14px;
 }
 
-.box4::before {
-  display: inline-block;
-  content: "";
-  width: 8px;
-  height: 8px;
-  /* border-radius: 50%; */
-  background-color: #67c23a;
-  margin-left: 26px;
-}
-.box5::before {
-  display: inline-block;
-  content: "";
-  width: 8px;
-  height: 8px;
-  /* border-radius: 50%; */
-  background-color: #ff4949;
-  margin-left: 26px;
-}
-.box6::before {
-  display: inline-block;
-  content: "";
-  width: 8px;
-  height: 8px;
-  /* border-radius: 50%; */
-  background-color: #ffba00;
-  margin-left: 26px;
-}
-.box7::before {
-  display: inline-block;
-  content: "";
-  width: 8px;
-  height: 8px;
-  /* border-radius: 50%; */
-  background-color: #98a7bc;
-  margin-left: 26px;
-}
-::v-deep .el-dialog {
-  background-color: #004d86;
-  margin: auto;
-}
-::v-deep .el-dialog__header {
-  border-bottom: 1px solid #718a9d;
-  margin: auto;
-}
-::v-deep .el-dialog__title {
-  color: #fff;
-  font: 18px;
-}
-.box2 form .el-form-item {
-  color: #fff;
-  margin-right: 20px;
-}
-
-/*  鼠标经过颜色 */
-::v-deep .el-table__body tr:hover > td {
-  background-color: transparent !important;
-}
-::v-deep .box1 form {
-  margin-left: -14px;
-}
-::v-deep .box1 form .el-form-item {
-  margin-top: 17px;
-}
-::v-deep .el-form-item {
-  margin-bottom: 29px;
-}
-.jiben {
-  width: 100%;
-  height: 32px;
-  background-image: url(/static/img/小标题底.b7c6f45a.png);
-  margin-bottom: 18px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-  background-size: contain;
-}
-::v-deep .el-table tr:nth-child(odd) {
-  background: #004d86;
-}
-::v-deep .el-dialog__body {
-  padding: 30px 0px 30px 40px;
-}
-::v-deep .el-form-item__label {
-  padding: 0 0 0 0;
-}
-/* 重置按钮 */
-.el-button--btp.is-active,
-.el-button--btp:active {
-  background: #3da1f8;
-  border-color: #3da1f8;
-  color: #ffffff;
-}
-
-.el-button--btp:focus,
-.el-button--btp:hover {
-  background: #3da1f8;
-  border-color: #3da1f8;
-  color: #ffffff;
-}
-
-.el-button--btp {
-  color: #ffffff;
-  width: 76px;
-  height: 36px;
-  background-color: #1d96ff;
-  border-radius: 4px;
-  font-size: 14px;
-  text-align: center;
-  margin-top: 1px;
-}
 ::v-deep .el-dialog {
   border-radius: 8px;
 }
@@ -403,8 +391,8 @@ ul {
 }
 ::v-deep .el-button--btcks {
   color: #ffffff;
-  width: 76px;
-  height: 36px;
+  width: 48px;
+  height: 28px;
   background-color: #1d96ff;
   border-radius: 4px;
   font-size: 14px;
@@ -424,4 +412,27 @@ ul {
   border-color: #1d96ff;
   color: #ffffff;
 }
+::v-deep .el-button--btcksti {
+  color: #ffffff;
+  width: 76px;
+  height: 36px;
+  background-color: #1d96ff;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  margin-top: 1px;
+}
+::v-deep .el-button--btcksti:focus,
+.el-button--btcksti:hover {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #ffffff;
+}
+
+::v-deep .el-button--btcksti.is-active,
+.el-button--btcksti:active {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #ffffff;
+}
 </style>

+ 6 - 16
src/views/peopleChuRu/leaveOne/index.vue

@@ -203,6 +203,7 @@
             placeholder="请选择请假人员"
             ref="headerSearchSelect"
             clearable
+            filterable
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -213,11 +214,11 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="批准部门" prop="approvalDepartment">
-          <treeselect
+        <el-form-item label="批准部门" prop="approvalDepartment">
+          <el-input
             v-model="form.approvalDepartment"
-            :options="deptOptions"
-            placeholder="请选择批准部门"
+            type="text"
+            placeholder="请输入批准部门人"
           />
         </el-form-item>
         <el-form-item label="请假类型" prop="leaveType">
@@ -270,18 +271,6 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="归队时间" prop="returnTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="form.returnTime"
-            type="datetime"
-            default-time="00:00:00"
-            placeholder="请选择归队时间"
-            value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
-        </el-form-item>
         <div class="jiben">请假原因</div>
         <el-form-item label="" prop="leaveReason">
           <el-input
@@ -324,6 +313,7 @@
             placeholder="请选择请假人员"
             ref="headerSearchSelect"
             clearable
+            filterable
           >
             <el-option
               v-for="(item, i) in renYuan"