Browse Source

战备值班修改样式

liangjiahao 3 years ago
parent
commit
b58f2f44f7
2 changed files with 59 additions and 17 deletions
  1. 5 5
      src/views/combatduty/RateOfTen/index.vue
  2. 54 12
      src/views/combatduty/basedutyinfo/index.vue

+ 5 - 5
src/views/combatduty/RateOfTen/index.vue

@@ -1275,7 +1275,7 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "80%"],
+            radius: ["65%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
             hoverOffset: 5,
@@ -1339,7 +1339,7 @@ export default {
           {
             name: "Access From",
             type: "pie",
-            radius: ["70%", "80%"],
+            radius: ["65%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
             hoverOffset: 5,
@@ -1403,7 +1403,7 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "80%"],
+            radius: ["65%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
             hoverOffset: 5,
@@ -1484,7 +1484,7 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "80%"],
+            radius: ["65%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
             hoverOffset: 5,
@@ -1548,7 +1548,7 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "80%"],
+            radius: ["65%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
             hoverOffset: 5,

+ 54 - 12
src/views/combatduty/basedutyinfo/index.vue

@@ -1,5 +1,15 @@
 <template>
   <div class="app-container">
+    <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
       :model="queryParams"
       ref="queryForm"
@@ -7,7 +17,7 @@
       v-show="showSearch"
       label-width="auto"
     >
-      <el-form-item label="值班时间" prop="attendedTime">
+      <el-form-item label="" prop="attendedTime">
         <el-date-picker
           clearable
           size="small"
@@ -17,7 +27,7 @@
           placeholder="请选择值班时间"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="值班首长" prop="chiefDutyName">
+      <el-form-item label="" prop="chiefDutyName">
         <el-select v-model="queryParams.chiefDutyName" filterable clearable placeholder="请选择值班首长">
           <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
@@ -40,7 +50,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="作战值班员" prop="combatDutyName">
+      <el-form-item label="" prop="combatDutyName">
         <el-input
           v-model="queryParams.combatDutyName"
           placeholder="请输入作战值班员"
@@ -212,7 +222,7 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" size="btn" @click="handleQuery">搜索</el-button>
+        <!-- <el-button type="primary" size="btn" @click="handleQuery">搜索</el-button> -->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -261,14 +271,8 @@
           v-hasPermi="['combatduty:basedutyinfo:export']"
         >导出</el-button>
       </el-col>-->
-      <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>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table
@@ -1064,5 +1068,43 @@ export default {
 ::v-deep .el-dialog__footer{
   margin-right: 20px !important;
 }
+.isSubmit {
+   margin-left: 40% !important;  
+   margin-right: 30%;
+   margin-bottom: 5px;
+   padding-bottom: 5px;
+}
+.el-radio-button {
+width: 122px !important;
+height: 30px !important;
+line-height: 30px !important;
+border: none !important;
+}
+::v-deep .el-radio-button__inner{
+  width: 120px !important;
+height: 30px !important;
+  line-height: 8px !important;
+  background: rgb(10, 67, 224);
+  border: none;
+  color: #fff;
+}
+::v-deep .el-radio-button:first-child .el-radio-button__inner{
+  border-left: none !important;
+}
+::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+    color: #FFFFFF;
+    background-color: #034b81 !important;
+    border-color: #034b81 !important;
+    -webkit-box-shadow: -1px 0 0 0 #034b81 !important;
+    box-shadow: -1px 0 0 0 #034b81 !important;
+}
+/* 将水平线设为红色: */
+hr {
+ border: none;
+ height: 1px;
+ background-color: rgba(204, 204, 204, 0.5);
+ margin-bottom: 15px;
+}
+
 </style>