故障配置功能优化

@@ -17,7 +17,7 @@
 	<link href="public/lib/vant/index.css" rel="stylesheet">
 	<link href="public/lib/vant/index.css" rel="stylesheet">
 	<script src="public/lib/vant/vant.min.js"></script>
 	<script src="public/lib/vant/vant.min.js"></script>
     <script src="public/lib/axios/axios.min.js"></script>
     <script src="public/lib/axios/axios.min.js"></script>
-    <!-- <script src="public/lib/dayjs/dayjs.min.js"></script> -->
+     <script src="public/lib/dayjs/dayjs.min.js"></script>
     <script src="public/lib/jquery/jquery.min.js"></script>
     <script src="public/lib/jquery/jquery.min.js"></script>
 
 
     <script src="public/lib/echarts/echarts.min.js"></script>
     <script src="public/lib/echarts/echarts.min.js"></script>

@@ -38,7 +38,7 @@
     display: flex;
     display: flex;
 }
 }
 
 
-.container .cm-card .search>button {
+.container .cm-card .search > button {
     margin-left: 10px;
     margin-left: 10px;
 }
 }
 
 
@@ -129,17 +129,19 @@ custom-class="config-dialog"
     cursor: pointer;
     cursor: pointer;
 }
 }
 
 
-.margin-top-bottom-30{
-    margin:30px 0;
+.margin-top-bottom-30 {
+    margin: 30px 0;
 }
 }
-.margin-top-bottom-10{
-    margin:10px 0;
+
+.margin-top-bottom-10 {
+    margin: 10px 0;
 }
 }
 
 
 /* 边框闪烁 */
 /* 边框闪烁 */
-.arrowBox{
+.arrowBox {
     animation: glow 300ms ease-out infinite alternate;
     animation: glow 300ms ease-out infinite alternate;
 }
 }
+
 /*@keyframes glow {
 /*@keyframes glow {
     0% {
     0% {
         box-shadow: 0 0 5px rgba(245,166,35,.2), inset 0 0 5px rgba(245,166,35,.1), 0 0px 2px #f5a623;
         box-shadow: 0 0 5px rgba(245,166,35,.2), inset 0 0 5px rgba(245,166,35,.1), 0 0px 2px #f5a623;
@@ -158,11 +160,35 @@ custom-class="config-dialog"
         box-shadow: 0 0 20px red, inset 0 0 10px red, 0 0px 5px red;
         box-shadow: 0 0 20px red, inset 0 0 10px red, 0 0px 5px red;
     }
     }
 }
 }
-.tree-table .el-table td.el-table__cell div{
+
+.tree-table .el-table td.el-table__cell div {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
 }
 }
-.tree-table .el-table .el-table__cell.is-center div{
+
+.tree-table .el-table .el-table__cell.is-center div {
     justify-content: center;
     justify-content: center;
 }
 }
 
 
+
+.p-6{
+    padding: 6px;
+}
+
+.m-l-6 {
+    margin-left: 6px;
+}
+
+.m-r-6 {
+    margin-right: 6px;
+}
+
+.m-b-6 {
+    margin-bottom: 6px;
+}
+
+.m-t-6 {
+    margin-top: 6px;
+}
+
+

-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.dayjs=e()}(this,function(){"use strict";const t=60,e=60*t,s=24*e,r=7*s,n=(t,e,s)=>!t||t.length>=e?t:`${Array(e+1-t.length).join(s)}${t}`;class i{constructor(t){this.utc=!1;const e=this.parseConfig(t);this.date=new Date(e),this.timeZone=this.date.getTimezoneOffset()/60,this.timeZoneString=n(String(-1*this.timeZone).replace(/^(.)?(\d)/,"$10$200"),5,"+"),this.mYear=this.date.getFullYear(),this.mMonth=this.date.getMonth(),this.mDay=this.date.getDate(),this.mWeek=this.date.getDay(),this.mHour=this.date.getHours(),this.mMinute=this.date.getMinutes(),this.mSecond=this.date.getSeconds()}parseConfig(t){if(!t)return new Date;if(t instanceof Date)return t;if(/^(\d){8}$/.test(t)){return this.utc=!0,`${t.substr(0,4)}-${t.substr(4,2)}-${t.substr(6,2)}`}return t}year(){return this.mYear}month(){return this.mMonth}unix(){const t=this.utc?60*this.timeZone*60*1e3:0;return Math.floor((this.date.getTime()+t)/1e3)}toString(){return this.date.toUTCString()}startOf(t){switch(t){case"year":return new i(new Date(this.year(),0,1));case"month":return new i(new Date(this.year(),this.month(),1));default:return this}}add(n,a){let h;switch(a){case"m":case"minutes":h=t;break;case"h":case"hours":h=e;break;case"d":case"days":h=s;break;case"w":case"weeks":h=r;break;default:h=1}const u=this.unix()+n*h;return new i(1e3*u)}subtract(t,e){return this.add(-1*t,e)}format(t="YYYY-MM-DDTHH:mm:ssZ"){const e=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];return t.replace(/Y{2,4}|M{1,2}|D{1,2}|d{1,4}|H{1,2}|m{1,2}|s{1,2}|Z{1,2}/g,t=>{switch(t){case"YY":return String(this.mYear).slice(-2);case"YYYY":return String(this.mYear);case"M":return String(this.mMonth+1);case"MM":return n(String(this.mMonth+1),2,"0");case"D":return String(this.mDay);case"DD":return n(String(this.mDay),2,"0");case"d":return String(this.mWeek);case"dddd":return e[this.mWeek];case"H":return String(this.mHour);case"HH":return n(String(this.mHour),2,"0");case"m":return String(this.mMinute);case"mm":return n(String(this.mMinute),2,"0");case"s":return String(this.mSecond);case"ss":return n(String(this.mSecond),2,"0");case"Z":return`${this.timeZoneString.slice(0,-2)}:00`;case"ZZ":return this.timeZoneString;default:return t}})}}return t=>new i(t)});
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):t.dayjs=n()}(this,function(){"use strict";var t="millisecond",n="second",e="minute",r="hour",i="day",s="week",u="month",o="quarter",a="year",h=/^(\d{4})-?(\d{1,2})-?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/,f=/\[([^\]]+)]|Y{2,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,c=function(t,n,e){var r=String(t);return!r||r.length>=n?t:""+Array(n+1-r.length).join(e)+t},d={s:c,z:function(t){var n=-t.utcOffset(),e=Math.abs(n),r=Math.floor(e/60),i=e%60;return(n<=0?"+":"-")+c(r,2,"0")+":"+c(i,2,"0")},m:function(t,n){var e=12*(n.year()-t.year())+(n.month()-t.month()),r=t.clone().add(e,u),i=n-r<0,s=t.clone().add(e+(i?-1:1),u);return Number(-(e+(n-r)/(i?r-s:s-r))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(h){return{M:u,y:a,w:s,d:i,D:"date",h:r,m:e,s:n,ms:t,Q:o}[h]||String(h||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},$={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_")},l="en",m={};m[l]=$;var y=function(t){return t instanceof v},M=function(t,n,e){var r;if(!t)return l;if("string"==typeof t)m[t]&&(r=t),n&&(m[t]=n,r=t);else{var i=t.name;m[i]=t,r=i}return e||(l=r),r},g=function(t,n,e){if(y(t))return t.clone();var r=n?"string"==typeof n?{format:n,pl:e}:n:{};return r.date=t,new v(r)},D=d;D.l=M,D.i=y,D.w=function(t,n){return g(t,{locale:n.$L,utc:n.$u,$offset:n.$offset})};var v=function(){function c(t){this.$L=this.$L||M(t.locale,null,!0),this.parse(t)}var d=c.prototype;return d.parse=function(t){this.$d=function(t){var n=t.date,e=t.utc;if(null===n)return new Date(NaN);if(D.u(n))return new Date;if(n instanceof Date)return new Date(n);if("string"==typeof n&&!/Z$/i.test(n)){var r=n.match(h);if(r)return e?new Date(Date.UTC(r[1],r[2]-1,r[3]||1,r[4]||0,r[5]||0,r[6]||0,r[7]||0)):new Date(r[1],r[2]-1,r[3]||1,r[4]||0,r[5]||0,r[6]||0,r[7]||0)}return new Date(n)}(t),this.init()},d.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},d.$utils=function(){return D},d.isValid=function(){return!("Invalid Date"===this.$d.toString())},d.isSame=function(t,n){var e=g(t);return this.startOf(n)<=e&&e<=this.endOf(n)},d.isAfter=function(t,n){return g(t)<this.startOf(n)},d.isBefore=function(t,n){return this.endOf(n)<g(t)},d.$g=function(t,n,e){return D.u(t)?this[n]:this.set(e,t)},d.year=function(t){return this.$g(t,"$y",a)},d.month=function(t){return this.$g(t,"$M",u)},d.day=function(t){return this.$g(t,"$W",i)},d.date=function(t){return this.$g(t,"$D","date")},d.hour=function(t){return this.$g(t,"$H",r)},d.minute=function(t){return this.$g(t,"$m",e)},d.second=function(t){return this.$g(t,"$s",n)},d.millisecond=function(n){return this.$g(n,"$ms",t)},d.unix=function(){return Math.floor(this.valueOf()/1e3)},d.valueOf=function(){return this.$d.getTime()},d.startOf=function(t,o){var h=this,f=!!D.u(o)||o,c=D.p(t),d=function(t,n){var e=D.w(h.$u?Date.UTC(h.$y,n,t):new Date(h.$y,n,t),h);return f?e:e.endOf(i)},$=function(t,n){return D.w(h.toDate()[t].apply(h.toDate(),(f?[0,0,0,0]:[23,59,59,999]).slice(n)),h)},l=this.$W,m=this.$M,y=this.$D,M="set"+(this.$u?"UTC":"");switch(c){case a:return f?d(1,0):d(31,11);case u:return f?d(1,m):d(0,m+1);case s:var g=this.$locale().weekStart||0,v=(l<g?l+7:l)-g;return d(f?y-v:y+(6-v),m);case i:case"date":return $(M+"Hours",0);case r:return $(M+"Minutes",1);case e:return $(M+"Seconds",2);case n:return $(M+"Milliseconds",3);default:return this.clone()}},d.endOf=function(t){return this.startOf(t,!1)},d.$set=function(s,o){var h,f=D.p(s),c="set"+(this.$u?"UTC":""),d=(h={},h[i]=c+"Date",h.date=c+"Date",h[u]=c+"Month",h[a]=c+"FullYear",h[r]=c+"Hours",h[e]=c+"Minutes",h[n]=c+"Seconds",h[t]=c+"Milliseconds",h)[f],$=f===i?this.$D+(o-this.$W):o;if(f===u||f===a){var l=this.clone().set("date",1);l.$d[d]($),l.init(),this.$d=l.set("date",Math.min(this.$D,l.daysInMonth())).toDate()}else d&&this.$d[d]($);return this.init(),this},d.set=function(t,n){return this.clone().$set(t,n)},d.get=function(t){return this[D.p(t)]()},d.add=function(t,o){var h,f=this;t=Number(t);var c=D.p(o),d=function(n){var e=g(f);return D.w(e.date(e.date()+Math.round(n*t)),f)};if(c===u)return this.set(u,this.$M+t);if(c===a)return this.set(a,this.$y+t);if(c===i)return d(1);if(c===s)return d(7);var $=(h={},h[e]=6e4,h[r]=36e5,h[n]=1e3,h)[c]||1,l=this.$d.getTime()+t*$;return D.w(l,this)},d.subtract=function(t,n){return this.add(-1*t,n)},d.format=function(t){var n=this;if(!this.isValid())return"Invalid Date";var e=t||"YYYY-MM-DDTHH:mm:ssZ",r=D.z(this),i=this.$locale(),s=this.$H,u=this.$m,o=this.$M,a=i.weekdays,h=i.months,c=function(t,r,i,s){return t&&(t[r]||t(n,e))||i[r].substr(0,s)},d=function(t){return D.s(s%12||12,t,"0")},$=i.meridiem||function(t,n,e){var r=t<12?"AM":"PM";return e?r.toLowerCase():r},l={YY:String(this.$y).slice(-2),YYYY:this.$y,M:o+1,MM:D.s(o+1,2,"0"),MMM:c(i.monthsShort,o,h,3),MMMM:h[o]||h(this,e),D:this.$D,DD:D.s(this.$D,2,"0"),d:String(this.$W),dd:c(i.weekdaysMin,this.$W,a,2),ddd:c(i.weekdaysShort,this.$W,a,3),dddd:a[this.$W],H:String(s),HH:D.s(s,2,"0"),h:d(1),hh:d(2),a:$(s,u,!0),A:$(s,u,!1),m:String(u),mm:D.s(u,2,"0"),s:String(this.$s),ss:D.s(this.$s,2,"0"),SSS:D.s(this.$ms,3,"0"),Z:r};return e.replace(f,function(t,n){return n||l[t]||r.replace(":","")})},d.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},d.diff=function(t,h,f){var c,d=D.p(h),$=g(t),l=6e4*($.utcOffset()-this.utcOffset()),m=this-$,y=D.m(this,$);return y=(c={},c[a]=y/12,c[u]=y,c[o]=y/3,c[s]=(m-l)/6048e5,c[i]=(m-l)/864e5,c[r]=m/36e5,c[e]=m/6e4,c[n]=m/1e3,c)[d]||m,f?y:D.a(y)},d.daysInMonth=function(){return this.endOf(u).$D},d.$locale=function(){return m[this.$L]},d.locale=function(t,n){if(!t)return this.$L;var e=this.clone(),r=M(t,n,!0);return r&&(e.$L=r),e},d.clone=function(){return D.w(this.$d,this)},d.toDate=function(){return new Date(this.valueOf())},d.toJSON=function(){return this.isValid()?this.toISOString():null},d.toISOString=function(){return this.$d.toISOString()},d.toString=function(){return this.$d.toUTCString()},c}();return g.prototype=v.prototype,g.extend=function(t,n){return t(n,v,g),g},g.locale=M,g.isDayjs=y,g.unix=function(t){return g(1e3*t)},g.en=m[l],g.Ls=m,g});

-import {get} from './BaseApi.js'
+import {get,post} from './BaseApi.js'
 
 
 
 
 /**
 /**
@@ -15,8 +15,30 @@ let getFaultList = (params) => {
     return get('/api-web/fault/result/tableList', params);
     return get('/api-web/fault/result/tableList', params);
 }
 }
 
 
+/**
+ * 新增或修改故障配置 定义高级规则
+ * http://192.168.0.59:3000/project/78/interface/api/3921
+ * @param params
+ * @returns {Promise<*>}
+ */
+let saveOrUpdateRuleAdvanced = (params) => {
+    return post('/api-web/fault/conf/rule/saveOrUpdateRuleAdvanced', params);
+}
+
+/**
+ * 删除故障配置 定义高级规则
+ * http://192.168.0.59:3000/project/78/interface/api/3926
+ * @param idList 逗号分隔
+ * @returns {Promise<*>}
+ */
+let delRuleAdvanced = (idList) => {
+    return get('/api-web/fault/conf/rule/delRuleAdvanced', {idList:idList});
+}
+
 
 
 export default {
 export default {
     getRuleAdvanced,
     getRuleAdvanced,
-    getFaultList
+    getFaultList,
+    saveOrUpdateRuleAdvanced,
+    delRuleAdvanced
 }
 }

@@ -44,7 +44,7 @@
             </template>
             </template>
         </el-table-column>
         </el-table-column>
 
 
-        <el-table-column v-if="showTools && columns.length > 0"  label="操作" width="80" align="center">
+        <el-table-column v-if="showTools && columns.length > 0"  label="操作" :width="toolsWith" align="center">
             <template #default="scope">
             <template #default="scope">
                 <slot name="tools" :scope="scope" ></slot>
                 <slot name="tools" :scope="scope" ></slot>
             </template>
             </template>

@@ -79,6 +79,10 @@ export default {
             type: Boolean,
             type: Boolean,
             default: false
             default: false
         },
         },
+        toolsWith:{
+            type: Number,
+            default: 80
+        },
         // medium / small / mini
         // medium / small / mini
         size:{
         size:{
             type: String,
             type: String,

@@ -16,6 +16,13 @@ export default {
         },
         },
         getFaultList(context, params) {
         getFaultList(context, params) {
             return faultDiagnosisApi.getFaultList(params);
             return faultDiagnosisApi.getFaultList(params);
-        }
+        },
+        saveOrUpdateRuleAdvanced(context, params) {
+            return faultDiagnosisApi.saveOrUpdateRuleAdvanced(params);
+        },
+        delRuleAdvanced(context, ids) {
+            return faultDiagnosisApi.delRuleAdvanced(ids);
+        },
+
     }
     }
 };
 };

@@ -12,7 +12,8 @@ server:
     key-store-password: Hg0801..
     key-store-password: Hg0801..
     key-password: Hg0801..
     key-password: Hg0801..
 url:
 url:
-  gateway: https://192.168.0.69:8080
+#  gateway: https://192.168.0.69:8080
+  gateway: http://192.168.0.123:8080
   inspection_web: http://127.0.0.1:8082
   inspection_web: http://127.0.0.1:8082
   assetsweb: http://127.0.0.1:8082
   assetsweb: http://127.0.0.1:8082
   mxgraph_editor: http://127.0.0.1:8085
   mxgraph_editor: http://127.0.0.1:8085

@@ -109,13 +109,27 @@
             <el-col :span="6">
             <el-col :span="6">
                 <div class="title-text">
                 <div class="title-text">
                     <i class="iconfont icon-liebiao"></i>
                     <i class="iconfont icon-liebiao"></i>
-                    <span>高级规则</span>
+                    <span class="m-r-6">高级规则</span>
                 </div>
                 </div>
             </el-col>
             </el-col>
         </el-row>
         </el-row>
-        <el-row>
-            <el-col :span="6">
 
 
+        <el-row>
+            <el-col :span="8" class="align-left">
+                <div class="d-flex m-b-6">
+                    <el-date-picker
+                            :size="$global.elementConfig.size.input"
+                            v-model="durationTimeObj.params.startTime"
+                            type="datetimerange"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            unlink-panels
+                            range-separator=" 至 "
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                    />
+                    <el-button type="primary" class="m-l-6" :size="$global.elementConfig.size.button" @click="addRule">新增</el-button>
+                    <el-button class="m-l-6" :size="$global.elementConfig.size.button" @click="getRuleList">刷新</el-button>
+                </div>
             </el-col>
             </el-col>
         </el-row>
         </el-row>
         <el-row >
         <el-row >
@@ -130,11 +144,30 @@
                                :showBorder="true"
                                :showBorder="true"
                                :loading="loading"
                                :loading="loading"
                                :showPage="false"
                                :showPage="false"
-                               :showTools="false"
+                               :showTools="true"
                                :getRowKeys="'busId'"
                                :getRowKeys="'busId'"
                                :defaultExpand="true"
                                :defaultExpand="true"
-                               :height="400">
+                               :toolsWith="150"
+                               :height="300">
                     <template #default="{row,prop,column}">
                     <template #default="{row,prop,column}">
+                        <div v-if="(prop == 'startTime' || prop == 'endTime') && row.editFlag && row.editFlag == true">
+                            <el-date-picker
+                                    v-model="row[prop]"
+                                    type="datetime"
+                                    @change="changeRule(row)"
+                                    placeholder="请选择"
+                                    :size="$global.elementConfig.size.input"
+                            />
+                        </div>
+                        <div v-if="prop == 'status'">
+                            <el-switch v-model="row[prop]"  active-text="启用" inactive-text="禁用" @change="changeRule(row)"/>
+                        </div>
+                    </template>
+                    <template #tools="{scope}" >
+                        <div>
+                            <el-button text @click="changeRule(scope.row,'edit')">编辑</el-button>
+                            <el-button text @click="changeRule(scope.row,'delete')">删除</el-button>
+                        </div>
                     </template>
                     </template>
                 </cm-table-page>
                 </cm-table-page>
             </el-col>
             </el-col>

@@ -107,6 +107,56 @@ export default {
             subscriptionReportVisible: false,//订阅人员弹框
             subscriptionReportVisible: false,//订阅人员弹框
             bizName: '',//业务名称
             bizName: '',//业务名称
             ruleData: [],//故障规则定义数据
             ruleData: [],//故障规则定义数据
+            // 2022-7-26 10.47 故障功能优化新增功能
+            durationTimeObj: {
+                params: {
+                    ruleId: '', // 故障定义规则ID1aa9e18147e54f0bb8b24b7c96ad60ae
+                    startTime: '',
+                    endTime: '',
+                    status: 1, //  状态0禁用1启用
+                },
+                data: {
+                    columns: [{
+                        prop: 'startTime',
+                        label: '开始时间',
+                        sortable: true,
+                        align: 'center',
+                        render: function (row) {
+                            if (row && row.startTime) {
+                                return dayjs(row.startTime).format('YYYY-MM-DD HH:mm:ss')
+                            }
+                        }
+                    }, {
+                        prop: 'endTime',
+                        label: '结束时间',
+                        sortable: true,
+                        align: 'center',
+                        render: function (row) {
+                            if (row && row.endTime) {
+                                return dayjs(row.endTime).format('YYYY-MM-DD HH:mm:ss')
+                            }
+                        }
+                    }, {
+                        prop: 'createTime',
+                        label: '创建时间',
+                        sortable: true,
+                        align: 'center',
+                        render: function (row) {
+                            if (row && row.createTime) {
+                                return dayjs(row.createTime).format('YYYY-MM-DD HH:mm:ss')
+                            }
+                        }
+                    }, {
+                        prop: 'status',
+                        label: '状态',
+                        sortable: true,
+                        align: 'center'
+                    }],
+                    list: [],
+                    total: 0
+                }
+
+            }
         }
         }
     },
     },
     setup(props) {
     setup(props) {
@@ -206,82 +256,7 @@ export default {
             proxy.baseList = val;
             proxy.baseList = val;
         }
         }
 
 
-
-        // 2022-7-26 10.47 故障功能优化新增功能 --start
-        let durationTimeObj = Vue.ref({
-            params: {
-                ruleId: '1aa9e18147e54f0bb8b24b7c96ad60ae', // 故障定义规则ID
-                startTime: '',
-                endTime: '',
-                status: '', //  状态0禁用1启用
-            },
-            data: {
-                columns: [{
-                    prop: 'startTime',
-                    label: '开始时间',
-                    sortable: true,
-                    align: 'center',
-                    click: function (row) {
-
-                    },
-                    render: function (row) {
-                    }
-                }, {
-                    prop: 'endTime',
-                    label: '结束时间',
-                    sortable: true,
-                    align: 'center',
-                    click: function (row) {
-
-                    },
-                    render: function (row) {
-                    }
-                }, {
-                    prop: 'status',
-                    label: '状态',
-                    sortable: true,
-                    align: 'center',
-                    click: function (row) {
-
-                    },
-                    render: function (row) {
-                    }
-                }],
-                list: [],
-                total: 0
-            }
-        });
-
-        // 获取列表
-        const getRuleList = () => {
-            debugger
-            // store.dispatch('getFaultList', {}).then((res) => {
-            //     debugger
-            //     if (res && res.success) {
-            //         durationTimeObj.value.data.list = res.data;
-            //     }
-            // }).catch(e => {
-            //     debugger
-            //     console.log(e);
-            // })
-            store.dispatch('getRuleAdvanced', durationTimeObj.value.params.ruleId).then((res) => {
-                debugger
-                if (res && res.success) {
-                    durationTimeObj.value.data.list = res.data;
-                }
-            }).catch(e => {
-                console.log(e);
-            })
-        }
-
-        Vue.onMounted(() => {
-            getRuleList();
-        })
-
-        // 2022-7-26 10.47 故障功能优化新增功能 --end
-
         return {
         return {
-            durationTimeObj,
             baseList,
             baseList,
             callbackBaseList,
             callbackBaseList,
             count,
             count,
@@ -329,6 +304,104 @@ export default {
                 }
                 }
             })
             })
         },
         },
+        getRuleList() {
+            store.dispatch('getRuleAdvanced', this.durationTimeObj.params.ruleId).then((res) => {
+                if (res && res.success) {
+                    res.data.forEach(function (v) {
+                        if (v.status == 1) {
+                            v.status = true;
+                        } else if (v.status == 2) {
+                            v.status = false;
+                        }
+                        v.editFlag = false;
+                    })
+                    this.durationTimeObj.data.list = res.data;
+                }
+            });
+        },
+        checkDateTime(row){
+            if(!row.ruleId){
+                this.$global.showMsg("请先保存配置！","warning");
+                return false;
+            }
+            if(!row.startTime || !dayjs(row.startTime).isValid()){
+                this.$global.showMsg("请选择开始时间！","warning");
+                return false;
+            } else {
+                row.startTime = dayjs(row.startTime).format('YYYY-MM-DD HH:mm:ss')
+            }
+
+            if(!row.endTime || !dayjs(row.endTime).isValid()){
+                this.$global.showMsg("请选择开始时间！","warning");
+                return false;
+            } else {
+                row.endTime = dayjs(row.endTime).format('YYYY-MM-DD HH:mm:ss')
+            }
+
+            return true;
+        },
+        addRule() {
+            var that = this;
+            var timeArr = that.durationTimeObj.params.startTime;
+            that.durationTimeObj.params.startTime = timeArr[0];
+            that.durationTimeObj.params.endTime = timeArr[1];
+
+            if(!that.checkDateTime(that.durationTimeObj.params)){
+                return;
+            }
+            store.dispatch('saveOrUpdateRuleAdvanced', that.durationTimeObj.params).then((res) => {
+                that.durationTimeObj.params.startTime = '';
+                that.durationTimeObj.params.endTime = '';
+                if (res && res.success) {
+                    // 刷新列表
+                    that.getRuleList();
+                    that.$global.showMsg(res.msg);
+                    return;
+                }
+                that.$global.showMsg(res.msg,'warning');
+            });
+        },
+        changeRule(row, type) {
+            var that = this;
+
+            if (type == 'delete') {
+                that.$global.confirm("您确认删除该记录吗？", function () {
+                    store.dispatch('delRuleAdvanced', row.id).then((res) => {
+                        if (res && res.success) {
+                            // 刷新列表
+                            that.getRuleList();
+                        }
+                    });
+                });
+                return;
+            }
+            if (type == 'edit') {
+                row.editFlag = true;
+                return;
+            }
+
+            if(!that.checkDateTime(row)){
+                return;
+            }
+
+            if (row.status === true) {
+                row.status = 1;
+            } else {
+                row.status = 2;
+            }
+
+
+            delete row['editFlag'];
+            store.dispatch('saveOrUpdateRuleAdvanced', row).then((res) => {
+                if (res && res.success) {
+                    // 刷新列表
+                    that.getRuleList();
+                    that.$global.showMsg(res.msg);
+                    return;
+                }
+                that.$global.showMsg(res.msg,'warning');
+            });
+        },
         hiddenAll() {
         hiddenAll() {
             this.faultDefinitionHide = false;
             this.faultDefinitionHide = false;
             this.networkMonitorHide = false;
             this.networkMonitorHide = false;
@@ -902,7 +975,6 @@ export default {
         },
         },
         //获取故障规则定义的详情
         //获取故障规则定义的详情
         getRuleDetail() {
         getRuleDetail() {
-
             let that = this;
             let that = this;
             let params = {}
             let params = {}
             this.$http.get('/api-web/fault/conf/rule/' + this.docId, params, function (res) {
             this.$http.get('/api-web/fault/conf/rule/' + this.docId, params, function (res) {
@@ -912,9 +984,10 @@ export default {
                         that.kpiId = that.ruleData[0].kpiId;
                         that.kpiId = that.ruleData[0].kpiId;
                         that.triggerValue = that.ruleData[0].triggerValue;
                         that.triggerValue = that.ruleData[0].triggerValue;
                         that.ruleId = that.ruleData[0].id;
                         that.ruleId = that.ruleData[0].id;
+                        // 加载规则列表
+                        that.durationTimeObj.params.ruleId = that.ruleId;
+                        that.getRuleList();
                     }
                     }
-
-
                 }
                 }
 
 
             })
             })
@@ -1128,6 +1201,8 @@ export default {
                     that.faultConfId = res.map.bFaultRule.faultConfig.id;
                     that.faultConfId = res.map.bFaultRule.faultConfig.id;
                     that.$global.showMsg('保存成功')
                     that.$global.showMsg('保存成功')
                     // that.alarmList=res.data;
                     // that.alarmList=res.data;
+                    that.durationTimeObj.params.ruleId = res.map.bFaultRule.id;
+                    that.getRuleList()
                 } else {
                 } else {
                     that.$global.showMsg('保存失败', 'warning')
                     that.$global.showMsg('保存失败', 'warning')
 
 
@@ -1142,7 +1217,6 @@ export default {
             if (that.faultEnvironmentRadio == 1 && that.count == 0) {
             if (that.faultEnvironmentRadio == 1 && that.count == 0) {
                 this.$global.showMsg('暂无环境数据，不能启用模块', 'warning')
                 this.$global.showMsg('暂无环境数据，不能启用模块', 'warning')
                 that.isLoading = false;
                 that.isLoading = false;
-
             } else {
             } else {
                 this.getTargetId('base')
                 this.getTargetId('base')
                 that.saveConfigDetailOther();
                 that.saveConfigDetailOther();