Browse Source

问题修改

SunZehao 7 months ago
parent
commit
caf60cfa13

+ 2 - 0
src/views/Login/components/LoginForm.vue

@@ -261,6 +261,8 @@ const handleLogin = async (params) => {
     const powerRes = await getAppInfo({
       appName: 'powerjob-worker-sample',
       password: '123456'
+      // appName: loginData.loginForm.username,
+      // password: loginData.loginForm.password
     })
     window.localStorage.setItem('powerAppId', powerRes.data)
     loading.value = ElLoading.service({

+ 1 - 1
src/views/calculationAnalysis/calculationManagement/WorkflowEditor.vue

@@ -143,7 +143,7 @@
                   <img
                     class="job-panl-icon"
                     v-if="nodeInfo.skipWhenFailed"
-                    src="../../assets/skip.svg"
+                    :src="skipsvg"
                     height="18"
                     width="18"
                     alt

+ 0 - 92
src/views/calculationAnalysis/taskManagement/common/DailyTimeIntervalForm.vue

@@ -1,92 +0,0 @@
-<template>
-  <div>
-    <el-form ref="form" :model="dailyTimeIntervalExpress">
-      <el-form-item :label="$t('message.interval')">
-          <el-col :span="6">
-              <el-input v-model="dailyTimeIntervalExpress.interval"></el-input>
-          </el-col>
-      </el-form-item>
-
-      <el-form-item :label="$t('message.timeRange')">
-        <el-col :span="6">
-          <el-time-picker
-              v-model="dailyTimeIntervalExpress.startTimeOfDay"
-              :placeholder="$t('message.startTime')"
-              value-format="HH:mm:ss"
-              :picker-options="{
-                  format:'HH:mm:ss'
-              }"
-          >
-          </el-time-picker>
-        </el-col>
-        <el-col class="line" :span="2">-</el-col>
-        <el-col :span="6">
-          <el-time-picker
-              v-model="dailyTimeIntervalExpress.endTimeOfDay"
-              :placeholder="$t('message.endTime')"
-              value-format="HH:mm:ss"
-              :picker-options="{
-                  format:'HH:mm:ss'
-              }"
-          >
-          </el-time-picker>
-        </el-col>
-      </el-form-item>
-
-        <el-form-item :label="$t('message.weekRange')">
-            <el-checkbox-group v-model="dailyTimeIntervalExpress.daysOfWeek">
-                <el-checkbox v-for="c in weekDaysConstant" :label="c.key" :key="c.key">{{c.label}}</el-checkbox>
-            </el-checkbox-group>
-        </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit">{{$t('message.save')}}</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "DailyTimeIntervalForm",
-  // 数据传递
-  props: ["timeExpression"],
-  data() {
-    return {
-      dailyTimeIntervalExpress: {
-        interval: undefined,
-        startTimeOfDay: undefined,
-        endTimeOfDay: undefined,
-        intervalUnit: 'SECONDS',
-        daysOfWeek: []
-      },
-      weekDaysConstant: [
-          {key:1, label:'Monday'},
-          {key:2, label:'Tuesday'},
-          {key:3, label:'Wednesday'},
-          {key:4, label:'Thursday'},
-          {key:5, label:'Friday'},
-          {key:6, label:'Saturday'},
-          {key:7, label:'Sunday'},
-      ]
-    }
-  },
-  methods: {
-    onSubmit() {
-      //使用 $emit派发事件
-      this.$emit("contentChanged", JSON.stringify(this.dailyTimeIntervalExpress));
-    }
-  }
-  ,mounted() {
-      console.log("dailyTimeIntervalExpress:" + this.timeExpression);
-      if (this.timeExpression !== undefined && this.timeExpression !== null) {
-          this.dailyTimeIntervalExpress = JSON.parse(this.timeExpression);
-      }
-
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

+ 0 - 39
src/views/calculationAnalysis/taskManagement/common/TimeExpressionValidator.vue

@@ -1,39 +0,0 @@
-<template>
-    <div>
-        <el-card class="box-card">
-            <div v-for="res in nextNTriggerTime" :key="res" class="text item">
-                {{ res }}
-            </div>
-        </el-card>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "TimeExpressionValidator",
-        // 数据传递
-        props: ["timeExpressionType", "timeExpression"],
-        data() {
-            return {
-                nextNTriggerTime: [],
-            }
-        },
-        methods: {
-            checkTimeExpression() {
-                let that = this;
-                let url = "/validate/timeExpression?timeExpressionType=" + this.timeExpressionType + "&timeExpression=" + this.timeExpression;
-                this.axios.get(url).then(res => that.nextNTriggerTime = res);
-            }
-        },mounted() {
-            console.log("type:" + this.timeExpressionType);
-            console.log("expression:" + this.timeExpression);
-            this.timeExpression = encodeURIComponent(this.timeExpression);
-            console.log("expressionAfterEncodeURIComponent: " + this.timeExpression);
-            this.checkTimeExpression();
-        }
-    }
-</script>
-
-<style scoped>
-
-</style>