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

src/api/core/drill/drillTask.js

@@ -38,3 +38,12 @@ export function delDrillTask(id) {
   })
 }
 
+
+export function evaluateDrillTask(data) {
+  return request({
+    url: '/core/drill/task/evaluate',
+    method: 'post',
+    data: data
+  })
+}
+

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

@@ -104,7 +104,7 @@
     <dialog-drill-dictionary-select
       ref="DialogDrillDictionarySelect"
       :defaultSelect=defaultSelect
-      @select="materialsSelect"
+      @select="drillDictionarySelect"
       :orgId="this.$store.getters.orgId">
     </dialog-drill-dictionary-select>
   </div>
@@ -354,10 +354,11 @@ export default {
       }
     },
     selectMaterials() {
-      this.$refs["DialogDrillDictionarySelect"].show();
+      console.log("selectMaterials",this.formData)
+      this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
-    materialsSelect(){
-
+    drillDictionarySelect(data){
+      this.formData.presetCase=data[0].defaultCause;
     },
 
   },

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

@@ -17,22 +17,24 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item  prop="drillStartTime" label="培训开始时间">
-                <el-date-picker style="width: 100%;" required v-model="formData.drillStartTime" :picker-options="startDatepickerOptions"
-                                type="datetime" placeholder="选择日期"  @change="startDateChanged">
+              <el-form-item prop="drillStartTime" label="培训开始时间">
+                <el-date-picker style="width: 100%;" required v-model="formData.drillStartTime"
+                                :picker-options="startDatepickerOptions"
+                                type="datetime" placeholder="选择日期" @change="startDateChanged">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item prop="drillEndTime" label="培训结束时间">
-                <el-date-picker style="width: 100%;" required v-model="formData.drillEndTime" :picker-options="endDatepickerOptions" @change="endDateChanged"
+                <el-date-picker style="width: 100%;" required v-model="formData.drillEndTime"
+                                :picker-options="endDatepickerOptions" @change="endDateChanged"
                                 type="datetime" placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
-              <el-form-item  prop="drillSite" label="演练地点">
+              <el-form-item prop="drillSite" label="演练地点">
                 <el-input style="width: 100%;" v-model="formData.drillSite" placeholder="请输入演练地点" :length="50"/>
               </el-form-item>
             </el-col>
@@ -91,20 +93,38 @@
                 </imgUpload>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+              <el-form-item v-if="formData.status==2" prop="commentScore" label="评分">
+                <el-rate
+                  :max="10"
+                  v-model="formData.commentScore"
+                >
+                </el-rate>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+              <el-form-item v-if="formData.status==2" prop="comment" label="评语">
+                <k-textarea v-model="formData.comment" placeholder="请输入评语" :length="200"/>
+              </el-form-item>
+            </el-col>
+
           </el-row>
         </el-form>
       </div>
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">取消</el-button>
-        <el-button type="primary" @click="onSave">暂存</el-button>
-        <el-button type="primary" @click="onSubmit">提交</el-button>
+        <el-button v-if="formData.status!=2" type="primary" @click="onSave">暂存</el-button>
+        <el-button v-if="formData.status!=2" type="primary" @click="onSubmit">提交</el-button>
+        <el-button v-if="formData.status==2" type="primary" @click="onEvaluate">评价</el-button>
       </div>
     </DialogCom>
     <dialog-drill-dictionary-select
       ref="DialogDrillDictionarySelect"
       :defaultSelect=defaultSelect
-      @select="materialsSelect"
+      @select="drillDictionarySelect"
       :orgId="this.$store.getters.orgId"
     ></dialog-drill-dictionary-select>
   </div>
@@ -112,7 +132,7 @@
 
 <script>
 import {mapState, mapMutations} from "vuex";
-import {getDrillTask, recordDrillTask} from "@/api/core/drill/drillTask";
+import {evaluateDrillTask, getDrillTask, recordDrillTask} from "@/api/core/drill/drillTask";
 import dayjs from "dayjs";
 import KTextarea from "@/components/common/textarea.vue";
 import KSelect from "@/components/common/userselect.vue";
@@ -121,7 +141,7 @@ import KFileUpload from "@/components/K-FileUpload/index.vue";
 import DialogDrillDictionarySelect from "@/views/core/drill/task/dialog.select.drillDictionary.vue";
 
 export default {
-  components: {KTextarea, KSelect, imgUpload,KFileUpload,DialogDrillDictionarySelect},
+  components: {KTextarea, KSelect, imgUpload, KFileUpload, DialogDrillDictionarySelect},
   dicts: ['core_drill_type'],
   data() {
     const params = this.$route.params;
@@ -216,7 +236,7 @@ export default {
           response.data.fileList = [];
         }
         this.formData = response.data;
-        this.formFileListDefualtValue=response.data.fileList;
+        this.formFileListDefualtValue = response.data.fileList;
       });
       console.log("getDrillTask", this.formData);
     },
@@ -274,7 +294,7 @@ export default {
       this.isShow = false;
       this.formData = this.reset();
       this.$refs["uploadimage"].clearFiles();
-      this.formFileListDefualtValue=[];
+      this.formFileListDefualtValue = [];
     },
     async onSave() {
       if (!this.validatePerson()) {
@@ -318,11 +338,11 @@ export default {
         delete request.absenceList;
         delete request.absentList;
 
-        if (request.drillStartTime){
+        if (request.drillStartTime) {
           request.drillStartTime = dayjs(request.drillStartTime).format("YYYY-MM-DD HH:mm:ss");
         }
 
-        if (request.drillEndTime){
+        if (request.drillEndTime) {
           request.drillEndTime = dayjs(request.drillEndTime).format("YYYY-MM-DD HH:mm:ss");
         }
 
@@ -333,6 +353,27 @@ export default {
         });
       }
     },
+    async onEvaluate() {
+      console.log("onEvaluate", this.formData)
+      if (!this.formData.commentScore) {
+        this.$message.error("请选择评分!");
+      }
+      if (!this.formData.comment) {
+        this.$message.error("请输入评语!");
+      }
+      let { commentScore,comment,id} = { ...this.formData};
+      let json={};
+      json.score = commentScore;
+      json.comment = comment;
+      json.taskId = id;
+
+      evaluateDrillTask(json).then((v) => {
+        this.$emit("success", this.formData);
+        this.onHide();
+        this.$modal.msgSuccess("演练登记评价成功");
+      });
+
+    },
     validatePerson() {
       for (let i = 0; i < this.formData.absenceList.length; i++) {
         let absence = this.formData.absenceList[i];
@@ -358,10 +399,10 @@ export default {
       return time.getTime() < new Date(startDate).getTime();
     },
     endDateChanged(time) {
-      console.log("startDateChanged",time,this.formData.drillStartTime ,this.formData.drillEndTime)
+      console.log("startDateChanged", time, this.formData.drillStartTime, this.formData.drillEndTime)
       if (dayjs(this.formData.drillStartTime).isAfter(dayjs(this.formData.drillEndTime))) {
         this.formData.drillStartTime = this.formData.drillEndTime;
-        console.log("trainingEndDateTime",this.formData.drillEndTime)
+        console.log("trainingEndDateTime", this.formData.drillEndTime)
       }
     },
     startDateChanged(time) {
@@ -381,15 +422,14 @@ export default {
       }
     },
     selectMaterials() {
-      this.$refs["DialogDrillDictionarySelect"].show();
+      console.log("selectMaterials", this.formData)
+      this.$refs["DialogDrillDictionarySelect"].show(this.formData.type);
     },
-    materialsSelect(){
-
+    drillDictionarySelect(data) {
+      this.formData.presetCase = data[0].defaultCause;
     },
 
 
-
-
   },
 
   mounted() {

src/views/core/drill/task/dialog.select.drillDictionary.vue

@@ -13,9 +13,11 @@
         ref="st"
         url="/core/drillDictionary/list"
         method="GET"
+        type="multiple"
         :search-data="search"
         :pageable="true"
         :select="true"
+        :selectLimit="1"
         :select-default="selectList"
         :drag="false"
         @select="onSelect"
@@ -77,7 +79,11 @@ export default {
       isShow: false,
       selectList: [],
       // ruleList: [],
-      search: this.emptySearch(),
+      search: {
+        id: null,
+        drillType: null,
+        orgId: this.$store.getters.orgId,
+      },
     };
   },
   computed: {},
@@ -94,11 +100,19 @@ export default {
     orgId: {},
   },
   methods: {
-    show() {
+    show(type) {
+      console.log("show", type)
       this.search = this.emptySearch();
-      console.log("this.search", this.search)
+      if (type){
+        this.search.drillType =  type.toString();
+      }
       this.isShow = true;
       this.selectList = this.defaultSelect;
+      console.log("this.selectList", this.selectList)
+      /*if (type){
+        this.search.drillType = parseInt(type);
+        this.onSelect( this.search)
+      }*/
     },
     onHide() {
       this.isShow = false;
@@ -114,12 +128,14 @@ export default {
     },
     emptySearch() {
       return {
-        title: null,
-        fileName: null,
+        id: null,
+        drillType: null,
         orgId: this.$store.getters.orgId,
-        // t:new Date(),
       };
     },
+    getOne(type){
+
+    },
 
   },
   mounted() {

src/views/core/drill/task/index.vue

@@ -55,7 +55,7 @@
         </el-row>
 
         <el-table border height="550px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
-          <el-table-column label="主题" width="200" align="left" header-align="center" prop="title"/>
+          <el-table-column label="主题" width="100" align="left" header-align="center" prop="title"/>
           <el-table-column label="演练机构" width="200" align="left" header-align="center" prop="orgName"/>
           <!--          <el-table-column label="演练角色" align="center">
                       <template slot-scope="scope">
@@ -73,7 +73,7 @@
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.type"/>
             </template>
           </el-table-column>
-          <el-table-column label="任务时间" align="center" width="300">
+          <el-table-column label="任务时间" align="center" width="200">
             <template slot-scope="scope">
               {{scope.row.startDate? dayjs(scope.row.startDate).format("YYYY-MM-DD") +" ~ "+dayjs(scope.row.endDate).format("YYYY-MM-DD"):''}}
             </template>
@@ -85,7 +85,7 @@
                               </el-table-column>
                               <el-table-column label="指挥人" align="center" prop="hostName"/>
                               <el-table-column label="演练地点" align="center" prop="drillSite"/>-->
-          <el-table-column label="演练状态" align="left" header-align="center" prop="status">
+          <el-table-column label="演练状态" align="center" header-align="center" prop="status">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.drill_task_status" :value="scope.row.status"/>
             </template>
@@ -113,14 +113,14 @@
                 v-hasPermi="['core:drillTask:query']"
               >详情
               </el-button>
-              <!--              <el-button
+                           <el-button
                               size="mini"
                               type="text"
                               icon="el-icon-document-add"
                               v-if="canEvaluate(scope.row)"
                               @click="handleRecorded(scope.row.id)"
                               v-hasPermi="['core:drillTask:evaluate']"
-                            >评价</el-button>-->
+                            >评价</el-button>
               <el-button
                 size="mini"
                 type="text"

src/views/system/device/index.vue

@@ -28,6 +28,7 @@
             </el-form-item>
 
           <el-form-item label="设备分类" prop="deviceType">
+
               <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择">
                 <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
                   :value="item.dictValue"></el-option>