feat: add mj_action_power system config item

web/src/views/ImageMj.vue

@@ -506,7 +506,7 @@ const options = [
 ]
 
 const router = useRouter()
-const params = ref({
+const initParams = {
   task_type: "image",
   rate: rates[0].value,
   model: models[0].value,
@@ -520,7 +520,8 @@ const params = ref({
   neg_prompt: "",
   tile: false,
   quality: 0
-})
+}
+const params = ref(initParams)
 
 const imgList = ref([])
 
@@ -618,6 +619,15 @@ onUnmounted(() => {
   clipboard.value.destroy()
 })
 
+const mjPower = ref(1)
+const mjActionPower = ref(1)
+httpGet("/api/config/get?key=system").then(res => {
+  mjPower.value = res.data["mj_power"]
+  mjActionPower.value = res.data["mj_action_power"]
+}).catch(e => {
+  ElMessage.error("获取系统配置失败：" + e.message)
+})
+
 // 获取运行中的任务
 const fetchRunningJobs = () => {
   httpGet(`/api/mj/jobs?status=0`).then(res => {
@@ -632,7 +642,11 @@ const fetchRunningJobs = () => {
           type: 'error',
           duration: 0,
         })
-        power.value += 1
+        if (jobs[i].type === 'image') {
+          power.value += mjPower.value
+        } else {
+          power.value += mjActionPower.value
+        }
         continue
       }
       _jobs.push(jobs[i])
@@ -749,7 +763,8 @@ const generate = () => {
   params.value.img_arr = imgList.value
   httpPost("/api/mj/image", params.value).then(() => {
     ElMessage.success("绘画任务推送成功，请耐心等待任务执行...")
-    power.value -= 1
+    power.value -= mjPower.value
+    params.value = initParams
   }).catch(e => {
     ElMessage.error("任务推送失败：" + e.message)
   })
@@ -775,7 +790,7 @@ const send = (url, index, item) => {
     prompt: item.prompt,
   }).then(() => {
     ElMessage.success("任务推送成功，请耐心等待任务执行...")
-    power.value -= 1
+    power.value -= mjActionPower.value
   }).catch(e => {
     ElMessage.error("任务推送失败：" + e.message)
   })

web/src/views/admin/SysConfig.vue

@@ -44,8 +44,39 @@
                 </div>
               </div>
             </el-form-item>
-            <el-form-item label="MidJourney算力" prop="mj_power">
-              <el-input v-model.number="system['mj_power']" placeholder="使用MidJourney画一张图消耗算力"/>
+            <el-form-item label="MJ绘图算力" prop="mj_power">
+              <div class="tip-input">
+                <el-input v-model.number="system['mj_power']" placeholder=""/>
+                <div class="info">
+                  <el-tooltip
+                      effect="dark"
+                      content="使用MidJourney画一张图消耗算力"
+                      raw-content
+                      placement="right"
+                  >
+                    <el-icon>
+                      <InfoFilled/>
+                    </el-icon>
+                  </el-tooltip>
+                </div>
+              </div>
+            </el-form-item>
+            <el-form-item label="MJ操作算力" prop="mj_action_power">
+              <div class="tip-input">
+                <el-input v-model.number="system['mj_action_power']" placeholder=""/>
+                <div class="info">
+                  <el-tooltip
+                      effect="dark"
+                      content="放大，变换，重绘操作一次消耗的算力"
+                      raw-content
+                      placement="right"
+                  >
+                    <el-icon>
+                      <InfoFilled/>
+                    </el-icon>
+                  </el-tooltip>
+                </div>
+              </div>
             </el-form-item>
             <el-form-item label="Stable-Diffusion算力" prop="sd_power">
               <el-input v-model.number="system['sd_power']" placeholder="使用Stable-Diffusion画一张图消耗算力"/>

web/src/views/mobile/ImageMj.vue

@@ -91,7 +91,7 @@
 
         <div class="text-line">
           <van-button round block type="primary" native-type="submit">
-            <van-tag type="success">可用额度:{{ imgCalls }}</van-tag>
+            <van-tag type="success">可用算力额度:{{ power }}</van-tag>
             立即生成
           </van-button>
         </div>
@@ -253,16 +253,16 @@ const params = ref({
   tile: false,
   quality: 0
 })
-const imgCalls = ref(0)
 const userId = ref(0)
 const router = useRouter()
 const runningJobs = ref([])
 const finishedJobs = ref([])
 const socket = ref(null)
+const power = ref(0)
 
 onMounted(() => {
   checkSession().then(user => {
-    imgCalls.value = user['img_calls']
+    power.value = user['power']
     userId.value = user.id
 
     fetchRunningJobs()
@@ -278,6 +278,15 @@ onUnmounted(() => {
   socket.value = null
 })
 
+const mjPower = ref(1)
+const mjActionPower = ref(1)
+httpGet("/api/config/get?key=system").then(res => {
+  mjPower.value = res.data["mj_power"]
+  mjActionPower.value = res.data["mj_action_power"]
+}).catch(e => {
+  ElMessage.error("获取系统配置失败：" + e.message)
+})
+
 const heartbeatHandle = ref(null)
 const connect = () => {
   let host = process.env.VUE_APP_WS_HOST
@@ -335,7 +344,11 @@ const fetchRunningJobs = (userId) => {
           message: `任务执行失败：${jobs[i]['err_msg']}`,
           type: 'danger',
         })
-        imgCalls.value += 1
+        if (jobs[i].type === 'image') {
+          power.value += mjPower.value
+        } else {
+          power.value += mjActionPower.value
+        }
         continue
       }
       _jobs.push(jobs[i])
@@ -437,7 +450,7 @@ const send = (url, index, item) => {
     prompt: item.prompt,
   }).then(() => {
     ElMessage.success("任务推送成功，请耐心等待任务执行...")
-    imgCalls.value -= 1
+    power.value -= mjActionPower.value
   }).catch(e => {
     ElMessage.error("任务推送失败：" + e.message)
   })
@@ -464,7 +477,7 @@ const generate = () => {
   params.value.img_arr = imgList.value.map(img => img.url)
   httpPost("/api/mj/image", params.value).then(() => {
     showToast("绘画任务推送成功，请耐心等待任务执行")
-    imgCalls.value -= 1
+    power.value -= mjPower.value
   }).catch(e => {
     showFailToast("任务推送失败：" + e.message)
   })