chenrui  2 years ago
parent
commit
1726e73f7b

+ 5 - 1
public/config.js

@@ -49,7 +49,11 @@ window.DATACONTENT_ID = {
   sysServiceTopId: 32, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
   sysServiceTopTableId: 31, //系统设置-服务管理-服务拓扑-查看日志id
   sysServiceNodeListId: 89,
-
+  sysServiceWarningId: 18029,//查询预警报警场景列表
+  sysServiceaddId: 8013,//新增预警报警场景
+  sysServiceWarnId: 18030,//预警报警场景(按照ID)
+  sysServiceStrategyId: 18033,//预警报警策略(按照ID)
+  sysServiceStrategyaddId: 8014,//新增预警报警策略
   /***-----进港管理------***/
   arrivalAirId: 67, //进港管理-机场选择
   arrivalTableId: 38, //进港管理-表格

+ 2 - 2
src/router/routes/routes-file-one.js

@@ -32,7 +32,7 @@ const BasicsDataRoutes = {
         {
           path: '/BasicsData/airportInfo',
           name: 'airportInfo',
-          component: { render (c) { return c('router-view') } },
+          component: { render(c) { return c('router-view') } },
           redirect: '/BasicsData/airportInfo',
           meta: { title: '机场信息维护', keepAlive: false },
           hidden: true,
@@ -67,7 +67,7 @@ const BasicsDataRoutes = {
         {
           path: '/BasicsData/deployNode',
           name: 'deployNode',
-          component: { render (c) { return c('router-view') } },
+          component: { render(c) { return c('router-view') } },
           meta: { title: '节点信息维护', keepAlive: false },
           hidden: true,
           src: require('@/assets/nav/ic_data_top_default @2x.png'),

+ 23 - 0
src/router/routes/routes-file-two.js

@@ -166,6 +166,29 @@ const systemSettingsRoutes = {
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')
         },
+        {
+          path: '/systemSettings/warningSet',
+          name: 'warningSet',
+          component: { render(c) { return c('router-view') } },
+          meta: { title: '报警预警设置' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png'),
+          children: [{
+            path: '/systemSettings/warningSet',
+            component: () => import('@/views/systemSettings/views/warningSet/warningSet'),
+          },
+          {
+            path: '/systemSettings/warningEdit',
+            name: 'warningEdit',
+            component: () => import('@/views/systemSettings/views/warningSet/warningEdit'),
+            meta: { title: '报警预警设置' },
+            hidden: false,
+            isAlone: true,
+            src: require('@/assets/nav/ic_setting_top@2x.png')
+          },
+          ]
+        },
         // {
         //   path: '/systemSettings/servicedeployment',
         //   name: 'servicedeployment',

+ 311 - 231
src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -11,69 +11,54 @@
 
       <div class="formBox">
         <div class="digName">
-          <div class="aviName">
-            <span class="aviP">名称</span>
-            <el-input v-model="warnName" placeholder="请输入名称"></el-input>
-          </div>
-          <div class="aviName">
-            <span class="aviP">航司</span>
-            <el-select v-model="code2" placeholder="请选择">
-              <el-option
-                v-for="item in aircompeny"
-                :key="item.value"
-                :label="item.airCompanyName"
-                :value="item.code2"
-              >
-              </el-option>
-            </el-select>
-          </div>
-          <div class="aviName" style="margin-left: 20px">
-            <span class="aviP">起飞机场</span>
-            <el-select v-model="code3" placeholder="请选择起飞机场">
-              <el-option
-                v-for="item in arilist"
-                :key="item.value1"
-                :label="item.name"
-                :value="item.code3"
-              >
-              </el-option>
-            </el-select>
-          </div>
-          <div class="aviName" style="margin-left: 20px">
-            <span class="aviP">降落机场</span>
-            <el-select v-model="code4" placeholder="请选择降落机场">
-              <el-option
-                v-for="item in arilist"
-                :key="item.value2"
-                :label="item.name"
-                :value="item.code3"
-              >
-              </el-option>
-            </el-select>
-          </div>
-          <div class="digName4">
-            <div class="aviP1">航班号</div>
-            <el-input placeholder="请输入航班号" v-model="flightNO"></el-input>
-          </div>
-        </div>
-        <div class="digName1">
-          <div class="aviName1">
-            <div class="aviP2">起止时间</div>
-            <el-date-picker
-              v-model="BeginTime1"
-              type="datetimerange"
-              value-format="yyyy-MM-dd hh:mm:ss"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            >
-            </el-date-picker>
-          </div>
-
-          <div class="aviName2">
-            <div class="aviP3">备注</div>
-            <el-input type="textarea" v-model="desc" resize="none"></el-input>
-          </div>
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <div class="aviName">
+                <span class="aviP">场景编号</span>
+                <el-input v-model="tableFormer.alarmSceneId" placeholder="请输入场景编号"></el-input>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="aviName">
+                <span class="aviP">航司二字码</span>
+                <el-input v-model="tableFormer.IATACode" placeholder="请输入航司二字码"></el-input>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="aviName" style="margin-left: 20px">
+                <span class="aviP">起飞机场</span>
+                <el-input v-model="tableFormer.departmentAirport" placeholder="请输入起飞机场"></el-input>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="aviName" style="margin-left: 20px">
+                <span class="aviP">降落机场</span>
+                <el-input v-model="tableFormer.landingAirport" placeholder="请输入起飞机场"></el-input>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="digName4">
+                <div class="aviP1">航班号</div>
+                <el-input placeholder="请输入航班号" v-model="tableFormer.flightNo"></el-input>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="digName1">
+                <div class="aviName1">
+                  <div class="aviP2">起飞时间</div>
+                  <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="tableFormer.startDate" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                  </el-date-picker>
+                </div>
+              </div>
+            </el-col>
+            <el-col :span="6">
+              <div class="aviName1">
+                <div class="aviP5">降落时间</div>
+                <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="tableFormer.endDate" :rows="1" type="datetime" placeholder="选择日期时间" @change="inputChangeHandler(item.columnName)">
+                </el-date-picker>
+              </div>
+            </el-col>
+          </el-row>
         </div>
       </div>
     </div>
@@ -81,6 +66,7 @@
     <div class="centerBox">
       <Search
         title="报警预警策略"
+        :isSearch="false"
         :isSlot="false"
         :isChild="true"
         @clearSearchData="clearSearchData"
@@ -94,7 +80,7 @@
             <span class="icon el-icon-plus"></span>
           </div>
         </div> -->
-        <el-row :gutter="24">
+        <el-row :gutter="24" v-el-table-infinite-scroll="load">
           <el-col :span="4">
             <div @click="addDig" class="lbox-add r24">
               <div class="terminal-info-add-icons">
@@ -108,24 +94,17 @@
                 <!-- <div class="title flower">
                   {{ item.name }}
                 </div> -->
-                <el-tooltip
-                  effect="dark"
-                  :content="item.name"
-                  placement="bottom"
-                >
-                  <div class="title flower">{{ item.name }}</div>
+                <el-tooltip effect="dark" :content="item.StrategyName" placement="bottom">
+                  <div class="title flower">{{ item.StrategyName }}</div>
                 </el-tooltip>
-                <div
-                  @click="delBox(item, index)"
-                  class="el-icon-close icon"
-                ></div>
+                <div @click="delBox(item, index)" class="el-icon-close icon"></div>
               </div>
               <div class="text item" style="margin-top: 15px">
                 <div class="adTime fwgh" style="margin-bottom: 15px">
-                  预警时长:<span class="timeER">{{ item.beginTime }}</span>
+                  预警时长:<span class="timeER">{{ item.warningDuration }}</span>
                 </div>
                 <div class="adTime fwgh">
-                  报警时长:<span class="timeER">{{ item.endTime }}</span>
+                  报警时长:<span class="timeER">{{ item.alarmDuration }}</span>
                 </div>
               </div>
             </div>
@@ -151,187 +130,148 @@
     </div>
 
     <!--删除弹框-->
-    <Dialog :flag="flag">
+    <Dialog :flag="rmFlag">
       <div class="airportInfoDialog">
         <div class="del-title">删除报警预警策略</div>
         <div class="content er">
           <div class="log"></div>
           是否确认删除
-          <p style="color: #eb2f3b; margin-top: 0px; margin-bottom: 0px">
-            {{ this.delName }}?
-          </p>
+          <p style="color: #eb2f3b; margin-top: 0px; margin-bottom: 0px">{{ this.delName }}?</p>
         </div>
         <div class="DelFoot right t30" style="background: #ffffff">
-          <el-button
-            size="medium"
-            @click="remove"
-            class="r25 buwitch"
-            type="danger"
-            >删除</el-button
-          >
-          <el-button size="medium" class="r26" @click="flag = false"
-            >取消</el-button
-          >
+          <el-button size="medium" @click="tableRemove" class="r25 buwitch" type="danger">删除</el-button>
+          <el-button size="medium" class="r26" @click="rmFlag = false">取消</el-button>
         </div>
       </div>
     </Dialog>
     <!-- 新增 -->
-    <div class="EditDig">
-      <el-dialog
-        @close="closeForm"
-        :visible.sync="editFalg"
-        :title="posType === 1 ? '新增报警预警策略' : '编辑报警预警策略'"
-      >
+    <!-- <div class="EditDig">
+      <el-dialog @close="closeForm" :visible.sync="editFalg" :title="posType === 1 ? '新增报警预警策略' : '编辑报警预警策略'">
         <el-form ref="form" :model="form" label-width="80px">
           <div class="itemBox">
             <el-form-item label="名称">
-              <el-input
-                @input="changeValue"
-                v-model="form.name"
-                placeholder="请输入名称"
-              ></el-input>
+              <el-input @input="changeValue" v-model="form.name" placeholder="请输入名称"></el-input>
             </el-form-item>
             <el-form-item label="策略类型">
               <el-select v-model="region" placeholder="请选择航司">
-                <el-option
-                  v-for="(item, index) in regform"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
+                <el-option v-for="(item, index) in regform" :key="index" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </div>
           <div class="itemBox">
             <el-form-item label="预警时长">
-              <el-input
-                @input="changeValue1"
-                v-model="form.WarningDur"
-                placeholder="请输入预警时长(分)"
-              ></el-input>
+              <el-input @input="changeValue1" v-model="form.WarningDur" placeholder="请输入预警时长(分)"></el-input>
             </el-form-item>
             <el-form-item label="报警时长">
-              <el-input
-                @input="changeValue2"
-                v-model="form.alamDur"
-                placeholder="请输入报警时长(分)"
-              ></el-input>
+              <el-input @input="changeValue2" v-model="form.alamDur" placeholder="请输入报警时长(分)"></el-input>
             </el-form-item>
           </div>
           <div class="itemBox">
             <el-form-item label="开始节点">
               <el-select v-model="form.StartNode" placeholder="请选择开始节点">
-                <el-option
-                  v-for="(item, index) in traceList"
-                  :key="index"
-                  :label="item.nodeName"
-                  :value="item.id"
-                ></el-option>
+                <el-option v-for="(item, index) in traceList" :key="index" :label="item.nodeName" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-input
-                placeholder="请选择开始位置"
-                v-model="form.StartPosition"
-              >
-              </el-input> -->
             <el-form-item label="开始位置">
-              <el-select
-                v-model="form.StartPosition"
-                placeholder="请选择开始位置"
-              >
-                <el-option
-                  v-for="(item, index) in StartPositionList"
-                  :key="index"
-                  :label="item.remarkCn"
-                  :value="item.id"
-                ></el-option>
+              <el-select v-model="form.StartPosition" placeholder="请选择开始位置">
+                <el-option v-for="(item, index) in StartPositionList" :key="index" :label="item.remarkCn" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </div>
           <div class="itemBox">
             <el-form-item label="结束节点">
               <el-select v-model="form.EndNode" placeholder="请选择结束节点">
-                <el-option
-                  v-for="(item, index) in traceList"
-                  :key="index"
-                  :label="item.nodeName"
-                  :value="item.id"
-                ></el-option>
+                <el-option v-for="(item, index) in traceList" :key="index" :label="item.nodeName" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-input placeholder="请选择结束位置" v-model="form.EndPosition">
-              </el-input> -->
             <el-form-item label="结束位置">
-              <el-select
-                v-model="form.StartPosition"
-                placeholder="请选择结束位置"
-              >
-                <el-option
-                  v-for="(item, index) in endPositionList"
-                  :key="index"
-                  :label="item.remarkCn"
-                  :value="item.id"
-                ></el-option>
+              <el-select v-model="form.StartPosition" placeholder="请选择结束位置">
+                <el-option v-for="(item, index) in endPositionList" :key="index" :label="item.remarkCn" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </div>
-          <!-- <div class="itemBox">
-            <el-form-item label="备注">
-              <el-input
-                @input="changeValue3"
-                type="textarea"
-                v-model="form.desc"
-              ></el-input>
-            </el-form-item>
-          </div> -->
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button type="primary" class="r25 r26" @click="submit"
-            >提 交</el-button
-          >
-          <el-button @click="close" class="r26" style="margin-left: 12px"
-            >取 消</el-button
-          >
+          <el-button type="primary" class="r25 r26" @click="submit">提 交</el-button>
+          <el-button @click="close" class="r26" style="margin-left: 12px">取 消</el-button>
         </span>
       </el-dialog>
-    </div>
+    </div> -->
+    <!--新增/编辑-->
+    <Dialog :width="width" :flag="flag">
+      <div class="dialog-content">
+        <div class="title">{{ tableTitle }}</div>
+        <div class="contents">
+          <el-form ref="ruleForm" :model="tableForm" :label-width="labelWidth">
+            <el-row :gutter="20">
+              <el-col v-for="(item, index) in tableColsCopy" :key="index">
+                <el-form-item :label="item.columnLabel">
+                  <template v-if="item.listqueryTemplateID || item.listqueryTemplateID == 0">
+                    <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
+                      <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v"> </el-option>
+                    </el-select>
+                  </template>
+                  <template v-else-if="item.dataType == 'longtext'">
+                    <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
+                  </template>
+                  <template v-else-if="item.dataType == 'datetime'">
+                    <el-date-picker
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      v-model="tableForm[item.columnName]"
+                      :rows="1"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      @change="inputChangeHandler(item.columnName)"
+                    >
+                    </el-date-picker>
+                  </template>
+                  <template v-else>
+                    <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
+                  </template>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div class="foot right">
+          <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
+          <el-button @click="flag = false" size="medium">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
   </div>
 </template>
 
 <script>
 import Dialog from "@/layout/components/Dialog/index.vue";
 import Search from "@/layout/components/Search/index.vue";
-import {
-  AddWarning,
-  AirlinesInquiry,
-  AirportsList,
-  UserWarningList,
-  AddUserWarning,
-  DelUserWarning,
-  traceNodeslist,
-  Alarmlocation,
-} from "@/api/SystemSettings.js";
+import { Query, GeneralDataReception, Start, Stop } from "@/api/dataIntegration";
+import { AddWarning, AirlinesInquiry, AirportsList, UserWarningList, AddUserWarning, DelUserWarning, traceNodeslist, Alarmlocation } from "@/api/SystemSettings.js";
 export default {
   components: { Dialog, Search },
   data() {
     return {
       id: this.$route.query.id,
-      airportCode2: this.$route.query.airportCode2,
-      BeginTime1: this.$route.query.BeginTime1,
-      flightNO: this.$route.query.flightNO,
-      ladingAirport: this.$route.query.ladingAirport,
-      desc: this.$route.query.desc,
-      warnName: this.$route.query.warnName,
-      code2: this.$route.query.airportCode2,
-      code3: this.$route.query.departureAirport,
-      code4: this.$route.query.ladingAirport,
+      // airportCode2: this.$route.query.airportCode2,
+      // BeginTime1: this.$route.query.BeginTime1,
+      // flightNO: this.$route.query.flightNO,
+      // ladingAirport: this.$route.query.ladingAirport,
+      // desc: this.$route.query.desc,
+      // warnName: this.$route.query.warnName,
+      // code2: this.$route.query.airportCode2,
+      // code3: this.$route.query.departureAirport,
+      // code4: this.$route.query.ladingAirport,
       flag: false,
+      tableFormer: {
+        alarmSceneId: "",
+        IATACode: "",
+        departmentAirport: "",
+        landingAirport: "",
+        flightNo: "",
+        BeginTime1: [],
+      },
       aircompeny: [],
-      infoArr: [
-        {
-          name: "名称",
-        },
-      ], //报警预警策略列表
+      infoArr: [], //报警预警策略列表
       posType: 1,
       arilist: [],
       traceList: [],
@@ -400,9 +340,26 @@ export default {
           },
         ],
       },
+      page: 1,
+      tableTitle: "新增",
+      labelWidth: "110px",
+      dataContent: [],
+      tableCols: [],
+      tableColsCopy: [],
+      tableForm: {}, //弹框表单
+      width: "560px",
+      flag: false,
+      rmFlag: false,
+      tableObj: {}, //增/删/改数据缓存
+      tableType: "",
+      noMore: false,
+      loading: false,
+      page: 0,
     };
   },
   created() {
+    this.sysServiceWarn();
+    this.UserWarning();
     // this.getAirlines();
     // this.getAirlist();
     // this.UserWarning();
@@ -419,6 +376,41 @@ export default {
     },
   },
   methods: {
+    load() {
+      // console.log("分页");
+      if (this.noMore || this.loading) {
+        return;
+      }
+      this.getQuery();
+    },
+    //获取预警报警场景(按照ID)
+    async sysServiceWarn() {
+      try {
+        this.loading = true;
+        let arr = [];
+        arr.push(this.$route.query.id);
+        const { code, returnData } = await Query({
+          id: DATACONTENT_ID.sysServiceWarnId,
+          needPage: ++this.page,
+          dataContent: arr,
+        });
+        if (code == 0) {
+          this.loading = false;
+          this.page--;
+          this.tableFormer = returnData.listValues[0];
+          this.tableFormer.BeginTime1 = [returnData.listValues[0].startDate, returnData.listValues[0].endDate];
+        } else {
+          this.page--;
+          this.$message.error.message;
+          this.loading = false;
+        }
+      } catch (error) {
+        this.page--;
+        this.loading = false;
+        console.log(error);
+        console.log(error);
+      }
+    },
     //获取开始位置
     async AlarmlocationList(data, val) {
       if (val == "1") {
@@ -537,23 +529,40 @@ export default {
       this.EditDialogVisible = false;
     },
 
-    //场景列表
+    //策略列表
     async UserWarning() {
-      const res = await UserWarningList({
-        sceneId: this.id,
-      });
-      if (res.code === 0) {
-        this.infoArr = res.returnData;
-      } else {
-        this.$message.error.message;
+      try {
+        let arr = [];
+        arr.push(this.$route.query.id);
+        const { code, returnData } = await Query({
+          id: DATACONTENT_ID.sysServiceStrategyId,
+          dataContent: arr,
+        });
+        if (code == 0) {
+          this.infoArr = returnData.listValues;
+          this.tableCols = returnData.columnSet;
+          this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
+        } else {
+          this.$message.error.message;
+        }
+      } catch (error) {
+        console.log(error);
+        console.log(error);
       }
+      // const res = await UserWarningList({
+      //   sceneId: this.id,
+      // });
+      // if (res.code === 0) {
+      //   this.infoArr = res.returnData;
+      // } else {
+      //   this.$message.error.message;
+      // }
     },
     infoIndex() {},
 
     delBox(item) {
-      this.flag = true;
-      this.delName = item.name;
-      this.DelId = item.id;
+      this.rmFlag = true;
+      this.tableObj.alarmStrategyID = item.alarmStrategyID;
     },
     //删除
     async remove() {
@@ -566,18 +575,11 @@ export default {
       } else {
         this.$message.error.message;
       }
-      this.flag = false;
+      this.remove = false;
     },
     addDig() {
-      this.editFalg = true;
-      this.posType = "1";
-      this.form.name = null;
-      this.region = null;
-      this.form.WarningDur = null;
-      this.form.alamDur = null;
-      this.StartNode = null;
-      this.EndNode = null;
-      this.form.desc = null;
+      this.flag = true;
+      this.tableType = "add";
     },
     editInfo(item) {
       this.posType = 2;
@@ -646,6 +648,64 @@ export default {
       }
       this.closeForm();
     },
+    // 新增/编辑-确认
+    submitClickHandler() {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          if (this.tableType == "add") {
+            this.tableForm.event = 1;
+          } else {
+            this.tableForm.event = 2;
+          }
+          this.generalDataReception(this.tableForm);
+        } else {
+          return false;
+        }
+      });
+    },
+    //表格-增/删/改
+    async generalDataReception(data) {
+      try {
+        data = {
+          ...data,
+        };
+        const { code, message } = await GeneralDataReception({
+          serviceId: DATACONTENT_ID.sysServiceStrategyaddId,
+          dataContent: JSON.stringify(data),
+        });
+        if (code == 0) {
+          this.$message.success("操作成功");
+          this.warningArr = [];
+          this.page = 1;
+          this.UserWarning();
+          this.flag = false;
+          this.rmFlag = false;
+          this.tableObj = {};
+          this.tableForm = {};
+        } else {
+          this.$message.error("操作失败");
+          this.flag = false;
+          this.rmFlag = false;
+          this.tableObj = {};
+          this.tableForm = {};
+        }
+      } catch (error) {
+        console.log(error);
+        this.flag = false;
+        this.rmFlag = false;
+        this.tableObj = {};
+        this.tableForm = {};
+      }
+    },
+    //表格-删除-确认
+    tableRemove() {
+      this.tableObj.event = 3;
+      this.generalDataReception(this.tableObj);
+    },
+    //弹框-确定
+    handleOk() {
+      this.submitClickHandler();
+    },
   },
 };
 </script>
@@ -668,9 +728,9 @@ export default {
     display: flex;
     align-items: center;
   }
-  ::v-deep .el-input__suffix {
-    right: 0;
-  }
+  // ::v-deep .el-input__suffix {
+  //   right: 0;
+  // }
   ::v-deep .el-dialog__body {
     padding-left: 0 !important;
     padding-right: 0 !important;
@@ -777,6 +837,7 @@ export default {
   padding: 24px 24px 20px 18px;
   background: #ffffff;
   border-radius: 4px;
+  margin-bottom: 24px;
   .tltle-head {
     display: flex;
     justify-content: space-between;
@@ -836,7 +897,7 @@ export default {
   }
   .digName .el-input__inner {
     margin-left: 15px;
-    width: 160px;
+    // width: 160px;
     height: 32px;
     background: #fff;
     border: 1px solid #d7dae3;
@@ -845,18 +906,17 @@ export default {
   .digName1 {
     display: flex;
     width: 100%;
-    margin-left: 54px;
     margin-bottom: 20px;
   }
   .aviP2 {
-    margin-left: 14px;
-    margin-right: 17px;
+    // margin-left: 14px;
+    // margin-right: 17px;
   }
   .digName4 {
     display: flex;
   }
   .digName4 .el-input__inner {
-    width: 400px;
+    // width: 400px;
     height: 32px;
     margin-left: 16px;
     background: #fff;
@@ -874,22 +934,39 @@ export default {
     display: flex;
     flex-direction: row;
     margin-bottom: 24px;
-    width: 240px;
+    width: 100%;
     margin-right: 10px;
     text-align: right;
   }
   .aviName1 {
-    width: 35%;
+    // width: 25%;
     display: flex;
     flex-direction: row;
     margin-bottom: 24px;
     margin-right: 10px;
     text-align: right;
+    .aviP5 {
+      width: 110px;
+      line-height: 30px;
+    }
     .el-input__inner {
-      width: 410px;
+      width: 254px;
       height: 32px;
       background: #fff;
     }
+    .el-input__prefix {
+      left: 17px;
+      top: -3px;
+    }
+    .el-input__suffix {
+      top: -3px;
+    }
+    // .el-input__suffix {
+    //   top: -2;
+    // }
+    // .el-input__icon {
+    //   margin-left: 10px;
+    // }
   }
   .aviName2 {
     display: flex;
@@ -903,20 +980,23 @@ export default {
     }
   }
   .aviP {
-    width: 100px;
+    width: 110px;
     height: 32px;
     line-height: 32px;
     color: #303133;
   }
   .aviP1 {
-    width: 140px;
+    width: 110px;
     text-align: right;
     height: 32px;
     line-height: 32px;
     color: #303133;
   }
   .aviP2 {
-    width: 64px;
+    width: 83px;
+    display: flex;
+    justify-content: flex-start;
+    padding-left: 2px;
     text-align: right;
     height: 32px;
     line-height: 32px;

+ 337 - 320
src/views/systemSettings/views/warningSet/warningSet.vue

@@ -11,51 +11,83 @@
   <div class="airportInfo">
     <!--搜索-->
     <div class="nodeLnformation_header">
-      <Search title="报警预警设置" @getSearchData="getSearchData">
+      <Search title="报警预警设置" @getSearchData="getSearchData" :isSearch="false">
         <button @click="handleAdd" class="btnAdd">新增</button>
       </Search>
     </div>
 
     <div class="aviInfo">
-      <el-row :gutter="24">
-        <el-col
-          :span="4"
-          class="box-card"
-          v-for="(item, index) in warningArr"
-          :key="index"
-          style="padding-left: 24px; padding-right: 24px"
-        >
-          <div class="headerBox">
-            <div class="tltle-head">
-              <el-tooltip
-                class="item"
-                effect="dark"
-                :content="item.warnName"
-                placement="bottom"
-              >
-                <div class="title fz16">{{ item.warnName }}</div>
-              </el-tooltip>
-              <div @click="gotoAram(item, index)" class="edit_log"></div>
+      <el-row :gutter="20" @scroll="scrollEvent">
+        <el-col :span="4" v-for="(item, index) in warningArr" :key="index">
+          <div class="box-card">
+            <div class="headerBox">
+              <div class="tltle-head">
+                <el-tooltip class="item" effect="dark" :content="item.IATACode" placement="bottom">
+                  <div class="title fz16">{{ item.IATACode }}</div>
+                </el-tooltip>
+                <div @click="gotoAram(item, index)" class="edit_log"></div>
+              </div>
+              <div @click="delBtn(item, index)" class="el-icon-close icon"></div>
             </div>
-            <div @click="delBtn(item, index)" class="el-icon-close icon"></div>
-          </div>
-          <div class="text item" style="margin-top: 6px">
-            <div class="adTime">
-              生效时间:<span class="timeSt">{{ item.beginTime }}</span>
-            </div>
-            <div class="adTime">
-              失效时间:<span class="timeSt">{{ item.endTime }}</span>
+            <div class="text item" style="margin-top: 6px">
+              <div class="adTime">
+                生效时间:<span class="timeSt">{{ item.startDate }}</span>
+              </div>
+              <div class="adTime">
+                失效时间:<span class="timeSt">{{ item.endDate }}</span>
+              </div>
             </div>
           </div>
         </el-col>
       </el-row>
       <!-- <img v-if="!warningArr.length" src="../../../assets/logo/nodata.png" /> -->
     </div>
-
+    <!--新增/编辑-->
+    <Dialog :width="width" :flag="flag">
+      <div class="dialog-content">
+        <div class="title">{{ tableTitle }}</div>
+        <div class="contents">
+          <el-form ref="ruleForm" :model="tableForm" :label-width="labelWidth">
+            <el-row :gutter="20">
+              <el-col v-for="(item, index) in tableColsCopy" :key="index">
+                <el-form-item :label="item.columnLabel">
+                  <template v-if="item.listqueryTemplateID || item.listqueryTemplateID == 0">
+                    <el-select size="small" clearable style="width: 100%" v-model="tableForm[item.columnName]" @change="changeSelect(item.columnName)" placeholder="请选择">
+                      <el-option v-for="item in tableOptions[item.columnName]" :key="item.v" :label="item.k" :value="item.v"> </el-option>
+                    </el-select>
+                  </template>
+                  <template v-else-if="item.dataType == 'longtext'">
+                    <el-input size="small" :rows="1" type="textarea" @change="inputChangeHandler(item.columnName)" v-model="tableForm[item.columnName]"></el-input>
+                  </template>
+                  <template v-else-if="item.dataType == 'datetime'">
+                    <el-date-picker
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      v-model="tableForm[item.columnName]"
+                      :rows="1"
+                      type="datetime"
+                      placeholder="选择日期时间"
+                      @change="inputChangeHandler(item.columnName)"
+                    >
+                    </el-date-picker>
+                  </template>
+                  <template v-else>
+                    <el-input size="small" v-model="tableForm[item.columnName]" @change="inputChangeHandler(item.columnName)"></el-input>
+                  </template>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div class="foot right">
+          <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
+          <el-button @click="flag = false" size="medium">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
     <!--删除弹框-->
-    <Dialog :flag="flag">
+    <Dialog :flag="rmFlag">
       <div class="airportInfoDialog">
-        <div class="del-title">删除机场信息</div>
+        <div class="del-title">删除报警预警信息</div>
         <div class="content er">
           <div class="log"></div>
           是否确认删除
@@ -65,48 +97,25 @@
         </div>
         <div class="DelFoot right t30">
-          <el-button
-            size="medium"
-            @click="remove"
-            class="r25 buwitch"
-            type="danger"
-            >删除</el-button
-          >
-          <el-button size="medium" class="r26" @click="flag = false"
-            >取消</el-button
-          >
+          <el-button size="medium" @click="tableRemove" class="r25 buwitch" type="danger">删除</el-button>
+          <el-button size="medium" class="r26" @click="rmFlag = false">取消</el-button>
         </div>
       </div>
     </Dialog>
     <!-- 新增 -->
-    <div class="EditDig">
+    <!-- <div class="EditDig">
       <el-dialog title="新增报警预警信息" :visible.sync="EditDialogVisible">
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="110px"
-          size="small "
-        >
+        <el-form ref="form" :model="form" :rules="rules" label-width="110px" size="small ">
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="名称" prop="name">
-                <el-input
-                  v-model="form.name"
-                  placeholder="请输入名称(必填)"
-                ></el-input>
+                <el-input v-model="form.name" placeholder="请输入名称(必填)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="航司" prop="code2">
                 <el-select v-model="form.code2" placeholder="请选择航司">
-                  <el-option
-                    v-for="item in aircompeny"
-                    :key="item.value"
-                    :label="item.airCompanyName"
-                    :value="item.code2"
-                  >
-                  </el-option>
+                  <el-option v-for="item in aircompeny" :key="item.value" :label="item.airCompanyName" :value="item.code2"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -115,26 +124,14 @@
             <el-col :span="12">
               <el-form-item label="起飞机场" prop="code3">
                 <el-select v-model="form.code3" placeholder="请选择起飞机场">
-                  <el-option
-                    v-for="item in arilist"
-                    :key="item.value1"
-                    :label="item.name"
-                    :value="item.code3"
-                  >
-                  </el-option>
+                  <el-option v-for="item in arilist" :key="item.value1" :label="item.name" :value="item.code3"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="降落机场" prop="code4">
                 <el-select v-model="form.code4" placeholder="请选择降落机场">
-                  <el-option
-                    v-for="item in arilist"
-                    :key="item.value2"
-                    :label="item.name"
-                    :value="item.code3"
-                  >
-                  </el-option>
+                  <el-option v-for="item in arilist" :key="item.value2" :label="item.name" :value="item.code3"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -142,74 +139,16 @@
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="航班号" prop="FlightNO">
-                <el-input
-                  v-model="form.FlightNO"
-                  placeholder="航班号"
-                ></el-input>
+                <el-input v-model="form.FlightNO" placeholder="航班号"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <!-- <div class="digName">
-          <div class="aviName">
-            <span class="aviP">名称</span>
-            <el-input v-model="name" placeholder="请输入名称" ></el-input>
-          </div>
-          <div class="aviName">
-            <span class="aviP">航司</span>
-            <el-select v-model="code2" placeholder="请选择">
-              <el-option
-                v-for="item in aircompeny"
-                :key="item.value"
-                :label="item.airCompanyName"
-                :value="item.code2"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="digName">
-          <div class="aviName">
-            <span class="aviP">起飞机场</span>
-            <el-select v-model="code3" placeholder="请选择起飞机场">
-              <el-option
-                v-for="item in arilist"
-                :key="item.value1"
-                :label="item.name"
-                :value="item.code3"
-              >
-              </el-option>
-            </el-select>
-          </div>
-          <div class="aviName">
-            <span class="aviP">降落机场</span>
-            <el-select v-model="code4" placeholder="请选择降落机场">
-              <el-option
-                v-for="item in arilist"
-                :key="item.value2"
-                :label="item.name"
-                :value="item.code3"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-        <div class="digName1">
-          <span class="aviP1">航班号</span>
-          <el-input placeholder="请输入航班号" v-model="FlightNO"></el-input>
-        </div> -->
         <el-row :gutter="20">
           <el-col :span="24">
             <div class="digName2">
               <span class="aviP2">起止时间</span>
-              <el-date-picker
-                v-model="BeginTime1"
-                type="datetimerange"
-                value-format="yyyy-MM-dd hh:mm:ss"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
+              <el-date-picker v-model="BeginTime1" type="datetimerange" value-format="yyyy-MM-dd hh:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </div>
           </el-col>
@@ -217,39 +156,26 @@
 
         <div class="digName3">
           <span class="aviP1">备注</span>
-          <el-input
-            type="textarea"
-            v-model="desc"
-            resize="none"
-            :autosize="{ minRows: 5, maxRows: 5 }"
-          ></el-input>
+          <el-input type="textarea" v-model="desc" resize="none" :autosize="{ minRows: 5, maxRows: 5 }"></el-input>
         </div>
         <span slot="footer" class="dialog-footer">
           <div class="btnstyle">
-            <el-button class="r25 r26" type="primary" @click="addSubmit"
-              >提 交</el-button
-            >
-            <el-button class="r26" @click="EditDialogVisible = false"
-              >取 消</el-button
-            >
+            <el-button class="r25 r26" type="primary" @click="addSubmit">提 交</el-button>
+            <el-button class="r26" @click="EditDialogVisible = false">取 消</el-button>
           </div>
         </span>
       </el-dialog>
-    </div>
+    </div> -->
   </div>
 </template>
 
 <script>
 import Search from "@/layout/components/Search/index.vue";
-import Dialog from "@/layout/components/Dialog/index.vue";
 import { findarrays } from "@/utils/validate";
-import {
-  warningList,
-  AddWarning,
-  AirlinesInquiry,
-  AirportsList,
-  DelWarning,
-} from "@/api/SystemSettings.js";
+import { warningList, AddWarning, AirlinesInquiry, AirportsList, DelWarning } from "@/api/SystemSettings.js";
+import Dialog from "@/layout/components/Dialog/index.vue";
+import { Query, GeneralDataReception, Start, Stop } from "@/api/dataIntegration";
+import { de } from "vis";
 export default {
   components: { Search, Dialog },
   data() {
@@ -258,13 +184,11 @@ export default {
       EditDialogVisible: false,
       name: "",
       desc: "",
-      warningArr: [
-        {
-          warnName: "名称",
-          beginTime: "1111",
-          endTime: "22222",
-        },
-      ],
+      tableTitle: "新增",
+      labelWidth: "110px",
+      page: 1,
+      isUpdate: true, // 是否到底-最后一页
+      warningArr: [],
       warnname: "",
       arilist: [],
       delId: "",
@@ -283,15 +207,9 @@ export default {
       rules: {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
         code2: [{ required: true, message: "请输入航司", trigger: "change" }],
-        code3: [
-          { required: true, message: "请输入起飞机场", trigger: "change" },
-        ],
-        code4: [
-          { required: true, message: "请输入起飞机场", trigger: "change" },
-        ],
-        FlightNO: [
-          { required: true, message: "请输入航班号", trigger: "blur" },
-        ],
+        code3: [{ required: true, message: "请输入起飞机场", trigger: "change" }],
+        code4: [{ required: true, message: "请输入起飞机场", trigger: "change" }],
+        FlightNO: [{ required: true, message: "请输入航班号", trigger: "blur" }],
       },
       FlightNO: "", //航班号
       pickerOptions: {
@@ -325,34 +243,77 @@ export default {
           },
         ],
       },
+      dataContent: [],
+      tableCols: [],
+      tableColsCopy: [],
+      tableForm: {}, //弹框表单
+      width: "560px",
+      flag: false,
+      rmFlag: false,
+      tableObj: {}, //增/删/改数据缓存
+      tableType: "",
     };
   },
   created() {
-    // this.getWarningList();
+    this.getWarningList();
     // this.getAirlines();
     // this.getAirlist();
   },
   methods: {
     getSearchData(val) {
       if (val) {
-        this.warningArr = findarrays(this.warningArr, "warnName", val);
+        this.warnin, (gArr = findarrays(this.warningArr, "IATACode", val));
       } else {
         this.getWarningList();
       }
     },
-
+    inputChangeHandler(data) {
+      if (this.tableForm[data] === "") {
+        this.tableForm[data] = null;
+      }
+    },
+    //场景列表
     async getWarningList() {
-      const res = await warningList({});
-      if (res.code === 0) {
-        this.warningArr = res.returnData;
-      } else {
-        this.$message.error.message;
+      try {
+        const { code, returnData } = await Query({
+          id: DATACONTENT_ID.sysServiceWarningId,
+          needPage: this.page,
+          dataContent: this.dataContent,
+        });
+        if (code == 0) {
+          this.isUpdate = false;
+          returnData.listValues.forEach((element) => {
+            this.warningArr.push(element);
+          });
+          this.tableCols = returnData.columnSet;
+          this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
+        } else {
+          this.page--;
+          this.$message.error.message;
+        }
+      } catch (error) {
+        this.page--;
+        console.log(error);
+        console.log(error);
+      }
+    },
+    // 列表滚动事件
+    scrollEvent(e) {
+      if (e.srcElement.offsetHeight + e.srcElement.scrollTop - e.srcElement.scrollHeight === 0) {
+        debugger;
+        if (this.isUpdate) {
+          this.page += 1;
+          this.getWarningList();
+        } else {
+          this.$message.warning("到底了");
+        }
       }
     },
     delBtn(item, index) {
       this.delId = item.id;
       this.warnname = item.warnName;
-      this.flag = true;
+      this.rmFlag = true;
+      this.tableObj.alarmSceneId = item.alarmSceneId;
     },
     //删除
     async remove() {
@@ -365,10 +326,11 @@ export default {
       } else {
         this.$message.error.message;
       }
-      this.flag = false;
+      this.rmFlag = false;
     },
     handleAdd() {
-      this.EditDialogVisible = true;
+      this.flag = true;
+      this.tableType = "add";
     },
     //获取航司信息列表
     async getAirlines() {
@@ -379,6 +341,59 @@ export default {
         this.$message.error.message;
       }
     },
+    //弹框-确定
+    handleOk() {
+      this.submitClickHandler();
+    },
+    // 新增/编辑-确认
+    submitClickHandler() {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          if (this.tableType == "add") {
+            this.tableForm.event = 1;
+          } else {
+            this.tableForm.event = 2;
+          }
+          this.generalDataReception(this.tableForm);
+        } else {
+          return false;
+        }
+      });
+    },
+    //表格-增/删/改
+    async generalDataReception(data) {
+      try {
+        data = {
+          ...data,
+        };
+        const { code, message } = await GeneralDataReception({
+          serviceId: DATACONTENT_ID.sysServiceaddId,
+          dataContent: JSON.stringify(data),
+        });
+        if (code == 0) {
+          this.$message.success("操作成功");
+          this.warningArr = [];
+          this.page = 1;
+          this.getWarningList();
+          this.flag = false;
+          this.rmFlag = false;
+          this.tableObj = {};
+          this.tableForm = {};
+        } else {
+          this.$message.error("操作失败");
+          this.flag = false;
+          this.rmFlag = false;
+          this.tableObj = {};
+          this.tableForm = {};
+        }
+      } catch (error) {
+        console.log(error);
+        this.flag = false;
+        this.rmFlag = false;
+        this.tableObj = {};
+        this.tableForm = {};
+      }
+    },
     //机场列表
     async getAirlist() {
       const res = await AirportsList({});
@@ -432,21 +447,15 @@ export default {
       this.$router.push({
         path: "/systemSettings/warningEdit",
         query: {
-          id: item.id,
-          airportCode2: item.airportCode2,
-          beginTime: item.beginTime,
-          endTime: item.endTime,
-          BeginTime1: [item.beginTime, item.endTime],
-          flightNO: item.flightNO,
-          departureAirport: item.departureAirport,
-          ladingAirport: item.ladingAirport,
-          desc: item.desc,
-          warnName: item.warnName,
-          beginLocationId: item.beginLocationId,
-          endNodeLocationId: item.endNodeLocationId,
+          id: item.alarmSceneId,
         },
       });
     },
+    //表格-删除-确认
+    tableRemove() {
+      this.tableObj.event = 3;
+      this.generalDataReception(this.tableObj);
+    },
   },
 };
 </script>
@@ -459,7 +468,7 @@ export default {
     font-family: Microsoft YaHei;
     font-weight: bold;
     color: #101116;
-    max-width: calc(100% - 40px);
+    // max-width: calc(100% - 40px);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
@@ -488,7 +497,7 @@ export default {
 }
 .adTime {
   display: flex;
-  justify-content: space-around;
+  justify-content: flex-start;
   flex-direction: row;
   font-weight: bold;
   margin-bottom: 14px;
@@ -499,7 +508,7 @@ export default {
   color: #101116;
 }
 .timeSt {
-  width: 141px;
+  // width: 141px;
   height: 13px;
   font-size: 14px;
   font-weight: 400;
@@ -545,9 +554,11 @@ export default {
     text-align: center;
   }
   .box-card {
-    width: 268px;
+    padding-left: 24px;
+    padding-right: 12px;
+    // width: 268px;
     height: 144px;
-    margin-left: 18px;
+    // margin-left: 18px;
     margin-top: 24px;
     background: #fff;
     box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
@@ -560,130 +571,136 @@ export default {
     border: none;
   }
 }
+::v-deep .el-row {
+  width: 100%;
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 100%;
+}
+// ::v-deep .EditDig {
+//   .el-dialog {
+//     width: 600px;
+//     height: 450px;
+//     border-radius: 2px;
+//     display: flex;
+//     display: -ms-flex; /* 兼容IE */
+//     flex-direction: column;
+//     -ms-flex-direction: column; /* 兼容IE */
+//     margin: 0 !important;
+//     position: absolute;
+//     top: 50%;
+//     left: 50%;
+//     transform: translate(-50%, -50%);
+//     max-height: calc(100% - 30px);
+//     max-width: calc(100% - 30px);
+//     .el-dialog__body {
+//       padding: 20px 20px 0 20px !important;
+//     }
+//     .el-dialog__footer {
+//       padding: 0 19px 0 0;
+//       background: #f0f5ff;
+//     }
+//     .dialog-footer {
+//       width: 100%;
+//       // background: #f0f5ff;
+//       border-radius: 2px;
+//       display: flex;
+//       height: 56px;
+//       line-height: 56px;
+//       justify-content: flex-end;
+//       .el-button {
+//         // height: 35px;
 
-::v-deep .EditDig {
-  .el-dialog {
-    width: 600px;
-    height: 450px;
-    border-radius: 2px;
-    display: flex;
-    display: -ms-flex; /* 兼容IE */
-    flex-direction: column;
-    -ms-flex-direction: column; /* 兼容IE */
-    margin: 0 !important;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    max-height: calc(100% - 30px);
-    max-width: calc(100% - 30px);
-    .el-dialog__body {
-      padding: 20px 20px 0 20px !important;
-    }
-    .el-dialog__footer {
-      padding: 0 19px 0 0;
-      background: #f0f5ff;
-    }
-    .dialog-footer {
-      width: 100%;
-      // background: #f0f5ff;
-      border-radius: 2px;
-      display: flex;
-      height: 56px;
-      line-height: 56px;
-      justify-content: flex-end;
-      .el-button {
-        // height: 35px;
+//         text-align: center;
+//       }
+//       .el-button-primary {
+//         background: #2d67e3 !important;
+//         border-radius: 4px;
+//       }
+//       .btnstyle {
+//         width: 100%;
+//         height: 100%;
+//         // margin-right: 22px;
+//         // margin-top: 10px;
+//         display: flex;
+//         justify-content: flex-end;
+//         align-items: center;
+//       }
+//     }
+//   }
+//   .el-dialog__header {
+//     padding: 10px 20px 10px;
+//     height: 36px;
+//     background: #2d67e3;
+//   }
+//   .el-dialog__title {
+//     font-size: 16px;
+//     font-weight: bold;
+//     color: #fff;
+//   }
+//   .el-date-editor .el-range__icon {
+//     line-height: 24px;
+//   }
+//   .el-range-separator {
+//     line-height: 24px;
+//   }
+//   .el-dialog__headerbtn {
+//     top: 11px;
+//   }
+//   .el-dialog__headerbtn .el-dialog__close {
+//     color: #fff;
+//   }
 
-        text-align: center;
-      }
-      .el-button-primary {
-        background: #2d67e3 !important;
-        border-radius: 4px;
-      }
-      .btnstyle {
-        width: 100%;
-        height: 100%;
-        // margin-right: 22px;
-        // margin-top: 10px;
-        display: flex;
-        justify-content: flex-end;
-        align-items: center;
-      }
-    }
-  }
-  .el-dialog__header {
-    padding: 10px 20px 10px;
-    height: 36px;
-    background: #2d67e3;
-  }
-  .el-dialog__title {
-    font-size: 16px;
-    font-weight: bold;
-    color: #fff;
-  }
-  .el-date-editor .el-range__icon {
-    line-height: 24px;
-  }
-  .el-range-separator {
-    line-height: 24px;
-  }
-  .el-dialog__headerbtn {
-    top: 11px;
-  }
-  .el-dialog__headerbtn .el-dialog__close {
-    color: #fff;
-  }
+//   .digName .el-input__inner {
+//     margin-left: 15px;
+//     width: 160px;
+//     height: 32px;
+//     background: #ffffff;
+//     border: 1px solid #d7dae3;
+//     border-radius: 4px;
+//   }
+//   .digName1 {
+//     display: flex;
+//     margin-left: 31px;
+//     margin-bottom: 20px;
+//   }
 
-  .digName .el-input__inner {
-    margin-left: 15px;
-    width: 160px;
-    height: 32px;
-    background: #ffffff;
-    border: 1px solid #d7dae3;
-    border-radius: 4px;
-  }
-  .digName1 {
-    display: flex;
-    margin-left: 31px;
-    margin-bottom: 20px;
-  }
-
-  .digName1 .el-input__inner {
-    width: 464px;
-    height: 32px;
-    margin-left: 16px;
-    background: #ffffff;
-    border: 1px solid #d7dae3;
-    border-radius: 4px;
-  }
-  .digName3 .el-textarea__inner {
-    width: 455px;
-    height: 96px;
-    margin-left: 16px;
-    background: #ffffff;
-    border: 1px solid #d7dae3;
-    border-radius: 4px;
-  }
-  .digName2 {
-    display: flex;
-    margin-left: 31px;
-    margin-bottom: 20px;
-  }
-  .digName3 {
-    display: flex;
-    margin-left: 31px;
-    margin-bottom: 20px;
-  }
-  .digName2 .el-input__inner {
-    width: 500px;
-    height: 32px;
-    margin-left: 16px;
-    background: #ffffff;
-    border: 1px solid #d7dae3;
-    border-radius: 4px;
-  }
-}
+//   .digName1 .el-input__inner {
+//     width: 464px;
+//     height: 32px;
+//     margin-left: 16px;
+//     background: #ffffff;
+//     border: 1px solid #d7dae3;
+//     border-radius: 4px;
+//   }
+//   .digName3 .el-textarea__inner {
+//     width: 455px;
+//     height: 96px;
+//     margin-left: 16px;
+//     background: #ffffff;
+//     border: 1px solid #d7dae3;
+//     border-radius: 4px;
+//   }
+//   .digName2 {
+//     display: flex;
+//     margin-left: 31px;
+//     margin-bottom: 20px;
+//   }
+//   .digName3 {
+//     display: flex;
+//     margin-left: 31px;
+//     margin-bottom: 20px;
+//   }
+//   .digName2 .el-input__inner {
+//     width: 500px;
+//     height: 32px;
+//     margin-left: 16px;
+//     background: #ffffff;
+//     border: 1px solid #d7dae3;
+//     border-radius: 4px;
+//   }
+// }
 .digName {
   display: flex;
   justify-content: space-around;