漏缆任务轮询corn弹窗 及打印

src/views/alarm/cableTime/index.vue

@@ -16,130 +16,145 @@
         <el-button type="primary" @click="refresh">刷新</el-button>
         <el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
         <el-button type="primary" @click="exportList">导出</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-right"
+          v-print="printoption"
+          >打印</el-button
+        >
       </div>
     </div>
     <div v-show="isQuery">
       <search ref="reset" @search="search" />
     </div>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      :cell-class-name="cellClassFn"
-      :header-cell-style="{ background: '#EAF1FE', color: '#666666' }"
-    >
-      <el-table-column type="index" label="序列号" width="100" align="center" />
-      <el-table-column
-        prop="siteName"
-        label="基站名称"
-        width="180"
-        align="center"
-      />
-      <el-table-column
-        prop="alarmTarget"
-        label="告警对象"
-        width="180"
-        align="center"
-      />
-      <el-table-column
-        prop="alarmType"
-        label="告警类型"
-        width="150"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <div>{{ alarmType[scope.row.alarmType] }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="alarmLevelName"
-        label="告警级别"
-        width="150"
-        align="center"
-      />
-      <el-table-column prop="alarmInfo" label="告警内容" align="center">
-        <template slot-scope="scope">
-          <div
-            v-for="(item, index) in scope.row.alarmInfo"
-            :key="index"
-            :class="levelStyle[item.level]"
+    <div id="print">
+      <div class="table">
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          :cell-class-name="cellClassFn"
+          :header-cell-style="{ background: '#EAF1FE', color: '#666666' }"
+        >
+          <el-table-column
+            type="index"
+            label="序列号"
+            width="100"
+            align="center"
+          />
+          <el-table-column
+            prop="siteName"
+            label="基站名称"
+            width="180"
+            align="center"
+          />
+          <el-table-column
+            prop="alarmTarget"
+            label="告警对象"
+            width="180"
+            align="center"
+          />
+          <el-table-column
+            prop="alarmType"
+            label="告警类型"
+            width="150"
+            align="center"
           >
-            <span>距离：{{ item.distance }}</span
-            >&nbsp;&nbsp;
-            <span>驻波比：{{ item.value }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="alarmThreshold"
-        label="告警触发值"
-        width="150"
-        align="center"
-      >
-        <!-- <template slot-scope="scope">
+            <template slot-scope="scope">
+              <div>{{ alarmType[scope.row.alarmType] }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="alarmLevelName"
+            label="告警级别"
+            width="150"
+            align="center"
+          />
+          <el-table-column prop="alarmInfo" label="告警内容" align="center">
+            <template slot-scope="scope">
+              <div
+                v-for="(item, index) in scope.row.alarmInfo"
+                :key="index"
+                :class="levelStyle[item.level]"
+              >
+                <span>距离：{{ item.distance }}</span
+                >&nbsp;&nbsp;
+                <span>驻波比：{{ item.value }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="alarmThreshold"
+            label="告警触发值"
+            width="150"
+            align="center"
+          >
+            <!-- <template slot-scope="scope">
           <div>
             {{ getAlarmLevelMenu(scope.row) }}
           </div>
         </template> -->
-      </el-table-column>
-      <el-table-column
-        prop="lateUploadTime"
-        label="告警发生时间"
-        align="center"
-        width="200"
-      />
-      <!-- <el-table-column
+          </el-table-column>
+          <el-table-column
+            prop="lateUploadTime"
+            label="告警发生时间"
+            align="center"
+            width="200"
+          />
+          <!-- <el-table-column
         prop="statusTimeChange"
         label="状态变化时间"
         align="center"
         width="200"
       /> -->
-      <el-table-column
-        v-if="confirmStatus == 1"
-        prop="confirmPerson"
-        label="确认人"
-        width="100"
-        align="center"
-      />
-      <el-table-column
-        v-if="confirmStatus == 1"
-        prop="confirmTime"
-        label="确认时间"
-        width="180"
-        align="center"
-      />
-      <el-table-column
-        v-if="confirmStatus == 2"
-        prop="statusTimeChange"
-        label="告警消除时间"
-        align="center"
-        width="200"
-      />
-      <el-table-column label="操作" align="center" width="100">
-        <template slot-scope="scope">
-          <el-button
-            v-if="
-              scope.row.confirmStatus === 1 &&
-              scope.row.alarmLevelName == '正常'
-            "
-            type="text"
-            @click="cancelAlarm(scope.row)"
-            >取消</el-button
-          >
-          <el-button
-            v-else-if="scope.row.confirmStatus === 0"
-            type="text"
-            @click="confirmAlarm(scope.row)"
-            >确认</el-button
-          >
-          <el-button
-            v-if="scope.row.confirmStatus == 1"
-            type="text"
-            @click="eliminate(scope.row)"
-            >消除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+          <el-table-column
+            v-if="confirmStatus == 1"
+            prop="confirmPerson"
+            label="确认人"
+            width="100"
+            align="center"
+          />
+          <el-table-column
+            v-if="confirmStatus == 1"
+            prop="confirmTime"
+            label="确认时间"
+            width="180"
+            align="center"
+          />
+          <el-table-column
+            v-if="confirmStatus == 2"
+            prop="statusTimeChange"
+            label="告警消除时间"
+            align="center"
+            width="200"
+          />
+          <el-table-column label="操作" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button
+                v-if="
+                  scope.row.confirmStatus === 1 &&
+                  scope.row.alarmLevelName == '正常'
+                "
+                type="text"
+                @click="cancelAlarm(scope.row)"
+                >取消</el-button
+              >
+              <el-button
+                v-else-if="scope.row.confirmStatus === 0"
+                type="text"
+                @click="confirmAlarm(scope.row)"
+                >确认</el-button
+              >
+              <el-button
+                v-if="scope.row.confirmStatus == 1"
+                type="text"
+                @click="eliminate(scope.row)"
+                >消除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
     <el-dialog
       title="告警详情"
       :visible.sync="centerDialogVisible"
@@ -220,6 +235,17 @@ export default {
   components: { search },
   data() {
     return {
+      printoption: {
+        id: "print",
+        popTitle: "&nbsp;", // 打印配置页上方的标题
+        extraHead: "", // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+        preview: false, // 是否启动预览模式，默认是false
+        //previewTitle: '预览的标题', // 打印预览的标题
+        //previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
+        zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
+        standard: "",
+        extraCss: "./index.css",
+      },
       alarmType,
       confirmStatus: 0,
       dialogInfo: [],
@@ -260,7 +286,7 @@ export default {
     //   let num = "";
     //   if (e.alarmInfo && e.alarmInfo.length > 0) {
     //     num = e.alarmInfo.find((item) => item.level == e.alarmLevel).value;
-        
+
     //   } else {
     //     num = e.alarmLevel == 0 ? "1.5" : e.alarmLevel == 1 ? "1.8" : "2.0";
     //   }
@@ -474,4 +500,22 @@ export default {
     }
   }
 }
+#print {
+  .table {
+    // width: 100%;
+    ::v-deep .el-table {
+      height: 100%;
+    }
+    ::v-deep table {
+      table-layout: auto;
+    }
+    ::v-deep .el-table__header-wrapper .el-table__header {
+      width: 100% !important;
+      background: #f89850 !important;
+    }
+    ::v-deep .el-table__body-wrapper .el-table__body {
+      width: 100% !important;
+    }
+  }
+}
 </style>

src/views/alarm/statistics/index.vue

@@ -208,7 +208,7 @@ export default {
         //previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
         zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
         standard: "",
-        extraCss: "./index.css",
+        // extraCss: "./index.css",
       },
       form: {},
       params: {

src/views/jobgroup/jobinfo/index.vue

@@ -238,96 +238,403 @@
           <el-popover
             placement="bottom"
             width="448"
-            trigger="hover"
+            trigger="click"
             v-model="visible"
           >
             <el-tabs v-model="activeName" type="card">
               <el-tab-pane label="秒" name="1">
-                <pre>
-输入内容为【秒 分 时 日 月 周 年】中间空格隔开
-如【* * * * * ? 2016-2017】为 
-2016-2017年的所有日期的每秒都执行一次
-
-1. 每秒 【*】允许的通配符[, - * /]
-例：【* * * * * ? 2016-2017】
-2. 周期 从1-2秒为 【1-2】  
-例：【1-2 * * * * ? 2016-2017】
-3. 从1秒开始 每2秒执行一次 【1/2】
-例：【1/2 * * * * ? 2016-2017】
-4. 指定 如 0s 1s 3s执行为：【0,1,3】 可选值为0-59
-例：【0,1,3 * * * * ? 2016-2017】
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[0].key"
+                  @input="cornInput[0].data = []"
+                >
+                  <el-radio label="*">每时</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                  <el-radio label="jg">从x时开始，每y小时执行一次</el-radio>
+                  <el-radio label="zd">指定</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[0].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[0].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[0].value =
+                        cornInput[0].data[0] + '-' + cornInput[0].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[0].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[0].value =
+                        cornInput[0].data[0] + '-' + cornInput[0].data[1]
+                    "
+                  ></el-input>
+                </div>
+                <div
+                  v-if="cornInput[0].key == 'jg'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[0].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[0].value =
+                        cornInput[0].data[0] + '/' + cornInput[0].data[1]
+                    "
+                  ></el-input>
+                  开始，每<el-input
+                    v-model="cornInput[0].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[0].value =
+                        cornInput[0].data[0] + '/' + cornInput[0].data[1]
+                    "
+                  ></el-input
+                  >执行一次
+                </div>
+                <div v-if="cornInput[0].key == 'zd'">
+                  <el-checkbox-group v-model="cornInput[0].data">
+                    <el-checkbox
+                      v-for="item in 60"
+                      :label="item - 1"
+                      :key="item"
+                      >{{ item - 1 }}</el-checkbox
+                    >
+                  </el-checkbox-group>
+                </div>
               </el-tab-pane>
               <el-tab-pane label="分钟" name="2">
-                <pre>
-
-1. 每分钟 【*】允许的通配符[, - * /]
-2. 周期 从1-2分钟为 【1-2】
-3. 从1分钟开始 每2分钟执行一次 【1/2】
-4. 指定 如 0分钟 1分钟 3分钟执行为：【0,1,3】 可选值为0-59
-
-例见秒的说明
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[1].key"
+                  @input="cornInput[1].data = []"
+                >
+                  <el-radio label="*">每时</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                  <el-radio label="jg">从x时开始，每y小时执行一次</el-radio>
+                  <el-radio label="zd">指定</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[1].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[1].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[1].value =
+                        cornInput[1].data[0] + '-' + cornInput[1].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[1].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[1].value =
+                        cornInput[1].data[0] + '-' + cornInput[1].data[1]
+                    "
+                  ></el-input>
+                </div>
+                <div
+                  v-if="cornInput[1].key == 'jg'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[1].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[1].value =
+                        cornInput[1].data[0] + '/' + cornInput[1].data[1]
+                    "
+                  ></el-input>
+                  开始，每<el-input
+                    v-model="cornInput[1].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[1].value =
+                        cornInput[1].data[0] + '/' + cornInput[1].data[1]
+                    "
+                  ></el-input
+                  >执行一次
+                </div>
+                <div v-if="cornInput[1].key == 'zd'">
+                  <el-checkbox-group v-model="cornInput[1].data">
+                    <el-checkbox
+                      v-for="item in 60"
+                      :label="item - 1"
+                      :key="item"
+                      >{{ item - 1 }}</el-checkbox
+                    >
+                  </el-checkbox-group>
+                </div>
               </el-tab-pane>
               <el-tab-pane label="小时" name="3">
-                <pre>
-
-1. 每秒小时 【*】允许的通配符[, - * /]
-2. 周期 从1-2天为 【1-2】
-3. 从1小时开始 每2小时执行一次 【1/2】
-4. 指定 如 0小时 1小时 3小时执行为：【0,1,3】 可选值为0-23
-
-例见秒的说明
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[2].key"
+                  @input="cornInput[2].data = []"
+                >
+                  <el-radio label="*">每时</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                  <el-radio label="jg">从x时开始，每y小时执行一次</el-radio>
+                  <el-radio label="zd">指定</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[2].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[2].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[2].value =
+                        cornInput[2].data[0] + '-' + cornInput[2].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[2].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[2].value =
+                        cornInput[2].data[0] + '-' + cornInput[2].data[1]
+                    "
+                  ></el-input>
+                </div>
+                <div
+                  v-if="cornInput[2].key == 'jg'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[2].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[2].value =
+                        cornInput[2].data[0] + '/' + cornInput[2].data[1]
+                    "
+                  ></el-input>
+                  开始，每<el-input
+                    v-model="cornInput[2].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入时"
+                    @input="
+                      cornInput[2].value =
+                        cornInput[2].data[0] + '/' + cornInput[2].data[1]
+                    "
+                  ></el-input
+                  >执行一次
+                </div>
+                <div v-if="cornInput[2].key == 'zd'">
+                  <el-checkbox-group v-model="cornInput[2].data">
+                    <el-checkbox
+                      v-for="item in 24"
+                      :label="item - 1"
+                      :key="item"
+                      >{{ item - 1 }}</el-checkbox
+                    >
+                  </el-checkbox-group>
+                </div>
               </el-tab-pane>
               <el-tab-pane label="日" name="4">
-                <pre>
-
-1. 每天 【*】允许的通配符[, - * / L W]
-2. 不指定【?】
-例：【* * * ? * ? 2016-2017】
-3. 周期 从1-2日为 【1-2】
-4. 从1日开始 每1日执行一次 【1/1】
-5. 每月1号最近的那个工作日 【1W】
-例：【* * * 1W * ? 2016-2017】
-6. 本月最后一天 【L】
-例：【* * * L * ? 2016-2017】
-6. 指定 如 1号、2号、3号执行为：【1,2,3】可选值为1-31
-
-其他例见秒的说明
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[3].key"
+                  @input="cornInput[3].data = []"
+                >
+                  <el-radio label="?">不指定</el-radio>
+                  <el-radio label="*">每月</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                  <el-radio label="1W">每月1号最近的那个工作日</el-radio>
+                  <el-radio label="L">本月最后一天</el-radio>
+                  <el-radio label="zd">指定</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[3].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[3].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入年份"
+                    @input="
+                      cornInput[3].value =
+                        cornInput[3].data[0] + '-' + cornInput[3].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[3].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入年份"
+                    @input="
+                      cornInput[3].value =
+                        cornInput[3].data[0] + '-' + cornInput[3].data[1]
+                    "
+                  ></el-input>
+                </div>
+                <div
+                  v-if="cornInput[3].key == '1W'"
+                  style="display: flex; align-items: center"
+                >
+                  每月<el-input
+                    v-model="cornInput[3].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入日"
+                    @input="cornInput[3].value = cornInput[3].data[0] + 'W'"
+                  ></el-input
+                  >号最近的那个工作日
+                </div>
+                <div v-if="cornInput[3].key == 'zd'">
+                  <el-checkbox-group v-model="cornInput[3].data">
+                    <el-checkbox v-for="item in 31" :label="item" :key="item"
+                      >{{ item }}号</el-checkbox
+                    >
+                  </el-checkbox-group>
+                </div>
               </el-tab-pane>
               <el-tab-pane label="月" name="5">
-                <pre>
-1. 每月 【*】允许的通配符[, - * /]
-2. 不指定【?】
-3. 周期 从1-2月为 【1-2】
-4. 从1月开始 每2月执行一次 【1/2】
-5. 指定 如 1月、2月、3月执行为：【1,2,3】可选值为1-12
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[4].key"
+                  @input="cornInput[4].data = []"
+                >
+                  <el-radio label="?">不指定</el-radio>
+                  <el-radio label="*">每月</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                  <el-radio label="zd">指定</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[4].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[4].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入月"
+                    @input="
+                      cornInput[4].value =
+                        cornInput[4].data[0] + '-' + cornInput[4].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[4].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入月"
+                    @input="
+                      cornInput[4].value =
+                        cornInput[4].data[0] + '-' + cornInput[4].data[1]
+                    "
+                  ></el-input>
+                </div>
+                <div v-if="cornInput[4].key == 'zd'">
+                  <el-checkbox-group v-model="cornInput[4].data">
+                    <el-checkbox label="1">1月</el-checkbox>
+                    <el-checkbox label="2">2月</el-checkbox>
+                    <el-checkbox label="3">3月</el-checkbox>
+                    <el-checkbox label="4">4月</el-checkbox>
+                    <el-checkbox label="5">5月</el-checkbox>
+                    <el-checkbox label="6">6月</el-checkbox>
+                    <el-checkbox label="7">7月</el-checkbox>
+                    <el-checkbox label="8">8月</el-checkbox>
+                    <el-checkbox label="9">9月</el-checkbox>
+                    <el-checkbox label="10">10月</el-checkbox>
+                    <el-checkbox label="11">11月</el-checkbox>
+                    <el-checkbox label="12">12月</el-checkbox>
+                  </el-checkbox-group>
+                </div>
               </el-tab-pane>
               <el-tab-pane label="周" name="6">
-                <pre>
-1. 每周 【*】允许的通配符[, - * / L #]
-2. 不指定【?】
-3. 周期 从星期一到星期二为 【1-2】
-4. 从1周开始的星期一 【1/2】
-5. 本月最后一个星期 【L】
-6. 指定 如 周一、周二、周三执行为：【1,2,3】可选值为1-7
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[5].key"
+                  @input="cornInput[5].data = []"
+                >
+                  <el-radio label="?">不指定</el-radio>
+                  <el-radio label="*">每周</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                  <el-radio label="L">本月最后一个星期</el-radio>
+                  <el-radio label="zd">指定</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[5].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[5].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入年份"
+                    @input="
+                      cornInput[5].value =
+                        cornInput[5].data[0] + '-' + cornInput[5].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[5].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入年份"
+                    @input="
+                      cornInput[5].value =
+                        cornInput[5].data[0] + '-' + cornInput[5].data[1]
+                    "
+                  ></el-input>
+                </div>
+                <div v-if="cornInput[5].key == 'zd'">
+                  <el-checkbox-group v-model="cornInput[5].data">
+                    <el-checkbox label="1">周一</el-checkbox>
+                    <el-checkbox label="2">周二</el-checkbox>
+                    <el-checkbox label="3">周三</el-checkbox>
+                    <el-checkbox label="4">周四</el-checkbox>
+                    <el-checkbox label="5">周五</el-checkbox>
+                    <el-checkbox label="6">周六</el-checkbox>
+                    <el-checkbox label="7">周日</el-checkbox>
+                  </el-checkbox-group>
+                </div>
               </el-tab-pane>
               <el-tab-pane label="年" name="7">
-                <pre>
-1. 不指定 【?】
-2. 每年 【*】
-3. 周期从2016-2017年 【2016-2017】
-                </pre>
+                <el-radio-group
+                  v-model="cornInput[6].key"
+                  @input="cornInput[6].data = []"
+                >
+                  <el-radio label="?">不指定</el-radio>
+                  <el-radio label="*">每年</el-radio>
+                  <el-radio label="zq">周期</el-radio>
+                </el-radio-group>
+                <div
+                  v-if="cornInput[6].key == 'zq'"
+                  style="display: flex; align-items: center"
+                >
+                  从<el-input
+                    v-model="cornInput[6].data[0]"
+                    style="width: 100px"
+                    placeholder="请输入年份"
+                    @input="
+                      cornInput[6].value =
+                        cornInput[6].data[0] + '-' + cornInput[6].data[1]
+                    "
+                  ></el-input>
+                  始到<el-input
+                    v-model="cornInput[6].data[1]"
+                    style="width: 100px"
+                    placeholder="请输入年份"
+                    @input="
+                      cornInput[6].value =
+                        cornInput[6].data[0] + '-' + cornInput[6].data[1]
+                    "
+                  ></el-input>
+                </div>
               </el-tab-pane>
             </el-tabs>
             <el-input
               slot="reference"
               placeholder="请输入 CRON"
-              v-model="addFrom.scheduleConf"
+              v-model="scheduleConf"
             >
               <i
                 slot="suffix"
@@ -374,8 +681,7 @@
             >
             </el-option>
           </el-select>
-          <div>
-          </div>
+          <div></div>
           <el-checkbox-group
             v-model="addFrom.executorParam.params"
             :min="1"
@@ -383,7 +689,7 @@
           >
             <el-checkbox
               v-for="city in itemOptions"
-              :disabled="city=='轮询标识'"
+              :disabled="city == '轮询标识'"
               :label="city"
               :key="city"
               >{{ city }}</el-checkbox
@@ -488,6 +794,25 @@ import {
 import { monitorEquiplist } from "../../setting/api.js";
 import { successAlert, warningAlert } from "@/utils/alert";
 export default {
+  computed: {
+    scheduleConf() {
+      let arr = this.cornInput;
+      let str = [];
+      console.log("更改了", arr);
+      arr.forEach((item, index) => {
+        if (["*", "?", "L"].includes(item.key)) {
+          str[index] = item.key;
+        } else if (item.key === "zq") {
+          str[index] = item.value;
+        } else if (item.key === "zd") {
+          str[index] = item.data.toString();
+        } else {
+          str[index] = item.value;
+        }
+      });
+      return str.join(" ");
+    },
+  },
   data() {
     var validatePass2 = (rule, value, callback) => {
       console.log("value", value);
@@ -501,15 +826,24 @@ export default {
       }
     };
     return {
+      cornInput: [
+        { key: "*", value: "", data: [] },
+        { key: "*", value: "", data: [] },
+        { key: "*", value: "", data: [] },
+        { key: "*", value: "", data: [] },
+        { key: "*", value: "", data: [] },
+        { key: "*", value: "", data: [] },
+        { key: "*", value: "", data: [] },
+      ],
       rules: {
         jobGroup: [
           { required: true, message: "请选择执行器", trigger: "blur" },
         ],
         jobDesc: [{ required: true, message: "请填写描述", trigger: "blur" }],
         author: [{ required: true, message: "请填写负责人", trigger: "blur" }],
-        scheduleConf: [
-          { required: true, message: "请填写CRON", trigger: "blur" },
-        ],
+        // scheduleConf: [
+        //   { required: true, message: "请填写CRON", trigger: "blur" },
+        // ],
         executorParam: [
           { validator: validatePass2, required: true, trigger: "blur" },
         ],
@@ -680,7 +1014,7 @@ export default {
         executorFailRetryCount: "0",
         executorParam: {
           equipId: "",
-          params: ['轮询标识'],
+          params: ["轮询标识"],
         },
       },
       params: {
@@ -761,6 +1095,7 @@ export default {
       if (!datas.childJobId) {
         delete datas.childJobId;
       }
+      datas.scheduleConf = this.scheduleConf
       let data = {
         ...datas,
       };
@@ -1056,4 +1391,7 @@ export default {
     width: 100%;
   }
 }
+.el-radio {
+  display: block;
+}
 </style>
\ No newline at end of file

vue.config.js

@@ -9,8 +9,8 @@ function resolve(dir) {
 const name = defaultSettings.title || '漏缆故障定位监测系统' // page title
 const port = process.env.port || process.env.npm_config_port || 8890 // dev port
 // const href = 'http://101.126.159.207'
-// const href = 'http://127.0.0.1'
-const href = 'http://192.168.0.114'
+const href = 'http://127.0.0.1'
+// const href = 'http://192.168.0.165'
 
 const rewriteDefaultConfig = {
   changeOrigin: true,