Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

# Conflicts:
#	src/views/core/drill/task/dialog.newtask.vue

src/api/resumption/outsourcing.js

@@ -50,9 +50,9 @@ export function delelteEvaluate(id) {
   });
 }
 // 发布计划
-export function publishEvaluate(id) {
+export function publishEvaluate(id,immediateEffect) {
   return request({
-    url: `/core/evaluatePlan/distribute/${id}`,
+    url: `/core/evaluatePlan/distribute/${id}/${immediateEffect}`,
     method: "get",
   });
 }

src/components/common/textarea.vue

@@ -46,7 +46,7 @@ export default {
 
   &__length {
     position: absolute;
-    bottom: 0;
+    bottom: -25px;
     right: 12px;
     font-size: 12px;
   }

src/utils/util.js

@@ -36,7 +36,9 @@ export function arabicToChinese(num) {
 
   let result = "";
   let unitIndex = 0;
-
+  if (num == 10) {
+    return "十";
+  }
   while (num > 0) {
     const digit = num % 10;
     const isTenDigit =

src/views/core/accessPlan/index.vue

@@ -468,7 +468,6 @@ import { mapGetters } from "vuex";
 import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
 import * as api from "@/api/core/accessPlan";
 export default {
-  name: "Plan",
   dicts: [
     "sys_org_type",
     "sys_access_cycle",
@@ -478,13 +477,14 @@ export default {
     "edu_plan_status",
     "monitor_org",
   ],
+
+  name: "Plan",
+
   components: {
     orgTree,
     DialogThreeState,
   },
-  computed: {
-    ...mapGetters(["orgId"]),
-  },
+
   data() {
     return {
       startDatepickerOptions: {
@@ -568,11 +568,17 @@ export default {
       issue: null,
     };
   },
+
+  computed: {
+    ...mapGetters(["orgId"]),
+  },
+
   created() {
     allRole().then((response) => {
       this.roleList = response.data;
     });
   },
+
   methods: {
     numChange(value) {
       if (value <= 0) this.form.planFrequency = 0;
@@ -998,6 +1004,7 @@ export default {
         `plan_${new Date().getTime()}.xlsx`
       );
     },
-  },
+  }
 };
 </script>
+

src/views/core/drill/drillDictionary/dialog.info.vue

@@ -23,7 +23,7 @@
             span="2"
             label="预设案由"
           >
-            <span class="text_nbsp"> {{ formData.defaultCause }}</span>
+            <p class="text-content text_nbsp"> {{ formData.defaultCause }}</p>
           </el-descriptions-item>
         </el-descriptions>
       </div>
@@ -76,7 +76,7 @@ export default {
     reset(other = {}) {
       return {
         id: null,
-        drillType: null,       
+        drillType: null,
         defaultCause: null,
         drillProjects: null,
         ...other,
@@ -119,4 +119,10 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.text-content{
+  margin: 0;
+  max-height: 500px;
+  overflow: auto;
+}
+</style>

src/views/core/drill/task/dialog.newtask.vue

@@ -63,13 +63,13 @@
                 <div style="display: flex;justify-content: flex-end; margin-bottom: 10px">
                   <el-button type="primary" @click="selectMaterials">参考演练范本库</el-button>
                 </div>
-                <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
+                <k-textarea v-model="formData.presetCase" :row="10" placeholder="请输入预设案由" :length="2000"/>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item prop="drillSituation" label="演练情况">
-                <k-textarea v-model="formData.drillSituation" placeholder="请结合实际演练情况填写" :length="2000"/>
+                <k-textarea v-model="formData.drillSituation" :row="10" placeholder="请结合实际演练情况录入" :length="2000"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/views/core/edu/task/dialog.newTask.vue

@@ -66,13 +66,13 @@
             <!-- 内容 -->
             <el-col :span="24">
               <el-form-item prop="content" label="培训内容">
-                <k-textarea v-model="formData.content" placeholder="请输入培训内容" :length="2000"/>
+                <k-textarea v-model="formData.content" :row="10" placeholder="请输入培训内容" :length="2000"/>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item prop="note" label="培训总结">
-                <k-textarea v-model="formData.note" placeholder="请输入培训总结" :length="2000"/>
+                <k-textarea v-model="formData.note" :row="10" placeholder="请输入培训总结" :length="2000"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/views/index.vue

@@ -19,7 +19,7 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :md="12"  :lg="12" v-for="(v,i) in dataList" :key="i">
               <div class="card-panel">
-                <div class="card-panel-icon-wrapper icon-people">
+                <div class="card-panel-icon-wrapper icon-people"  @click="clickNum(v)">
 <!--                  <svg-icon icon-class="example" class-name="card-panel-icon" />-->
                   <img class="card-item-icon" :src="require(`../assets/icons/home/${v.taskTypeText}.png`)" alt="">
                   <div class="card-icon-text">
@@ -73,16 +73,16 @@
 
     <!--  新闻详情  -->
     <DialogCom
-      title="详情"
+      title="通知公告"
       :visible.sync="show"
-      width="800px"
+      width="1000px"
       append-to-body
       @close="handleClose">
       <div class="panel-box" v-if="selectMsg">
         <h2>{{selectMsg.title}}</h2>
-        <p>{{selectMsg.publishTime}}</p>
+        <p>发布日期：{{selectMsg.publishTime}}</p>
         <div class="content-box">
-          <p>{{selectMsg.content}}</p>
+          <p class="text-box">{{selectMsg.content}}</p>
           <div>
             附件：
             <ul v-if="selectMsg.fileList && selectMsg.fileList.length > 0">
@@ -390,6 +390,7 @@ export default {
 .panel-box{
   >h2{
     text-align: center;
+    margin-top: 0;
   }
   >p{
     font-size: 14px;
@@ -397,8 +398,6 @@ export default {
     text-align: end;
   }
   .content-box{
-    max-height: 600px;
-    overflow: auto;
     >p{
       text-indent: 2em;
       word-break: break-word;
@@ -406,6 +405,10 @@ export default {
       text-align: justify;
       width: 100%;
       color: #777;
+      max-height: 450px;
+      overflow: auto;
+      background-color: #f5f5f5;
+      padding: 10px;
     }
     >div{
       >ul{

src/views/resumption/ruleManager/dialog.select.point.vue

@@ -27,6 +27,7 @@
             <el-input
               v-model="search.key"
               maxlength="50"
+              clearable
               placeholder="请输入履职项或履职内容"
             ></el-input>
           </el-form-item>

src/views/resumption/ruleManager/index.vue

@@ -20,7 +20,7 @@
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
-          <div class="main-search-box" v-show="showSearch && rule">
+          <div class="main-search-box" v-show="rule">
             <div v-if="rule" style="padding-bottom: 10px; font-weight: 700">
               {{ rule.name }}
             </div>
@@ -30,6 +30,7 @@
               size="small"
               :inline="true"
               label-width="100px"
+              v-show="showSearch"
             >
               <el-form-item prop="itemName" label="履职项" label-width="60px">
                 <el-input

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -43,13 +43,18 @@
         </el-form-item>
       </el-form>
     </DialogCom>
+    <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
   </div>
 </template>
 <script>
 import { guid } from "@/utils/index.js";
+import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
 export default {
   dicts: ["evaluate_type"],
   name: "SocWebAddEvaluate",
+  components: {
+    DialogThreeState,
+  },
   data() {
     return {
       ruleForm: {},

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -135,6 +135,7 @@
         :orgType="formData.orgType"
         @submitHandler="onSelect"
       ></DialogSelect>
+      <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
     </DialogCom>
   </div>
 </template>

src/views/resumptionEvaluate/evaluate/index.vue

@@ -219,6 +219,7 @@
     </el-row>
 
     <editEvaluate ref="Evaluate" @success="getList()"></editEvaluate>
+    <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
   </div>
 </template>
 <script>
@@ -233,12 +234,15 @@ import {
 } from "@/api/resumption/outsourcing.js";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import editEvaluate from "./editDialog.vue";
+import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
+import * as api from "@/api/resumption/outsourcing";
 export default {
   name: "SocWebIndex",
   dicts: ["sys_org_type", "plan_status"],
   components: {
     OrgTree,
     editEvaluate,
+    DialogThreeState,
   },
   data() {
     const { params, query } = this.$route;
@@ -328,22 +332,53 @@ export default {
             });
           });
       } else {
-        this.$modal
-          .confirm("是否确认发布？")
-          .then(function () {})
-          .then(() => {
-            publishEvaluate(row.id).then((res) => {
-              let { code, msg } = res;
-              if (code == 200) {
-                this.getList();
-                this.$modal.msgSuccess("发布成功");
-              } else {
-                this.$modal.msgSuccess(msg);
-              }
-            });
-          });
+        // this.$modal
+        //   .confirm("是否确认发布？")
+        //   .then(function () {})
+        //   .then(() => {
+        //     publishEvaluate(row.id).then((res) => {
+        //       let { code, msg } = res;
+        //       if (code == 200) {
+        //         this.getList();
+        //         this.$modal.msgSuccess("发布成功");
+        //       } else {
+        //         this.$modal.msgSuccess(msg);
+        //       }
+        //     });
+        //   });
+        let   msg = "请选择下发后立即生成或下周期生成任务?";
+        this.$refs["DialogThreeState"].show(
+          msg,
+          (state) => {
+            if (state == 0 || state == 1) {
+            this.  distribute(row.id, state == 1);
+            }
+          },
+          {
+            yesText: "立即生成",
+            noText: "下周期",
+            cancelText: "取消",
+          }
+        );
       }
     },
+    distribute(id, immediateEffect) {
+      this.loading = true;
+      api
+        .publishEvaluate(id, immediateEffect)
+        .then((response) => {
+          if (response.data == 0) {
+            this.loading = false;
+          } else {
+            this.getList();
+            this.loading = false;
+          }
+        })
+        .catch((response) => {
+          this.getList();
+          this.loading = false;
+        });
+    },
     deleteHandler(row) {
       this.$modal
         .confirm("是否确认删除？")

src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -28,8 +28,9 @@
             <el-input
               v-model="search.key"
               maxlength="50"
+              clearable
               placeholder="请输入检查项或检查内容"
-              @changed="onKeyChanged"
+              @input="onKeyChanged"
             ></el-input>
           </el-form-item>
           <el-form-item prop="selectRuleId" label="检查手册">

src/views/safetycheck/ruleManager/index.vue

@@ -21,7 +21,7 @@
       <el-col :span="24" :xs="24">
         <div class="main-right-box">
           <!--    搜索条件    -->
-          <div class="main-search-box" v-show="showSearch && rule">
+          <div class="main-search-box" v-show="rule">
             <div style="padding-bottom: 10px; font-weight: 700">
               {{ rule.name }}
             </div>
@@ -31,6 +31,7 @@
               size="small"
               :inline="true"
               label-width="100px"
+              v-show="showSearch"
             >
               <el-form-item prop="itemName" label="检查项" label-width="60px">
                 <el-input

src/views/safetycheck/task/index.vue

@@ -339,7 +339,7 @@
               label="操作"
               fixed="right"
               align="center"
-              min-width="120px"
+              width="240px"
             >
               <template slot-scope="r">
                 <el-button