bug修改

src/views/system/dept/extend.vue

@@ -507,7 +507,14 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="orgform.standard === '3'" label="未达标原因">
-          <el-input type="textarea" rows="5" v-model="orgform.reason" placeholder="请输入未达标原因"/>
+
+          <k-textarea
+            v-model="orgform.reason"
+            :length="200"
+            :row="10"
+            show-word-limit
+            placeholder="请输入未达标原因"
+          />
         </el-form-item>
 
         <el-form-item label="上传证书" v-show="orgform.standard !== '3'" prop="certificate">
@@ -574,6 +581,7 @@ import {
 } from "@/api/system/OrgPhysicalDefenseConstruction";
 import {selectCityInfoVoList} from "@/api/core/weather";
 import TreeNodeDialogVue from "../../tool/build/TreeNodeDialog.vue";
+import KTextarea from "@/components/common/textarea.vue";
 
 export default {
   dicts: [
@@ -596,6 +604,7 @@ export default {
   fillter: {},
 
   components: {
+    KTextarea,
     ImgsUpload,
     "el-image-viewer": () =>
       import("element-ui/packages/image/src/image-viewer"),

src/views/warn/dialog.dealAlarm.vue

@@ -19,7 +19,7 @@
         </el-descriptions-item>
         <el-descriptions-item labelClassName="gx_info_label" label="告警开始时间" >
           {{alarmData.time}}
-        </el-descriptions-item>          
+        </el-descriptions-item>
         <el-descriptions-item labelClassName="gx_info_label" label="告警结束时间" >
           {{alarmData.endTime}}
         </el-descriptions-item>
@@ -39,8 +39,8 @@
           label-width="150px"
           label-prefix=":"
         >
-          <!-- <el-form-item label="所属机构" prop="orgId">         
-            {{formData.orgName}} 
+          <!-- <el-form-item label="所属机构" prop="orgId">
+            {{formData.orgName}}
           </el-form-item> -->
           <el-form-item label="处置类型" prop="doType">
             <el-select
@@ -94,6 +94,13 @@ export default {
         doType: [{ required: true, message: "请选择处置类型" }],
         doContent: [{ required: true, message: "请输入处置内容" }],
       },
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
     };
   },
   props: {},

src/views/warn/dialog.info.vue

@@ -7,6 +7,9 @@
           <el-descriptions-item labelClassName="gx_info_label" label="机构名称">
             {{formData.orgName}}
           </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="机构名称">
+            {{formData.deviceName}}
+          </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警分类" >
             {{dataTypeText()}}
           </el-descriptions-item>
@@ -15,7 +18,7 @@
           </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警开始时间" >
             {{formData.time}}
-          </el-descriptions-item>          
+          </el-descriptions-item>
           <el-descriptions-item labelClassName="gx_info_label" label="告警结束时间" >
             {{formData.endTime}}
           </el-descriptions-item>
@@ -48,11 +51,11 @@
 </template>
 
 <script>
-  import { mapState, mapMutations } from "vuex";  
+  import { mapState, mapMutations } from "vuex";
   import {detail} from "@/api/iot/alarmRule";
   import { getLabel } from "@/views/commonOption.js";
   export default {
-    components: {},   
+    components: {},
     dicts: ["alarm_deal_type"],
     data() {
       const params = this.$route.params;
@@ -124,9 +127,9 @@
         }
 
         if (this.formData.dataType == '0') {
-          return '动环类告警'
+          return '动环告警'
         } else if (this.formData.dataType == '1') {
-          return '视频类告警'
+          return '其他告警'
         } else {
           return '未知'
         }

src/views/warn/index.vue

@@ -111,7 +111,7 @@
                 >
                 </DataRangePicker>
               </el-form-item>
-            
+
             </el-form>
 
             <el-row :gutter="10">
@@ -196,7 +196,7 @@
               align="center"
               prop="deviceName"
               width="135"
-              show-overflow-tooltip="true"
+              :show-overflow-tooltip="showOverflowTooltip"
             />
             <el-table-column
               label="告警类型"
@@ -219,7 +219,7 @@
               align="center"
               prop="content"
             />
-         
+
             <!--<el-table-column
               label="处理结果"
               align="center"
@@ -262,7 +262,7 @@
     </el-row>
     <dialog-info ref="infoDialog"></dialog-info>
     <dialog-deal-alarm ref="dealAlarmDialog" @success="getList()"></dialog-deal-alarm>
-  </div>  
+  </div>
 </template>
 
 <script>
@@ -386,6 +386,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      showOverflowTooltip: true,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -506,6 +507,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      console.log("123")
       this.resetForm("queryForm");
       this.queryParams.orgId = this.orgId;
       this.selectedOrgName = this.orgName;
@@ -513,6 +515,8 @@ export default {
       this.queryParams.dateRange = ["", ""];
       this.queryParams.planStartTime = null;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub);
+      this.isDoStr=null;
+      this.queryParams.isDo=null;
       this.handleQuery();
     },
     // 多选框选中数据