From f09ca1e38a2e2d8024f11f77d885b916b89d98bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Tue, 30 Jan 2024 17:43:42 +0800
Subject: [PATCH 1/3] =?UTF-8?q?input=20=E5=85=A8=E5=B1=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/style.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/style.less b/src/style.less
index 45f7b8a..93472bc 100644
--- a/src/style.less
+++ b/src/style.less
@@ -355,7 +355,7 @@ body {
     border-radius: 0;
 
     &::placeholder {
-      color: #fff;
+      color: #ccc;
     }
   }
 
@@ -392,7 +392,7 @@ body {
   border-radius: 0;
   color: #fff;
   &::placeholder {
-    color: #fff;
+    color: #ccc;
   }
   &:focus {
     box-shadow: none;

From 4c0e48dd435f4f30c8380f0502b2f8ae48123d53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Tue, 30 Jan 2024 17:44:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=20system=20=E6=A8=A1=E5=9D=97=EF=BC=8Cquar?=
 =?UTF-8?q?tz=20job=20=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/JEasyCron/InputCron.vue |  38 ++--
 src/views/system/modules/QuartzJobModal.vue  | 214 +++++++++----------
 2 files changed, 125 insertions(+), 127 deletions(-)

diff --git a/src/components/jeecg/JEasyCron/InputCron.vue b/src/components/jeecg/JEasyCron/InputCron.vue
index 868d4b3..8dc8288 100644
--- a/src/components/jeecg/JEasyCron/InputCron.vue
+++ b/src/components/jeecg/JEasyCron/InputCron.vue
@@ -3,7 +3,7 @@
     <a-input :placeholder="placeholder" v-model="editCronValue" :disabled="disabled">
       <a slot="addonAfter" @click="showConfigDlg" class="config-btn" :disabled="disabled">
         <a-icon type="setting"></a-icon>
-        选择
+        Select
       </a>
     </a-input>
     <j-modal :visible.sync="show" title="Cron表达式" width="800px">
@@ -24,44 +24,44 @@ import EasyCron from './EasyCron.vue'
 
 export default {
   name: 'input-cron',
-  components: {EasyCron},
+  components: { EasyCron },
   model: {
     prop: 'cronValue',
-    event: 'change'
+    event: 'change',
   },
   props: {
     cronValue: {
       type: String,
-      default: ''
+      default: '',
     },
     width: {
       type: String,
-      default: '800px'
+      default: '800px',
     },
     placeholder: {
       type: String,
-      default: '请输入cron表达式'
+      default: '请输入cron表达式',
     },
     disabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
     exeStartTime: {
       type: [Number, String, Object],
-      default: 0
+      default: 0,
     },
     hideSecond: {
       type: Boolean,
-      default: false
+      default: false,
     },
     hideYear: {
       type: Boolean,
-      default: false
+      default: false,
     },
     remote: {
       type: Function,
-      default: null
-    }
+      default: null,
+    },
   },
   data() {
     return {
@@ -78,22 +78,20 @@ export default {
     },
     editCronValue(newVal, oldVal) {
       this.$emit('change', newVal)
-    }
+    },
   },
   methods: {
     showConfigDlg() {
       if (!this.disabled) {
         this.show = true
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style scoped>
-
-  .config-btn {
-    cursor: pointer;
-  }
-
+.config-btn {
+  cursor: pointer;
+}
 </style>
diff --git a/src/views/system/modules/QuartzJobModal.vue b/src/views/system/modules/QuartzJobModal.vue
index c27c6aa..d7600fb 100644
--- a/src/views/system/modules/QuartzJobModal.vue
+++ b/src/views/system/modules/QuartzJobModal.vue
@@ -6,27 +6,32 @@
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
-    okText="保存并安排任务"
-    cancelText="关闭">
-
+    okText="Save And Schedule Tasks"
+    cancelText="Close"
+  >
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-
-        <a-form-model-item :labelCol="labelCol"  :wrapperCol="wrapperCol" label="任务类名" prop="jobClassName" hasFeedback >
-          <a-input placeholder="请输入任务类名" v-model="model.jobClassName" />
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="Task Class Name"
+          prop="jobClassName"
+          hasFeedback
+        >
+          <a-input placeholder="Please enter a task class name" v-model="model.jobClassName" />
         </a-form-model-item>
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Cron表达式" prop="cronExpression">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Cron Expression" prop="cronExpression">
           <!-- <j-cron v-model="model.cronExpression"/>-->
           <j-easy-cron v-model="model.cronExpression" />
         </a-form-model-item>
-        <a-form-model-item  :labelCol="labelCol" :wrapperCol="wrapperCol" label="参数" prop="parameter" >
-          <a-textarea placeholder="请输入参数" :rows="5" v-model="model.parameter" />
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Arguments" prop="parameter">
+          <a-textarea placeholder="Please enter parameters" :rows="5" v-model="model.parameter" />
         </a-form-model-item>
-        <a-form-model-item :labelCol="labelCol"  :wrapperCol="wrapperCol" label="描述" prop="description">
-          <a-textarea placeholder="请输入描述" :rows="3" v-model="model.description" />
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Description" prop="description">
+          <a-textarea placeholder="Please enter a description" :rows="3" v-model="model.description" />
         </a-form-model-item>
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol"  label="状态" prop="status">
-          <j-dict-select-tag type="radioButton" v-model="model.status" dictCode="quartz_status"/>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="Status" prop="status">
+          <j-dict-select-tag type="radioButton" v-model="model.status" dictCode="quartz_status" />
         </a-form-model-item>
       </a-form-model>
     </a-spin>
@@ -34,108 +39,103 @@
 </template>
 
 <script>
-  import { httpAction } from '@/api/manage'
-  // import JCron from "@/components/jeecg/JCron";
-  import cronValidator from "@/components/jeecg/JEasyCron/validator";
+import { httpAction } from '@/api/manage'
+// import JCron from "@/components/jeecg/JCron";
+import cronValidator from '@/components/jeecg/JEasyCron/validator'
 
-  export default {
-    name: "QuartzJobModal",
-    components: {
-      // JCron,
-    },
-    data () {
-      return {
-        title:"操作",
-        buttonStyle: 'solid',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        cron: {
-          label: '',
-          value: ''
-        },
-        confirmLoading: false,
-        validatorRules: {
-          cronExpression: [
-            {required: true, message: '请输入cron表达式!'},
-            {validator: cronValidator,}
-          ],
-          jobClassName: [{required: true, message: '请输入任务类名!'}]
-        },
-        url: {
-          add: "/sys/quartzJob/add",
-          edit: "/sys/quartzJob/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add() {
-        // 统一设置默认值
-        this.edit({
-          cronExpression: '* * * * * ? *',
-          status: 0,
-        })
+export default {
+  name: 'QuartzJobModal',
+  components: {
+    // JCron,
+  },
+  data() {
+    return {
+      title: '操作',
+      buttonStyle: 'solid',
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
       },
-      edit (record) {
-        this.visible = true;
-        this.$nextTick(() => {
-          this.$refs.form.resetFields()
-          this.model = Object.assign({}, record)
-        })
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
       },
-      close () {
-        this.$emit('close');
-        this.visible = false;
+      cron: {
+        label: '',
+        value: '',
       },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate((ok, err) => {
-          if (ok) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-              method = 'put';
-            }
-
-            console.log('提交参数',this.model)
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-                that.close();
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-
-          }
-        })
+      confirmLoading: false,
+      validatorRules: {
+        cronExpression: [{ required: true, message: '请输入cron表达式!' }, { validator: cronValidator }],
+        jobClassName: [{ required: true, message: '请输入任务类名!' }],
       },
-      handleCancel () {
-        this.close()
+      url: {
+        add: '/sys/quartzJob/add',
+        edit: '/sys/quartzJob/edit',
       },
-
     }
-  }
+  },
+  created() {},
+  methods: {
+    add() {
+      // 统一设置默认值
+      this.edit({
+        cronExpression: '* * * * * ? *',
+        status: 0,
+      })
+    },
+    edit(record) {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.form.resetFields()
+        this.model = Object.assign({}, record)
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate((ok, err) => {
+        if (ok) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit
+            method = 'put'
+          }
+
+          console.log('提交参数', this.model)
+          httpAction(httpurl, this.model, method)
+            .then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+                that.close()
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+            })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+  },
+}
 </script>
 
 <style scoped>
-
 </style>
\ No newline at end of file

From 76e6916d33a851cb755ddbd4799c773edf981523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= <peiyu_ren@163.com>
Date: Wed, 31 Jan 2024 11:07:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80=20url?=
 =?UTF-8?q?=20=E8=B0=83=E6=95=B4=20Data=20Receive=20status=20Monitoring=20?=
 =?UTF-8?q?=E4=B8=AD=E5=9B=BE=E8=A1=A8=E6=8F=90=E7=A4=BA=E6=A1=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stationOperation/components/MapMarker.vue |  2 +-
 .../stationOperation/components/MapPane.vue   | 33 +++++++------------
 .../components/RealTimeDataChart.vue          |  2 +-
 src/views/stationOperation/index.vue          |  6 ++--
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue
index 7e6b4b3..609d52b 100644
--- a/src/views/stationOperation/components/MapMarker.vue
+++ b/src/views/stationOperation/components/MapMarker.vue
@@ -217,7 +217,7 @@ export default {
     // 获取站点详情
     async _getStationInfo(stationInfo) {
       try {
-        const { success, result, message } = await getAction('/armd-station-operation/stationOperation/findInfo', {
+        const { success, result, message } = await getAction('/stationOperation/findInfo', {
           stationId: stationInfo.stationId,
           type: stationInfo.stationType,
         })
diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue
index 0ba6525..584b094 100644
--- a/src/views/stationOperation/components/MapPane.vue
+++ b/src/views/stationOperation/components/MapPane.vue
@@ -579,7 +579,7 @@ export default {
           success,
           result: { GIS: markerList, table },
           message,
-        } = await postAction('/armd-station-operation/stationOperation/getHitEquList', {
+        } = await postAction('/stationOperation/getHitEquList', {
           radius: this.radius,
           stationIds,
         })
@@ -695,13 +695,10 @@ export default {
         try {
           const stationIds = this.dataStatusCheckedKeys.filter((key) => -1 == key.toString().indexOf('root_'))
           this.isSavingDataRecieveSettings = true
-          const { success, message } = await postAction(
-            '/armd-station-operation/sysUserFocusStation/saveUserFocusByUserId',
-            {
-              stationIds,
-              ...this.dataRecieveStatusModel,
-            }
-          )
+          const { success, message } = await postAction('/sysUserFocusStation/saveUserFocusByUserId', {
+            stationIds,
+            ...this.dataRecieveStatusModel,
+          })
           if (success) {
             this.$message.success('Save Success')
             await this.getDataRecieveSettings()
@@ -738,12 +735,9 @@ export default {
     // 获取数据接收状态配置
     async getDataRecieveSettings() {
       try {
-        const { success, result, message } = await getAction(
-          '/armd-station-operation/sysUserFocusStation/findUserFocusByUserId',
-          {
-            userId: this.$store.getters.userInfo.id,
-          }
-        )
+        const { success, result, message } = await getAction('/sysUserFocusStation/findUserFocusByUserId', {
+          userId: this.$store.getters.userInfo.id,
+        })
         if (success) {
           this.initialDataRecieveSettings = result
         } else {
@@ -774,13 +768,10 @@ export default {
       this.spinLoading = true
       try {
         this.isGettingStatusList = true
-        const { success, result, message } = await getAction(
-          '/armd-station-operation/stationOperation/getDataReceivingStatus',
-          {
-            userId: this.$store.getters.userInfo.id,
-            oneStationId: (this.stationInfo && this.stationInfo.stationId) || '',
-          }
-        )
+        const { success, result, message } = await getAction('/stationOperation/getDataReceivingStatus', {
+          userId: this.$store.getters.userInfo.id,
+          oneStationId: (this.stationInfo && this.stationInfo.stationId) || '',
+        })
         this.maskVisi = false
         this.spinLoading = false
         if (success) {
diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue
index aa3730e..075af92 100644
--- a/src/views/stationOperation/components/RealTimeDataChart.vue
+++ b/src/views/stationOperation/components/RealTimeDataChart.vue
@@ -74,7 +74,7 @@ const initialOption = {
       return `
         <div>${params.marker}${params.name}</div>
         <div>START：${dayjs(new Date(params.value[1])).format('YYYY-MM-DD HH:mm:ss')}</div>
-        <div>END：${dayjs(new Date(params.value[2])).format('YYYY-MM-DD HH:mm:ss')}</div>
+        <div style="white-space: pre">   END：${dayjs(new Date(params.value[2])).format('YYYY-MM-DD HH:mm:ss')}</div>
       `
     },
   },
diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue
index 350b90c..1767edb 100644
--- a/src/views/stationOperation/index.vue
+++ b/src/views/stationOperation/index.vue
@@ -253,7 +253,7 @@ export default {
     async getStationList() {
       try {
         this.isGettingDataList = true
-        const res = await getAction('/armd-station-operation/stationOperation/findList')
+        const res = await getAction('/stationOperation/findList')
         res.forEach((item) => {
           const { stationId, stationName, stationType } = item
           item._stationId = `${stationId}${stationName}${stationType}`
@@ -364,7 +364,7 @@ export default {
     async getFollowedStationList() {
       try {
         this.isGettingFollowedDataList = true
-        const res = await getAction('/armd-station-operation/sysUserFocusStation/findList')
+        const res = await getAction('/sysUserFocusStation/findList')
         this.followedDataList = res
 
         const scrollContainer2Ref = this.$refs.scrollContainer2Ref
@@ -383,7 +383,7 @@ export default {
     // 获取站点类型
     async getStationTypeList() {
       try {
-        const res = await getAction('/armd-station-operation/stationOperation/findStationType')
+        const res = await getAction('/stationOperation/findStationType')
         this.stationTypeList = res.filter((item) => item).map((item) => ({ label: item, value: item }))
       } catch (error) {
         console.error(error)