履职定义、内容库管理界面优化；Primary按钮样式

src/assets/styles/index.scss

@@ -212,18 +212,19 @@ aside {
   color:#fff !important;
 }
 
-//.el-button--primary {
-//  background: rgba(0, 140, 214, 0.1) !important;
-//  border-color: rgba(0, 140, 214,1) !important;
-//  color:rgba(0, 140, 214, 1) !important;
-//}
+.el-button--primary {
+  background: rgba(0,140,214,0.8) !important;
+  border-color:rgba(0,140,214,0.8)  !important;
+  color:#fff !important;
 
-//.el-button--primary:focus,
-//.el-button--primary:hover {
-//  background: rgba(0, 140, 214, 1) !important;
-//  border-color: rgba(0, 140, 214,1) !important;
-//  color:#fff !important;
-//}
+}
+
+.el-button--primary:focus,
+.el-button--primary:hover {
+  background: rgba(0, 140, 214, 1) !important;
+  border-color: rgba(0, 140, 214,1) !important;
+  color:#fff !important;
+}
 
 .el-switch.is-checked .el-switch__core{
   border-color: #009240FF;

src/layout/components/AppMain.vue

@@ -30,7 +30,7 @@ export default {
 .app-main {
   /* 50= navbar  50  */
   min-height: calc(100vh - 50px);
-  height: calc(100vh - 50px);
+  // height: calc(100vh - 50px);
   width: 100%;
   position: relative;
   overflow: hidden;

src/views/board/charts/org/report.vue

@@ -5,6 +5,88 @@
     style="display: flex; flex-direction: row"
   >
     <div>机构统计</div>
+    <!-- <div>
+      <div>
+        <span>营业网点</span>
+        <span>
+          <span>总数：</span>
+          <span>3020</span>
+        </span>
+        <span>
+          <span>达标数：</span>
+          <span>500</span>
+        </span>
+        <span>
+          <span>自有产权数：</span>
+          <span>1500</span>
+        </span>
+        <span>
+          <span>区域外网数：</span>
+          <span>80</span>
+        </span>
+      </div>
+      <div>
+        <span>自助设备</span>
+        <span>
+          <span>总数：</span>
+          <span>4000</span>
+        </span>
+        <span>
+          <span>在行式穿墙机具：</span>
+          <span>2000</span>
+        </span>
+        <span>
+          <span>在行式堂式机具：</span>
+          <span>1500</span>
+        </span>
+        <span>
+          <span>离行式穿墙机具：</span>
+          <span>2000</span>
+        </span>
+        <span>
+          <span>离行式堂式机具：</span>
+          <span>1500</span>
+        </span>
+      </div>
+      <div>
+        <span>自助银行</span>
+        <span>
+          <span>总数：</span>
+          <span>4000</span>
+        </span>
+        <span>
+          <span>在行式自助银行：</span>
+          <span>2000</span>
+        </span>
+        <span>
+          <span>离行式自助银行：</span>
+          <span>1500</span>
+        </span>
+      </div>
+      <div>
+        <span>业务库</span>
+        <span>
+          <span>总数：</span>
+          <span>3020</span>
+        </span>
+        <span>
+          <span>一类库：</span>
+          <span>2000</span>
+        </span>
+        <span>
+          <span>二类库：</span>
+          <span>1500</span>
+        </span>
+        <span>
+          <span>三类库：80</span>
+          <span>80</span>
+        </span>
+        <span>
+          <span>四类库</span>
+          <span>80</span>
+        </span>
+      </div>
+    </div> -->
     <div id="org_Chart"></div>
   </div>
 </template>
@@ -160,7 +242,7 @@ export default {
                 let html=`<div style="z-index:999;">
                         <div>营业网点</div>
                         <div>总数：3020</div>
-                        <div>达标数：2000</div>                        
+                        <div>达标数：2000</div>
                         <div>自有产权数：1500</div>
                         <div>区域外网数：80</div>
                     </div>`
@@ -215,16 +297,16 @@ export default {
               textStyle: {
                 color: "#000",
               },
-              confine:true,
+              confine: true,
               formatter: function (value) {
-                let html=`<div style="z-index:999;">
+                let html = `<div style="z-index:999;">
                         <div>业务库</div>
                         <div>总数：3020</div>
                         <div>一类库：2000</div>                        
                         <div>二类库：1500</div>
                         <div>三类库：80</div>
                         <div>四类库：80</div>
-                    </div>`
+                    </div>`;
                 return html;
               },
             },
@@ -268,14 +350,14 @@ export default {
               textStyle: {
                 color: "#000",
               },
-              confine:true,
+              confine: true,
               formatter: function (value) {
-                let html=`<div style="z-index:999;">
+                let html = `<div style="z-index:999;">
                         <div>自助银行</div>
                         <div>总数：4000</div>
                         <div>在行式自助银行：2000</div>                        
                         <div>离行式自助银行：1500</div>
-                    </div>`
+                    </div>`;
                 return html;
               },
             },
@@ -319,16 +401,16 @@ export default {
               textStyle: {
                 color: "#000",
               },
-              confine:true,
+              confine: true,
               formatter: function (value) {
-                let html=`<div style="z-index:999;">
+                let html = `<div style="z-index:999;">
                         <div>自助设备</div>
                         <div>总数：4000</div>
                         <div>在行式穿墙机具：2000</div>                        
                         <div>在行式堂式机具：1500</div>
                         <div>离行式穿墙机具：2000</div>                        
                         <div>离行式堂式机具：1500</div>
-                    </div>`
+                    </div>`;
                 return html;
               },
             },
@@ -361,6 +443,7 @@ export default {
   }
 
   & > div:first-child {
+    // display: none;
     width: 30px;
     height: 100%;
     color: rgb(245, 245, 245);
@@ -372,6 +455,41 @@ export default {
     padding-right: 5px;
   }
 
+  // & > div:nth-child(2) {
+  //   height: 100%;
+  //   width: calc(100% - 30px);
+  //   font-size: 14px;
+  //   line-height: 23px;
+  //   display: flex;
+  //   flex-direction: row;
+
+  //   & > div {
+  //     border: solid 1px #b8bdc088;
+  //     background-color: #b8bdc055;
+  //     display: flex;
+  //     flex-direction: column;
+  //     width:calc(25% - 20px);
+  //     margin: 10px;
+      
+
+  //     & > span:first-child {
+  //       background-color: #b8bdc088;
+  //       text-align: center;
+  //     }
+  //     & > span:not(:nth-child(1)) {
+  //       & > span {
+  //         display: inline-block;
+  //       }
+  //       & > span:first-child {
+  //         width: calc(100% - 60px);
+  //         text-align: right;
+  //       }
+  //       & > span:last-child {
+  //         width: 60px;
+  //       }
+  //     }
+  //   }
+  // }
   & > div:last-child {
     height: 100%;
     width: calc(100% - 30px);

src/views/board/charts/question/report.vue

@@ -1,9 +1,19 @@
 <!--  -->
 <template>
-  <div class="chart-template">
+  <div class="chart-template chart-template-withperiod">
     <p>
-      <span> 问题整改（近一月） </span>
+      <span> 问题整改</span>
     </p>
+    <div>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="t in types"
+          :key="t.value"
+          :label="t.text"
+          :name="t.value"
+        ></el-tab-pane>
+      </el-tabs>
+    </div>
     <div id="question_Chart"></div>
   </div>
 </template>
@@ -17,7 +27,28 @@ import {
   getNextPeriod,
   getPeriodText,
 } from "../../utils.js";
-
+const types = [
+  {
+    text: "今天",
+    value: "0",
+  },
+  {
+    text: "近7天",
+    value: "1",
+  },
+  {
+    text: "近30天",
+    value: "2",
+  },
+  {
+    text: "近90天",
+    value: "3",
+  },
+  {
+    text: "本年",
+    value: "4",
+  },
+];
 export default {
   props: ["orgId"],
   data() {
@@ -27,7 +58,8 @@ export default {
         completed: [],
         name: [],
       },
-      // activeName: types[0].value,
+      types,
+      activeName: types[0].value,
     };
   },
 
@@ -39,7 +71,7 @@ export default {
     orgId: {
       deep: true,
       handler(val) {
-        // this.resetTimer();
+        this.resetTimer();
         this.getData();
       },
     },
@@ -54,8 +86,8 @@ export default {
   created() {
     // this.types = types;
     this.maxDisplay = 16;
-    // this.refreshTime = 1 * 10 * 1000;
-    // this.isMouseOver = false;
+    this.refreshTime = 1 * 10 * 1000;
+    this.isMouseOver = false;
   },
 
   async mounted() {
@@ -80,14 +112,14 @@ export default {
       this.isMouseOver = false;
     },
     async getData() {
-      // let bs = parseInt(this.activeName) + 1;
+      let bs = parseInt(this.activeName) + 1;
       this.data = {
-        all: 500,
-        unconfirm: 112, //未确认
-        auditing: 20, //异议审批中
-        unreform: 50, //待整改
-        notQuestion: 4,
-        reformed: 500 - 112 - 20 - 50 - 4,
+        all: 500*bs,
+        unconfirm: 112*bs, //未确认
+        auditing: 20*bs, //异议审批中
+        unreform: 50*bs, //待整改
+        notQuestion: 4*bs,
+        reformed: (500 - 112 - 20 - 50 - 4)*bs,
       };
     },
 
@@ -153,7 +185,7 @@ export default {
           {
             name: "问题整改",
             type: "pie",
-            radius: ["50%","70%"],
+            radius: ["65%","85%"],
             center: ["30%", "50%"],
             data: chartData,
             label: {
@@ -162,7 +194,7 @@ export default {
               color: "#fff",
               fontSize: 14,
               formatter: function (value) {
-                return "100\n" + "\n整改率:78%";
+                return "总数:100\n" + "\n整改率:78%";
               },
             },
             emphasis: {
@@ -181,14 +213,14 @@ export default {
     },
 
     resetTimer() {
-      // this.timer && clearInterval(this.timer);
-      // this.timer = setInterval(() => {
-      //   if (this.isMouseOver) {
-      //     return;
-      //   }
-      //   this.activeName = getNextPeriod(this.types, this.activeName);
-      //   this.getData();
-      // }, this.refreshTime);
+      this.timer && clearInterval(this.timer);
+      this.timer = setInterval(() => {
+        if (this.isMouseOver) {
+          return;
+        }
+        this.activeName = getNextPeriod(this.types, this.activeName);
+        this.getData();
+      }, this.refreshTime);
     },
   },
 };

src/views/board/charts/resumption/report.vue

@@ -140,11 +140,17 @@ export default {
             type: "shadow",
           },
         },
+        legend: {
+          show:true,
+          textStyle:{
+           color:"rgb(245, 245, 245)"
+          }
+        },
         grid: {
           left: "3%",
           right: "4%",
           bottom: "2%",
-          top: "5%",
+          top: "30px",
           containLabel: true,
         },
 

src/views/board/charts/safetyIndex/report2.vue

@@ -0,0 +1,272 @@
+<!--  -->
+<template>
+  <div class="chart-template">
+    <p>
+      <span> 安全指数排名（上月） </span>
+    </p>
+    <
+    <!-- <div id="safetyIndex_Chart"></div> -->
+  </div>
+</template>
+
+<script>
+import "./../../board.scss";
+import * as echarts from "echarts";
+import {
+  findMaxIndex,
+  getChartDOMSize,
+  getNextPeriod,
+  getPeriodText,
+} from "../../utils.js";
+
+export default {
+  props: ["orgId"],
+  data() {
+    return {
+      data: {
+        all: [],
+        completed: [],
+        name: [],
+      },
+    };
+  },
+
+  components: {},
+
+  computed: {},
+
+  watch: {
+    orgId: {
+      deep: true,
+      handler(val) {
+        this.resetTimer();
+        this.getData();
+      },
+    },
+    data: {
+      deep: true,
+      handler() {
+        // this.initMap();
+      },
+    },
+  },
+
+  created() {
+    this.maxDisplay = 16;
+    this.isMouseOver = false;
+  },
+
+  async mounted() {
+    window.addEventListener("resize", this.windowResize);
+  },
+  beforeDestroy() {
+    this.timer && clearInterval(this.timer);
+    this.timer = null;
+
+    window.removeEventListener("resize", this.windowResize);
+  },
+
+  methods: {
+    handleClick() {
+      this.resetTimer();
+      this.getData();
+    },
+    handleMouseEnter() {
+      this.isMouseOver = true;
+    },
+    handleMouseLeave() {
+      this.isMouseOver = false;
+    },
+    async getData() {
+      this.data = {
+        value: [
+          100, 99.4, 99, 98, 97.8, 97.6, 97.4, 97, 96.9, 96.7, 96.3, 96, 95.8,95.7,95.6,95
+        ],
+        name: [
+          "玉塘分理处",
+          "寿宁县农联社鳌阳社",
+          "永春县农联社仙溪社",
+          "永春县农联社曲斗社",
+          "连江县农联社东湖社",
+          "连江县农联社江南社",
+          "霞浦联社海滨社",
+          "霞浦联社南街社",
+          "闽侯县农联社甘蔗社",
+          "闽侯县农联社荆溪社",
+          "闽侯县农联社洋里社",
+          "闽侯县农联社青口社",
+          // "永泰县农联社红星社",
+          // "罗源县农联社洪洋社",
+          // "云霄县农联社下河社",
+          // "诏安县农联社南门社",
+        ],
+      };
+    },
+
+    windowResize() {
+      this.myChart && this.myChart.resize();
+    },
+    // initMap() {
+    //   this.myChart && this.myChart.dispose();
+
+    //   // 基于准备好的dom，初始化echarts实例
+    //   this.myChart = echarts.init(document.getElementById("safetyIndex_Chart"));
+
+    //   let t = this;
+    //   // 指定图表的配置项和数据
+    //   var option = {
+    //     // tooltip: {
+    //     //   trigger: "axis",
+    //     //   axisPointer: {
+    //     //     type: "shadow",
+    //     //   },
+    //     // },
+    //     color: ["#008CD6"],
+    //     grid: {
+    //       left: "3%",
+    //       right: "80px",
+    //       bottom: "2%",
+    //       top: "30px",
+    //       containLabel: true,
+    //     },
+    //     legend: {
+    //       show: true,
+    //       textStyle:{
+    //        color:"rgb(245, 245, 245)"
+    //       }
+    //     },
+    //     xAxis: {
+    //       max: "dataMax",
+    //       show:false,
+    //     },
+    //     yAxis: {
+    //       type: "category",
+    //       data: this.data.name,
+    //       inverse: true,
+
+    //       axisLabel: {
+    //         interval: 0,
+    //         // rotate: -30,
+    //         fontSize: 12,
+    //         color: "rgb(245, 245, 245)",
+    //       },
+    //       // animationDuration: 300,
+    //       // animationDurationUpdate: 300,
+    //       // max: this.maxDisplay, // only the largest 3 bars will be displayed
+    //     },
+    //     series: [
+    //       {
+    //         realtimeSort: true,
+    //         name: "安全评分",
+    //         type: "bar",
+    //         data: this.data.value,
+    //         barWidth: 14,
+    //         label: {
+    //           show: true,
+    //           position: "right",
+    //           valueAnimation: true,
+    //           formatter:"{c}分",
+    //           textStyle: {
+    //             fontWeight: "bolder",
+    //             fontSize: "12",
+    //             color: "rgb(245, 245, 245)",
+    //           },
+    //         },
+    //       },
+    //     ],
+    //     // xAxis: [
+    //     //   {
+    //     //     type: "category",
+    //     //     data: this.data.name,
+    //     //     // data: this.mapdata.totalDataVo.xlist,
+    //     //     axisTick: {
+    //     //       alignWithLabel: true,
+    //     //     },
+    //     //     axisLine: {
+    //     //       show: true,
+    //     //       lineStyle: {
+    //     //         type: "solid",
+    //     //         color: "#ccc", //左边线的颜⾊
+    //     //       },
+    //     //     },
+    //     //     axisLabel: {
+    //     //       interval: 0,
+    //     //       rotate: -30,
+    //     //       fontSize: 12,
+    //     //       color: "#fff",
+    //     //     },
+    //     //   },
+    //     // ],
+    //     // yAxis: [
+    //     //   {
+    //     //     type: "value",
+    //     //     minInterval: 1,
+    //     //     // max: function (value) {
+    //     //     //   let m = value.max == Math.ceil(value.max) ? Math.ceil(value.max * 1.0001) : Math.ceil(value.max);
+    //     //     //   return m
+    //     //     // },
+    //     //   },
+    //     // ],
+    //     // series: [
+    //     //   {
+    //     //     name: "总数",
+    //     //     type: "bar",
+    //     //     barWidth: "14",
+    //     //     // label: {
+    //     //     //   show: true,
+    //     //     //   position: 'top',
+    //     //     // },
+    //     //     data: this.data.all,
+    //     //   },
+    //     //   {
+    //     //     name: "已完成",
+    //     //     type: "bar",
+    //     //     barWidth: "14",
+    //     //     // label: {
+    //     //     //   show: true,
+    //     //     //   position: 'top',
+    //     //     // },
+    //     //     data: this.data.completed,
+    //     //     itemStyle: {
+    //     //       normal: {
+    //     //         label: {
+    //     //           formatter: function (param) {
+    //     //             if (t.data.all[param.dataIndex]) {
+    //     //               let rate = param.value / t.data.all[param.dataIndex];
+    //     //               return (Math.floor(rate * 1000) / 10).toFixed(1) + "%";
+    //     //             } else {
+    //     //               return "";
+    //     //             }
+    //     //           },
+    //     //           show: true,
+    //     //           position: "top",
+    //     //           textStyle: {
+    //     //             fontWeight: "bolder",
+    //     //             fontSize: "12",
+    //     //             color: "#fff",
+    //     //           },
+    //     //         },
+    //     //       },
+    //     //     },
+    //     //   },
+    //     // ],
+    //   };
+    //   if (option && typeof option === "object") {
+    //     this.myChart.setOption(option);
+    //   }
+    // },
+
+    resetTimer() {
+      // this.timer && clearInterval(this.timer);
+      // this.timer = setInterval(() => {
+      //   if (this.isMouseOver) {
+      //     return;
+      //   }
+      //   this.activeName = getNextPeriod(this.types, this.activeName);
+      //   this.getData();
+      // }, this.refreshTime);
+    },
+  },
+};
+</script>
+<style lang="less" scoped></style>

src/views/check/dialog.edit.vue

@@ -19,7 +19,7 @@
             <el-col :span="6">
               <el-form-item prop="planName" label="计划名称:">
                 <el-input
-                  v-model="formData.planName"
+                  v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"
                   placeholder="请输入"

src/views/resumption/plan/dialog.edit.vue

@@ -20,7 +20,7 @@
             <el-col :span="6">
               <el-form-item prop="planName" label="计划名称:">
                 <el-input
-                  v-model="formData.planName"
+                  v-model.trim="formData.planName"
                   :maxlength="50"
                   name="planName"
                   placeholder="请输入计划名称"

src/views/resumption/rule/index.vue

@@ -120,7 +120,7 @@
             label="备注"
             v-if="columns[5].visible"
           ></el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" class="small-padding fixed-width">
             <template slot-scope="r">
               <el-button
                 size="mini"
@@ -128,16 +128,19 @@
                 icon="el-icon-edit-outline"
                 @click="onEdit(r.row.id)"
                 v-hasPermi="['resumption:rule:edit']"
-                v-if="orgId==r.row.orgId"
+                v-if="orgId == r.row.orgId"
                 >编辑</el-button
               >
-              <el-popconfirm
-                title="确定删除履职内容库定义？"
-                @confirm="onDel(r.row.id)"
-                v-if="orgId==r.row.orgId"
+              <el-button
+                type="text"
+                size="small"
+                slot="reference"
+                icon="el-icon-delete"
+                v-if="orgId == r.row.orgId"
+                v-hasPermi="['resumption:rule:remove']"
+                @click="onDel(r.row.id)"
+                >删除</el-button
               >
-                <el-button type="text" size="small" slot="reference" icon="el-icon-delete" v-hasPermi="['resumption:rule:remove']">删除</el-button>
-              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -162,11 +165,11 @@
 
 <script>
 import OrgTree from "@/components/orgTree";
-import { mapGetters} from "vuex";
+import { mapGetters } from "vuex";
 import DialogEdit from "./dialog.edit";
 import * as api from "@/api/resumption/rule";
 import { getLabel } from "./../../commonOption";
-import {wholeTreeByType} from "@/api/system/org.js"
+import { wholeTreeByType } from "@/api/system/org.js";
 
 export default {
   name: "ruletype",
@@ -193,7 +196,7 @@ export default {
         name: null,
         type: null,
         orgType: null,
-        checkSub:true,
+        checkSub: true,
         pageNum: 1,
         pageSize: 10,
         ...query,
@@ -213,11 +216,11 @@ export default {
   props: {},
   watch: {},
   computed: {
-    ...mapGetters(['orgId']),
+    ...mapGetters(["orgId"]),
   },
   methods: {
     getLabel,
-    orgTree(){
+    orgTree() {
       return wholeTreeByType(3);
     },
     refresh() {
@@ -248,10 +251,16 @@ export default {
     onEdit(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
-    async onDel(id) {
-      await api.remove(id);
-      this.$message.info("删除成功");
-      this.getList();
+    onDel(id) {
+      this.$modal
+        .confirm("确定删除履职内容库定义？")
+        .then(() => {
+          return api.remove(id);
+        })
+        .then(() => {
+          this.$message.info("删除成功");
+          this.getList();
+        });
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -282,6 +291,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

src/views/resumption/ruleManager/index.vue

@@ -14,7 +14,6 @@
           :defaultProps="defaultProps"
           :showLowerCheck="false"
           :renderContent="renderContent"
-
         >
         </org-tree>
       </el-col>
@@ -67,7 +66,7 @@
               @click="onAddItem()"
               :disabled="rule ? false : true"
               v-hasPermi="['resumption:ruleManager:add']"
-              v-if="rule && rule.orgId == orgId && rule.ruleStatus==0"
+              v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
               >新增</el-button
             >
             <!-- <el-button
@@ -168,7 +167,7 @@
           <el-table-column
             label="操作"
             width="140"
-            v-if="rule && rule.orgId == orgId && rule.ruleStatus==0"
+            v-if="rule && rule.orgId == orgId && rule.ruleStatus == 0"
           >
             <template slot-scope="scope">
               <el-button
@@ -179,20 +178,15 @@
                 v-hasPermi="['resumption:ruleManager:edit']"
                 >编辑</el-button
               >
-
-              <el-popconfirm
-                title="将删除履职项及其下所有履职内容,确定删除？"
-                @confirm="deldata(scope.row.id)"
+              <el-button
+                type="text"
+                size="small"
+                slot="reference"
+                icon="el-icon-delete"
+                @click="deldata(scope.row.id)"
+                v-hasPermi="['resumption:ruleManager:remove']"
+                >删除</el-button
               >
-                <el-button
-                  type="text"
-                  size="small"
-                  slot="reference"
-                  icon="el-icon-delete"
-                  v-hasPermi="['resumption:ruleManager:remove']"
-                  >删除</el-button
-                >
-              </el-popconfirm>
             </template>
           </el-table-column>
         </el-table>
@@ -338,7 +332,7 @@ export default {
     },
     clicktreenode(data, node) {
       this.tableData = [];
-      this.rule=null;
+      this.rule = null;
       this.queryParams.ruleId = null;
 
       if (!data.isRule) {
@@ -354,8 +348,8 @@ export default {
       this.queryParams.ruleId = data.id;
       this.rule = data;
       this.rule.orgId = node.parent.data.id;
-      if(this.rule.ruleStatus!=0){
-        this.$message.info("履职内容库已禁用，无法编辑履职项、履职内容")
+      if (this.rule.ruleStatus != 0) {
+        this.$message.info("履职内容库已禁用，无法编辑履职项、履职内容");
       }
       this.refresh();
     },
@@ -364,9 +358,7 @@ export default {
       if (data.isRule == 0) {
         return (
           <span class="custom-tree-node">
-            <span class="show-ellipsis">
-              {data.shortName}
-            </span>
+            <span class="show-ellipsis">{data.shortName}</span>
           </span>
         );
       } else {
@@ -383,10 +375,16 @@ export default {
         );
       }
     },
-    async deldata(val) {
-      await del(val);
-      this.$message.info("删除成功");
-      this.getList();
+    deldata(val) {
+      this.$modal
+        .confirm("将删除履职项及其下所有履职内容,确定删除？")
+        .then(() => {
+          return del(val);
+        })
+        .then(() => {
+          this.$message.info("删除成功");
+          this.getList();
+        });
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -415,9 +413,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.search_itemname{
-  ::v-deep .el-form-item__label{
-    width:60px !important;
+.search_itemname {
+  ::v-deep .el-form-item__label {
+    width: 60px !important;
   }
 }
 </style>

src/views/safetycheck/taskManager/components/register.vue

@@ -92,7 +92,7 @@
                 >
                   <el-form-item label="情况描述" prop="remark">
                     <el-input
-                      v-model="point.remark"
+                      v-model.trim="point.remark"
                       style="width: 250px"
                       placeholder="请输入情况描述"
                       maxlength="255"