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

src/components/orgTree/orgQuerySelector.vue

@@ -12,6 +12,7 @@
       noResultsText="暂无符合条件的数据"
       noOptionsText="无数据"
       clearValueText="清除"
+      :placeholder="placeholder"
     />
     <el-checkbox v-model="checkSub" @change="changeCheckBox"
       >关联所有下级数据</el-checkbox
@@ -71,6 +72,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    placeholder:{
+      type:String,
+      default:'请选择机构'
+    }
   },
   watch: {
     value(v) {

src/components/orgTreeSelect/index.vue

@@ -235,12 +235,13 @@ export default {
 
     handleNodeClick() {
     },
-    onCheck(data, checked, tree) {
-      console.log(1111123213123)
+    onCheck(data, checked) {
+      console.log(data, checked,1111123213123)
       if (this.checked) {
         let checkNodes = this.$refs.tree.getCheckedNodes();
         let type = this.queryForm.type;
         let recursionFn = function (tree) {
+          if(!tree || !tree.length ) return;
           tree.forEach((item) => {
             if (type == item.type) {
               checkNodes.push(item);

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

@@ -68,8 +68,7 @@
             span="2"
             label="预设案由"
           >
-            <!-- {{ formData.presetCase }} -->
-            江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号江苏省苏州市吴中区吴中大道 1188 号
+             {{ formData.presetCase }}
           </el-descriptions-item>
           <el-descriptions-item
             labelClassName="gx_info_label"

src/views/core/message/index.vue

@@ -24,10 +24,10 @@
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>
-              <el-form-item label="关键字" prop="title">
+              <el-form-item label="标题" prop="title">
                 <el-input
                   v-model="queryParams.title"
-                  placeholder="请输入关键字"
+                  placeholder="请输入标题"
                 />
               </el-form-item>
               <el-form-item label="发布时间" prop="planStartTime">
@@ -69,7 +69,8 @@
                   icon="el-icon-search"
                   size="mini"
                   @click="handleQuery"
-                  >搜索</el-button
+                >搜索
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -78,7 +79,8 @@
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
-                  >重置</el-button
+                >重置
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -88,7 +90,8 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:notification:add']"
-                  >新增</el-button
+                >新增
+                </el-button
                 >
               </el-col>
               <right-toolbar
@@ -113,10 +116,10 @@
             >
               <template slot-scope="scope">
                 <span>{{
-                  (queryParams.pageNum - 1) * queryParams.pageSize +
-                  scope.$index +
-                  1
-                }}</span>
+                    (queryParams.pageNum - 1) * queryParams.pageSize +
+                    scope.$index +
+                    1
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -163,13 +166,13 @@
               prop="title"
             >
               <template slot-scope="r"
-                ><p :title="r.row.title" class="line-style">
-                  {{ r.row.title }}
-                </p></template
+              ><p :title="r.row.title" class="line-style">
+                {{ r.row.title }}
+              </p></template
               >
             </el-table-column>
 
-            <el-table-column label="创建人" align="center" prop="createBy" />
+            <el-table-column label="创建人" align="center" prop="createBy"/>
             <el-table-column
               label="发布时间"
               align="center"
@@ -203,7 +206,8 @@
                   @click="lookThisOne(scope.row)"
                   icon="el-icon-info"
                   v-hasPermi="['core:notification:query']"
-                  >详情</el-button
+                >详情
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -212,7 +216,8 @@
                   v-hasPermi="['core:notification:edit']"
                   v-if="scope.row.messagStatus == '0'"
                   icon="el-icon-edit-outline"
-                  >编辑</el-button
+                >编辑
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -224,7 +229,8 @@
                     loginOrgId == scope.row.orgId
                   "
                   icon="el-icon-delete"
-                  >删除</el-button
+                >删除
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -235,7 +241,8 @@
                     scope.row.messagStatus == '0' &&
                     loginOrgId == scope.row.orgId
                   "
-                  >发布</el-button
+                >发布
+                </el-button
                 >
                 <el-button
                   size="mini"
@@ -247,7 +254,8 @@
                     loginOrgId == scope.row.orgId
                   "
                   icon="el-icon-arrow-down"
-                  >取消发布</el-button
+                >取消发布
+                </el-button
                 >
               </template>
             </el-table-column>
@@ -269,6 +277,7 @@
       :visible.sync="open"
       width="800px"
       append-to-body
+
       @close="handleClose"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -313,7 +322,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="目标机构" prop="tagOrgIds">
           <!--          <org-tree-select :queryData="form.tagOrgType" ref="orgTreeSelect" @selectNode="queryNode"
                            :placeholder="'请选择目标机构'" :disable="true"></org-tree-select>-->
@@ -324,11 +332,13 @@
             :enabledCheckOrgTypes="parseInt(form.tagOrgType)"
             :disable="true"
             :disabled="!isSubmit"
+            @selectNode="selectNodeId"
           >
           </org-tree-select>
         </el-form-item>
         <!-- </el-form-item>-->
-        <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds" :rules="{required: isShow?true:false, message: '请选择目标角色', trigger: 'blur'}">
+        <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds"
+                      :rules="{required: isShow?true:false, message: '请选择目标角色', trigger: 'blur'}">
           <el-select
             v-model="form.tagRoleIds"
             placeholder="请选择目标角色"
@@ -366,8 +376,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="isSubmit" @click="submitForm"
-          >确 定</el-button
+        <el-button type="primary"  v-if="isSubmit" @click="submitForm"
+        >确 定
+        </el-button
         >
         <el-button @click="cancel" v-if="isSubmit">取 消</el-button>
         <el-button @click="cancel" v-else>关 闭</el-button>
@@ -390,9 +401,10 @@ import {
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import OrgTreeSelect from "@/components/orgTreeSelect";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
+
 export default {
-  components: { OrgTree, KFileUpload, OrgTreeSelect },
+  components: {OrgTree, KFileUpload, OrgTreeSelect},
   name: "Notification",
   dicts: ["messag_type", "message_status", "sys_org_type"],
   data() {
@@ -432,14 +444,20 @@ export default {
       roleListInit: [],
       formFileListDefualtValue: [],
       // 表单参数
-      form: {},
+      form: {
+        title: null,
+        messagType: null,
+        tagOrgType: null,
+        tagOrgIds: [],
+        content: null
+      },
       // 表单校验
       rules: {
-        title: [{ required: true, message: "请输入标题" }],
-        messagType: [{ required: true, message: "请选择消息类型" }],
-        tagOrgType: [{ required: true, message: "请选择机构类型" }],
-        tagOrgIds: [{ required: true, message: "请选择目标机构" }],
-        content: [{ required: true, message: "请输入内容" }],
+        title: [{required: true, message: "请输入标题"}],
+        messagType: [{required: true, message: "请选择消息类型"}],
+        tagOrgType: [{required: true, message: "请选择机构类型"}],
+        tagOrgIds: [{required: true, message: "请选择机构类型", trigger: 'change'}],
+        content: [{required: true, message: "请输入内容"}],
       },
     };
   },
@@ -454,6 +472,18 @@ export default {
     this.initRoleList();
   },
   methods: {
+    selectNodeId(val){
+
+      this.form.tagOrgIds=val.map(item=>item.id)
+      this.$refs.form.validateField('tagOrgIds',(errorMessage)=>{
+        console.log(errorMessage,'errorMessage')
+        if(!errorMessage){
+
+        }else{
+          return false
+        }
+      })
+    },
     /** 查询公告通知列表 */
     getList() {
       this.loading = true;
@@ -506,7 +536,7 @@ export default {
         title: null,
         content: null,
         messagType: null,
-        tagOrgIds: null,
+        tagOrgIds: [],
         tagRoleIds: null,
         createBy: null,
         createTime: null,
@@ -524,7 +554,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.orgId =this.$store.getters.orgId;
+      this.queryParams.orgId = this.$store.getters.orgId;
       this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
       this.queryParams.dateRange = [];
@@ -626,7 +656,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     publish(row) {
       const id = row.id;
@@ -649,7 +680,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess(returnMessage);
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     getDefaultKey(key) {

src/views/core/reportForms/drill.vue

@@ -26,7 +26,7 @@
             noResultsText="没有搜索结果"
           />
         </el-form-item>
-        <el-form-item label="培训任务名称:" label-width="50">
+        <el-form-item label="演练任务名称:" label-width="50">
           <el-select v-model="queryParams.planId" @change="changeHandler">
             <el-option
               v-for="item in options"
@@ -211,9 +211,10 @@ export default {
       this.queryParams = {
         orgId: this.orgId,
         planId: this.options[0].id,
+        range: [new Date(), new Date()],
       };
 
-      this.getList();
+      //this.getList();
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/core/reportForms/eduTraining.vue

@@ -208,8 +208,9 @@ export default {
       this.queryParams = {
         orgId: this.orgId,
         planId: this.options[0].id,
+        date:new Date(),
       };
-      this.getList();
+     // this.getList();
     },
 
     /** 导出按钮操作 */

src/views/core/reportForms/intrusionTestReport.vue

@@ -30,7 +30,7 @@
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:resumptionReport:export']">导出
+                         v-hasPermi="['core:resumptionReport:export']">导出数据
               </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/core/reportForms/monitorAccessReport.vue

@@ -31,7 +31,7 @@
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:monitorAccessReport:export']">导出
+                         v-hasPermi="['core:monitorAccessReport:export']">导出数据
               </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/core/reportForms/resumptionReport.vue

@@ -50,7 +50,7 @@
             </el-col>
             <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:resumptionReport:export']">导出
+                         v-hasPermi="['core:resumptionReport:export']">导出数据
               </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/core/reportForms/safetyInspectReport.vue

@@ -56,7 +56,7 @@
           <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 
           <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                     v-hasPermi="['core:safetyInspectReport:export']">导出
+                     v-hasPermi="['core:safetyInspectReport:export']">导出数据
           </el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/core/reportForms/selfInspectReport.vue

@@ -47,7 +47,7 @@
       <el-col :span="1.5">
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
-        <el-button v-hasPermi="['core:safetyInspectReport:export']" icon="el-icon-download" size="mini" type="primary" @click="handleExport">导出</el-button>
+        <el-button v-hasPermi="['core:safetyInspectReport:export']" icon="el-icon-download" size="mini" type="primary" @click="handleExport">导出数据</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 

src/views/core/reportForms/serviceBankReport.vue

@@ -34,7 +34,7 @@
             </el-col>
             <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:resumptionReport:export']">导出
+                         v-hasPermi="['core:resumptionReport:export']">导出数据
               </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/core/reportForms/standbyPowerReport.vue

@@ -28,7 +28,7 @@
             </el-col>
             <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:resumptionReport:export']">导出
+                         v-hasPermi="['core:resumptionReport:export']">导出数据
               </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/core/task/index.vue

@@ -109,7 +109,7 @@
                   size="mini"
                   @click="handleExport"
                   v-hasPermi="['core:task:export']"
-                  >导出</el-button
+                  >导出数据</el-button
                 >
               </el-col>
               <right-toolbar

src/views/evaluateTable/index.vue

@@ -58,7 +58,7 @@
               >
           
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:evaluateTaskReport:export']">导出
+                         v-hasPermi="['core:evaluateTaskReport:export']">导出数据
               </el-button>
          
               </el-col>

src/views/monitor/job/index.vue

@@ -77,7 +77,7 @@
             size="mini"
             @click="handleExport"
             v-hasPermi="['monitor:job:export']"
-          >导出</el-button>
+          >导出数据</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button

src/views/monitor/job/log.vue

@@ -87,7 +87,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['monitor:job:export']"
-        >导出</el-button>
+        >导出数据</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button

src/views/question/list/index.vue

@@ -105,7 +105,7 @@
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  >导出</el-button
+                  >导出数据</el-button
                 >
               </el-col>
               <right-toolbar

src/views/question/reform/index.vue

@@ -89,7 +89,7 @@
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  >导出</el-button
+                  >导出数据</el-button
                 >
               </el-col>
               <right-toolbar

src/views/resumption/plan/index.vue

@@ -132,7 +132,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="handleAdd()"
-                  v-hasPermi="['system:user:add']"
+                  v-hasPermi="['core:plan:edit']"
                   >新增任务</el-button
                 >
                 <right-toolbar
@@ -293,7 +293,7 @@
                   icon="el-icon-arrow-down"
                   v-if="showPublish(r.row)"
                   @click="showDialogDistribute(r.row)"
-                  v-hasPermi="['system:user:remove']"
+                  v-hasPermi="['core:plan:distribute']"
                   >下发</el-button
                 >
 
@@ -313,7 +313,7 @@
                   icon="el-icon-top-left"
                   v-if="showWithDraw(r.row)"
                   @click="chhuile(r.row)"
-                  v-hasPermi="['system:user:remove']"
+                  v-hasPermi="['core:plan:distribute']"
                   >撤回</el-button
                 >
                 <el-button
@@ -322,7 +322,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="onEdit(r.row.id)"
-                  v-hasPermi="['system:user:edit']"
+                  v-hasPermi="['core:plan:edit']"
                   >编辑</el-button
                 >
                 <el-button
@@ -331,7 +331,7 @@
                   type="text"
                   icon="el-icon-delete"
                   @click="onDel(r.row.id, r.row.planName)"
-                  v-hasPermi="['system:user:remove']"
+                  v-hasPermi="['core:plan:delete']"
                   >删除</el-button
                 >
               </template>

src/views/resumption/protection/index.vue

@@ -100,34 +100,9 @@
                   size="mini"
                   @click="handleExport()"
                   v-hasPermi="['device:protection']"
-                  >导出</el-button
+                  >导出数据</el-button
                 >
               </el-col>
-              <!-- <el-col :span="1.5">
-              <el-button
-                type="success"
-                plain
-                icon="el-icon-edit-outline"
-                size="mini"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['system:user:edit']"
-                >修改</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="['system:user:remove']"
-                >删除</el-button
-              >
-            </el-col>-->
-
               <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"

src/views/resumption/ruleManager/index.vue

@@ -90,31 +90,6 @@
                   >{{ expandAll ? "收起所有行" : "展开所有行" }}</el-button
                 >
               </el-col>
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit-outline"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['system:user:edit']"
-                  >修改</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="['system:user:remove']"
-                  >删除</el-button
-                >
-              </el-col>-->
-
               <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"

src/views/resumption/taskManager/index.vue

@@ -120,7 +120,7 @@
                   size="mini"
                   @click="exportExcel()"
                   v-hasPermi="['resumption:taskManager:export']"
-                  >导出</el-button
+                  >导出数据</el-button
                 >
               </el-col>
 

src/views/safetycheck/task/index.vue

@@ -184,7 +184,7 @@
                   size="mini"
                   @click="handleExport"
                   v-hasPermi="['core:safetycheck:export']"
-                  >导出</el-button
+                  >导出数据</el-button
                 >
               </el-col>
               <right-toolbar

src/views/system/information/index.vue

@@ -159,7 +159,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:information:export']"
-        >导出</el-button>
+        >导出数据</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

src/views/system/user/index.vue

@@ -959,7 +959,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
-        inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[a-zA-Z0-9])[a-zA-Z0-9]{8,16}$/,
+        inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z0-9!@#$%^&*()_+]{8,16}$/,
         inputErrorMessage:
           "用户密码长度介于8和16之间，必须包含大小写字母和数字，禁止输入中文",
       })