Merge branch 'V0.0.6' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6

src/api/system/device.js

@@ -25,6 +25,7 @@ export function getDevice(id) {
   })
 }
 
+
 // 查询主机
 export function getHostByOrgId(orgId) {
   return request({

src/views/board/index.vue

@@ -254,6 +254,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .body {
   background-image: url(@/assets/board/bg.png);
   background-position: 100%;
@@ -537,14 +539,14 @@ export default {
 .org-cascader {
   margin-top: -5px;
   width: 180px;
-
   ::v-deep .el-input__inner {
     background-color: transparent !important;
     border: none !important;
-    color: rgb(230, 230, 230);
+    color: #FFFFFF;
     font-size: 16px;
   }
 }
+
 </style>
 <style lang="scss">
 .board-org-popper {
@@ -556,4 +558,19 @@ export default {
     overflow: auto;
   }
 }
+
+</style>
+<style>
+  .el-cascader-panel{
+    .el-radio__inner{
+      border: 1px solid #0F0F0F !important;
+    }
+    .el-input__inner {
+      background-color: transparent !important;
+      border: none !important;
+      color: #FFFFFF;
+      font-size: 16px;
+    }
+  }
+
 </style>

src/views/core/accessPlan/index.vue

@@ -228,7 +228,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-arrow-down"
-                  v-if="
+                  v-show="
                     scope.row.parentId == null &&
                     scope.row.orgId == isEdit &&
                     scope.row.isDistribute == 0 &&
@@ -242,7 +242,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-top-left"
-                  v-if="
+                  v-show="
                     scope.row.orgId == isEdit &&
                     scope.row.isDistribute == 1 &&
                     scope.row.planStatus == 1 &&
@@ -257,7 +257,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="handleUpdate(scope.row)"
-                  v-if="scope.row.orgId == isEdit"
+                  v-show="scope.row.orgId == isEdit"
                   v-hasPermi="['core:accessPlan:edit']"
                   >编辑
                 </el-button>
@@ -943,6 +943,7 @@ export default {
         .distribute(id, immediateEffect)
         .then((response) => {
           if (response.data == 0) {
+            this.getList();
             this.loading = false;
           } else {
             this.getList();

src/views/system/device/index.vue

@@ -249,12 +249,12 @@
             </el-form-item>
           </el-col>
 
-   
-    
+
+
 
         </el-row>
         <el-row>
-        
+
           <el-col :span="12">
             <el-form-item label="设备名称" prop="deviceName">
               <el-input
@@ -386,6 +386,7 @@ import {
   addDevice,
   updateDevice,
   getHostByOrgId,
+  getDeviceByHost,
   downInCharge,
 } from "@/api/system/device";
 export default {

src/views/system/workTimeSet/dialog.template.vue

@@ -130,7 +130,8 @@
           </el-form-item>
         </el-form>
       <div style="color: red;font-size: 12px;line-height: 30px;">
-        注：保存后生成或更新本月或下月生效日期后的每日作息
+        注：保存作息模板后，平台将按作息模板在所选'生效日期'当日后自动生成作息
+
       </div>
 <!--      </div>-->
       <div v-if="title != '查看作息模版'" slot="footer" class="dialog-footer">