Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

# Conflicts:
#	src/components/orgTree/index.vue

src/components/orgTree/index.vue

@@ -29,7 +29,7 @@
         @node-click="handleNodeClick"
         v-bind="$attrs"
       >
-      </el-tree>
+    </el-tree>
     </div>
   </div>
 </template>

src/views/core/accessPlan/index.vue

@@ -40,7 +40,8 @@
           </el-form-item>
 
           <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable @keyup.enter.native="handleQuery" />
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" maxlength="50" clearable
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
 
           <el-form-item>
@@ -57,9 +58,8 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="planList"  row-key="id"
-          :tree-props="{ children: 'children' }">
-       
+        <el-table v-loading="loading" :data="planList" row-key="id" :tree-props="{ children: 'children' }">
+
           <el-table-column label="计划所属机构" align="center" prop="orgName" />
           <el-table-column label="计划名称" align="center" prop="planName" />
 
@@ -133,23 +133,31 @@
 
 
 
-        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
+        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
           <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择时间">
           </el-date-picker>
+        </el-form-item> -->
+        <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
+          <el-date-picker v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
+            align="right" type="date" placeholder="选择开始日期">
+          </el-date-picker>
         </el-form-item>
 
 
 
-
-        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
+        <!-- <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
           <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择时间">
           </el-date-picker>
+        </el-form-item> -->
+        <el-form-item prop="endTime" v-if="form.planCycle == 0" label="结束日期">
+          <el-date-picker v-model="form.endTime" :picker-options="endDatepickerOptions" align="right" type="date"
+            placeholder="选择结束日期">
+          </el-date-picker>
         </el-form-item>
 
 
-
         <el-form-item label="调阅角色" prop="roleId">
           <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择" @change="changeSelectOrgType">
             <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
@@ -172,7 +180,7 @@
 
 <script>
 import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
-import { listRole, findRoleByType, getRole,allRole } from "@/api/system/role";
+import { listRole, findRoleByType, getRole, allRole } from "@/api/system/role";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import { deptTreeSelect } from "@/api/system/public";
@@ -186,6 +194,16 @@ export default {
   },
   data() {
     return {
+      startDatepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          return time.getTime() < date;
+        },
+      },
+      endDatepickerOptions: {
+        disabledDate: this.disabledDate,
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -244,6 +262,7 @@ export default {
           { required: true, message: '请选择调阅频次', trigger: 'change' },
         ],
       }
+
     };
   },
   created() {
@@ -301,6 +320,24 @@ export default {
       this.queryParams.checkSub = state;
       this.handleQuery();
     },
+    startDateChanged(time) {
+      debugger
+      console.log(time + "*********************")
+      if (this.form.startTime > this.form.endTime) {
+        this.form.endTime = this.form.startTime;
+      }
+    },
+    disabledDate(time) {
+      //小于开始日期禁止选择
+      let startTiem = new Date();
+      startTime.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      if (this.form.startTime) {
+        startTiem = new Date(this.formatTime(this.form.startTiem, 'YYYY-MM-DD'));
+        startTiem.setTime(startTiem.getTime() - 3600 * 1000 * 24);
+      }
+      debugger
+      return time.getTime() < new Date(startTiem).getTime()
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

src/views/core/edu/plan/index.vue

@@ -35,8 +35,8 @@
                          :value="item.roleId"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="计划名称" prop="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable
+          <el-form-item label="培训主题" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入培训主题" clearable
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
 
@@ -79,7 +79,7 @@
         <el-table max-height="550px" :data="planList" @selection-change="handleSelectionChange" row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" prop="no"/>
-          <el-table-column label="计划名称" align="center" prop="planName"/>
+          <el-table-column label="培训主题" align="center" prop="planName"/>
           <el-table-column label="计划创建机构" align="center" prop="createOrgName"/>
           <el-table-column label="计划所属机构" align="center" prop="belongOrgName"/>
           <el-table-column label="培训机构类型" align="center" prop="execOrgType">
@@ -139,8 +139,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="计划名称" prop="planName">
-              <el-input v-model="form.planName" placeholder="请输入计划名称"/>
+            <el-form-item label="培训主题" prop="planName">
+              <el-input v-model="form.planName" placeholder="请输入培训主题"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -319,7 +319,7 @@ export default {
       // 表单校验
       rules: {
         planName: [
-          {required: true, message: "计划名称不能为空", trigger: "blur"}
+          {required: true, message: "培训主题不能为空", trigger: "blur"}
         ],
         planCycle: [
           {required: true, message: "计划周期不能为空", trigger: "blur"}
@@ -545,7 +545,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除教育培训计划编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除教育培训计划"' + row.planName).then(function () {
         return delPlan(ids);
       }).then(() => {
         this.getList();

src/views/core/weather/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--机构数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="24" :xs="24">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
 
@@ -29,7 +29,7 @@
       </el-form-item>
 
       <el-form-item label="预警区域" prop="roleId">
-        <el-select v-model="queryParams.code" placeholder="请选择">
+        <el-select v-model="queryParams.code" placeholder="请选择"   clearable>
           <el-option v-for="item in areaList" :key="item.key" :label="item.value" :value="item.key"></el-option>
         </el-select>
       </el-form-item>
@@ -45,18 +45,16 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="weatherList">
-
-      <el-table-column label="预警标题" align="center" prop="alarmTitle" />
-      <el-table-column label="预警城市" align="center" prop="city" />
-      <el-table-column label="预警区域" align="center" prop="area"/>
-      <el-table-column label="预警等级" align="center"  prop="alarmLevel"></el-table-column>
-      <el-table-column label="预警类型" align="center"  prop="alarmType"></el-table-column>
-      <el-table-column label="预警内容" align="center"  prop="alarmContent"></el-table-column>
-      <el-table-column label="预警发布时间" align="center"  prop="alarmTime">
-        <template slot-scope="r">{{ $moment(r.row.alarmTime).format(
-          "YYYY-MM-DD HH:mm:ss"
-        ) }}</template>
+    <el-table v-loading="loading" :data="weatherList" >
+      <el-table-column label="预警标题" align="center"  prop="alarmTitle" />
+      <el-table-column label="预警城市" align="center" width="140" prop="city" />
+      <el-table-column label="预警区域" align="center" width="100" prop="area"/>
+      <el-table-column label="预警等级" align="center" width="100" prop="alarmLevel"></el-table-column>
+      <el-table-column label="预警类型" align="center" width="100" prop="alarmType"></el-table-column>
+      <el-table-column label="预警内容" align="center"   prop="alarmContent">
+        <template slot-scope="r"><p :title="r.row.alarmContent" class="line-style">{{r.row.alarmContent}}</p></template>
+      </el-table-column>
+      <el-table-column label="预警发布时间" align="center"   prop="alarmTime">
       </el-table-column>
     </el-table>
 
@@ -124,6 +122,7 @@ export default {
       this.loading = true;
       findWeatherList(this.queryParams).then(response => {
         this.weatherList = response.rows;
+        console.log(this.weatherList);
         this.total = response.total;
         this.loading = false;
       });
@@ -143,9 +142,19 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.alarmDates = [];
+      this.queryParams.code = null;
       this.handleQuery();
     },
 
   }
 };
 </script>
+<style lang="scss" scoped>
+.line-style{
+  display : -webkit-box;
+  -webkit-line-clamp: 3 ; //限定显示行数
+  -webkit-box-orient: vertical;
+  overflow : hidden ;
+  text-overflow: ellipsis;
+}
+</style>

src/views/system/device/index.vue

@@ -127,7 +127,8 @@
           <el-col :span="10">
             <el-form-item label="设备分类" prop="deviceType">
               <el-select v-model="form.deviceType" placeholder="请选择">
-                <el-option v-for="item in devices" :key="item.id" :label="item.dictLabel" :value="item.id"></el-option>
+
+                <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -220,7 +221,7 @@ export default {
         hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
         deviceType: [
-          { required: true, message: '请选择设备分类', trigger: 'blur' },
+          { required: true, message: '请选择设备分类', trigger: 'change' },
 
         ],
         checkTime: [
@@ -441,6 +442,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {