فهرست منبع

左侧菜单栏样式,军车管理,战备值班

sunyanqiang 3 سال پیش
والد
کامیت
2c28bdc663

+ 2 - 2
src/assets/styles/global.css

@@ -1054,7 +1054,7 @@ input:-moz-placeholder {
 #app .sidebar-container {
   -webkit-transition: width 0.28s;
   transition: width 0.28s;
-  width: 265px !important;
+  width: 240px !important;
   background-color: #304156;
   height: 100%;
   position: fixed;
@@ -1072,7 +1072,7 @@ input:-moz-placeholder {
   min-height: 100%;
   -webkit-transition: margin-left 0.28s;
   transition: margin-left 0.28s;
-  margin-left: 265px;
+  margin-left: 240px;
   position: relative;
 }
 

+ 323 - 132
src/views/combatduty/grassdutyinfo/index.vue

@@ -3,21 +3,186 @@
     <el-row>
       <el-col :span="1.5" class="isSubmit">
         <el-radio-group v-model="queryParams.type" @change="caoZuoTypefun">
-          <el-radio-button label="null">所有值班</el-radio-button>
           <el-radio-button label="1">今日值班</el-radio-button>
           <el-radio-button label="2">次日值班</el-radio-button>
         </el-radio-group>
       </el-col>
     </el-row>
     <hr />
-    <el-form
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="dadui">
+          <img src="../../../images/星星.png" alt />
+          大队
+        </div>
+        <div class="tree">
+          <el-tree
+            class="userAgrees"
+            style="height: calc(100vh - 170px); overflow: auto"
+            :data="deptOptionss"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+          ></el-tree>
+        </div>
+      </el-col>
+      <el-col :span="1.5" class="mb8">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['combatduty:grassdutyinfo:add']"
+          >新增</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="['combatduty:grassdutyinfo:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5"> </el-col>
+      <el-col :span="1.5"> </el-col>
+      <el-col :span="20" :xs="24">
+        <el-table
+          v-loading="loading"
+          :data="grassdutyinfoList"
+          @selection-change="handleSelectionChange"
+          :header-cell-style="{ background: '#003c69', color: 'white' }"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              <span>{{
+                (queryParams.pageNum - 1) * queryParams.pageSize +
+                scope.$index +
+                1
+              }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="值班岗位" align="center" prop="id" /> -->
+          <el-table-column label="单位名称" align="center" prop="unitName" />
+          <!-- <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" /> -->
+          <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
+          <el-table-column
+            label="值班首长"
+            align="center"
+            prop="chiefDutyId"
+            :formatter="chiefDutyIdFormat"
+          />
+          <el-table-column
+            label="值班首长职务"
+            align="center"
+            prop="chiefDutyZhiwu"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_duty_hief"
+                :value="scope.row.chiefDutyZhiwu"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="办公电话" align="center" prop="telephoneBg" />
+          <el-table-column label="宿舍电话" align="center" prop="telephoneSs" />
+          <el-table-column
+            label="值班首长手机"
+            align="center"
+            prop="chiefDutyPhone"
+            width="100"
+          />
+          <!-- <el-table-column label="值班员" align="center" prop="dutyOffierName" /> -->
+          <el-table-column
+            label="值班员"
+            align="center"
+            prop="dutyOffierId"
+            :formatter="dutyOffierIdFormat"
+          />
+          <el-table-column
+            label="值班员职务"
+            align="center"
+            prop="dutyOffierZw"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.sys_duty_hief"
+                :value="scope.row.dutyOffierZw"
+              />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="值班员手机" align="center" prop="dutyOffierPhone" />
+      <el-table-column label="值班电话" align="center" prop="dutyPhone" />-->
+          <el-table-column
+            label="值班岗位"
+            align="center"
+            prop="dutyGangwei"
+            :formatter="dutyGangweiFormat"
+          />
+          <el-table-column
+            label="值班时间"
+            align="center"
+            prop="attendedTime"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                parseTime(scope.row.attendedTime, "{y}-{m}-{d}")
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="200"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="btu"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['combatduty:grassdutyinfo:edit']"
+                >修改</el-button
+              >
+              <el-button
+                size="btd"
+                type="text"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['combatduty:grassdutyinfo: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-col>
+    </el-row>
+    <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
       label-width="auto"
-    >
-      <!-- <el-form-item label="值班时间" prop="attendedTime">
+    > -->
+    <!-- <el-form-item label="值班时间" prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -28,7 +193,7 @@
         >
         </el-date-picker>
       </el-form-item>-->
-      <el-form-item prop="attendedTime">
+    <!-- <el-form-item prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -54,8 +219,8 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="单位名称" prop="unitName">
+      </el-form-item> -->
+    <!-- <el-form-item label="单位名称" prop="unitName">
         <el-select
           v-model="queryParams.unitName"
           placeholder="请选择单位名称"
@@ -65,7 +230,7 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>-->
-      <!-- <el-form-item label="单位ID" prop="unitId">
+    <!-- <el-form-item label="单位ID" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位ID"
@@ -74,7 +239,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <!-- <el-form-item label="值班首长" prop="chiefDutyName">
+    <!-- <el-form-item label="值班首长" prop="chiefDutyName">
         <el-input
           v-model="queryParams.chiefDutyName"
           placeholder="请输入值班首长"
@@ -83,7 +248,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
+    <!-- <el-form-item label="值班首长ID" prop="chiefDutyId">
         <el-select
           v-model="queryParams.chiefDutyId"
           placeholder="请选择值班首长ID"
@@ -135,7 +300,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item prop="dutyOffierId">
+    <!-- <el-form-item prop="dutyOffierId">
         <el-select
           v-model="queryParams.dutyOffierId"
           placeholder="请选择值班员"
@@ -150,8 +315,8 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="值班员ID" prop="dutyOffierId">
+      </el-form-item> -->
+    <!-- <el-form-item label="值班员ID" prop="dutyOffierId">
         <el-input
           v-model="queryParams.dutyOffierId"
           placeholder="请输入值班员ID"
@@ -203,15 +368,15 @@
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>-->
-      <el-form-item>
-        <!-- <el-button type="primary" size="btn" @click="handleQuery"
+    <!-- <el-form-item>
+        <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        > -->
+        >
         <el-button size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+      </el-form-item> -->
+    <!-- </el-form> -->
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -223,7 +388,7 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -234,7 +399,7 @@
           v-hasPermi="['combatduty:grassdutyinfo:edit']"
           >修改</el-button
         >
-      </el-col>-->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -247,7 +412,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -258,113 +423,10 @@
           v-hasPermi="['combatduty:grassdutyinfo:export']"
           >导出</el-button
         >
-      </el-col>-->
-
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="grassdutyinfoList"
-      @selection-change="handleSelectionChange"
-      :header-cell-style="{ background: '#003c69', color: 'white' }"
-    >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" type="index" />
-      <!-- <el-table-column label="值班岗位" align="center" prop="id" /> -->
-      <el-table-column label="单位名称" align="center" prop="unitName" />
-      <!-- <el-table-column label="单位" align="center" prop="unitId" :formatter="unitIdFormat" /> -->
-      <!-- <el-table-column label="值班首长" align="center" prop="chiefDutyName" /> -->
-      <el-table-column
-        label="值班首长"
-        align="center"
-        prop="chiefDutyId"
-        :formatter="chiefDutyIdFormat"
-      />
-      <el-table-column
-        label="值班首长职务"
-        align="center"
-        prop="chiefDutyZhiwu"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_duty_hief"
-            :value="scope.row.chiefDutyZhiwu"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="办公电话" align="center" prop="telephoneBg" />
-      <el-table-column label="宿舍电话" align="center" prop="telephoneSs" />
-      <el-table-column
-        label="值班首长手机"
-        align="center"
-        prop="chiefDutyPhone"
-      />
-      <!-- <el-table-column label="值班员" align="center" prop="dutyOffierName" /> -->
-      <el-table-column
-        label="值班员"
-        align="center"
-        prop="dutyOffierId"
-        :formatter="dutyOffierIdFormat"
-      />
-      <el-table-column label="值班员职务" align="center" prop="dutyOffierZw">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_duty_hief"
-            :value="scope.row.dutyOffierZw"
-          />
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="值班员手机" align="center" prop="dutyOffierPhone" />
-      <el-table-column label="值班电话" align="center" prop="dutyPhone" />-->
-      <el-table-column
-        label="值班岗位"
-        align="center"
-        prop="dutyGangwei"
-        :formatter="dutyGangweiFormat"
-      />
-      <el-table-column
-        label="值班时间"
-        align="center"
-        prop="attendedTime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.attendedTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        width="200"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="btu"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['combatduty:grassdutyinfo:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['combatduty:grassdutyinfo:remove']"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      </el-col>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
 
     <!-- 添加或修改基层值班对话框 -->
     <el-dialog
@@ -414,7 +476,8 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="单位名称" prop="unitName">
-          <el-select
+          <el-input v-model="form.unitName" placeholder="" disabled />
+          <!-- <el-select
             v-model="form.unitName"
             @change="unitNamechange"
             clearable
@@ -426,7 +489,7 @@
               :label="dict.deptName"
               :value="dict"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <!-- <el-form-item label="单位" prop="unitId">
           <el-select v-model="form.unitId" ref="deptId" clearable placeholder="请选择单位名称">
@@ -548,6 +611,8 @@ import {
   listPeople,
   getDept,
 } from "@/api/combatduty/grassdutyinfo";
+import { getWeiShu } from "@/api/grassrootsregistration/bdglmeeting";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "Grassdutyinfo",
@@ -604,14 +669,45 @@ export default {
       //单位数据
       deptOptions: [],
       qdflg: null,
+      // 左侧树形
+      deptOptionss: [],
+      // 树形配置
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      danWie: "",
+      deptId: null,
     };
   },
   created() {
+    this.getUser();
     this.getList();
     this.gettreeselect();
     this.getrylist();
+    this.treeselect();
   },
   methods: {
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        this.deptId = response.data.dept.deptId;
+        this.danWie = response.data.dept.deptName;
+      });
+    },
+    //外面树形选择搜索
+    handleNodeClick(data) {
+      this.queryParams.type = null;
+      this.queryParams.unitId = data.id;
+      this.getList();
+    },
+    // 获取外面部门树形
+    treeselect() {
+      getWeiShu().then((res) => {
+        console.log(res);
+        this.deptOptionss = res.data;
+      });
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -725,6 +821,8 @@ export default {
       this.open = true;
       this.title = "添加基层值班";
       this.qdflg = 1;
+      this.form.unitName = this.danWie;
+      this.form.unitId = this.deptId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -791,6 +889,7 @@ export default {
     },
     //值班分类
     caoZuoTypefun() {
+      this.queryParams.unitId = null;
       this.getList();
     },
     //首长电话
@@ -940,7 +1039,7 @@ export default {
   background: #196299;
   border: none;
   color: #fff;
-      line-height: 12px !important;
+  line-height: 12px !important;
 }
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none !important;
@@ -951,7 +1050,7 @@ export default {
   border-color: #006cff !important;
   -webkit-box-shadow: -1px 0 0 0 #006cff !important;
   box-shadow: -1px 0 0 0 #006cff !important;
-      line-height: 12px !important;
+  line-height: 12px !important;
 }
 /* 将水平线设为红色: */
 hr {
@@ -960,4 +1059,96 @@ hr {
   background-color: rgba(204, 204, 204, 0.5);
   margin-bottom: 15px;
 }
+/* 头部样式 */
+.dadui {
+  height: 40px;
+  background: #003156;
+  /* border-bottom: 1px solid #718A9D ; */
+  background-image: url(../../../images/矩形底部边框.png);
+  background-repeat: no-repeat;
+  background-position: 0px 39px;
+  font-size: 16px;
+  color: #1d96ff;
+}
+.dadui img {
+  margin: 10px 10px 0px 10px;
+}
+
+.data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.data .a1 {
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top: 7px;
+  left: 60px;
+}
+/* 划过效果 */
+::v-deep .el-tree-node__content:hover {
+  /* color: #fff; */
+  background-color: #003156;
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+/* .app-container {
+  display: flex;
+} */
+/* 左侧树状盒子 */
+.app-container .box-lfet {
+  width: 15%;
+  min-height: 740px;
+  /* background: #003156; */
+  /* padding: 10px; */
+  margin-right: 10px;
+  /* border: 1px solid white; */
+}
+/* 右侧内容盒子 */
+.app-container .box-right {
+  flex: 1;
+}
+.app-container .box-lfet .data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+.el-tree {
+  background: #003156;
+  color: #fff;
+  margin-right: 2px;
+  padding-top: 7px;
+}
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+::v-deep .el-input__suffix {
+  right: 60px;
+}
+::v-deep .el-tree-node__content {
+  height: 32px;
+}
+::v-deep
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  height: 32px;
+  color: #fff !important;
+  background-color: #003156;
+  background-image: url("../../../assets/images/选中.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+::v-deep .canjiaren .el-input__inner {
+  width: 560px;
+}
 </style>

+ 7 - 2
src/views/militaryvehicleManagement/thebus/index.vue

@@ -269,7 +269,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
+      <el-table-column
+        label="车牌号"
+        align="center"
+        prop="vehiclenumber"
+        width="100"
+      />
       <el-table-column
         label="车辆型号"
         align="center"
@@ -483,7 +488,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="号牌号码" prop="vehiclenumber">
+        <el-form-item label="车牌号" prop="vehiclenumber">
           <el-input v-model="form.vehiclenumber" placeholder="请输入号码" />
         </el-form-item>
         <el-form-item label="固定座位数" prop="seatCount">

+ 1 - 1
src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -108,7 +108,7 @@
         label="单位"
         align="center"
         prop="unitName"
-        width="100"
+        width="150"
       />
       <el-table-column label="人员名称" align="center" prop="peopleName" />
       <el-table-column