ZaiZai 1 рік тому
батько
коміт
5bb5571e89
4 змінених файлів з 106 додано та 6 видалено
  1. 2 2
      package.json
  2. 2 2
      src/config/index.json
  3. 10 1
      src/views/tasks/message.vue
  4. 92 1
      yarn.lock

+ 2 - 2
package.json

@@ -29,7 +29,7 @@
         "nprogress": "^0.2.0",
         "pinia": "^2.1.7",
         "split.js": "^1.6.5",
-        "vue": "3.4.30",
+        "vue": "3.4.31",
         "vue-router": "^4.4.0",
         "vuedraggable": "^4.1.0"
     },
@@ -39,7 +39,7 @@
         "@unocss/eslint-config": "0.58.2",
         "@unocss/eslint-plugin": "0.58.2",
         "@vitejs/plugin-vue": "^4.5.2",
-        "@vue/compiler-sfc": "^3.4.30",
+        "@vue/compiler-sfc": "^3.4.31",
         "archiver": "^7.0.1",
         "bignumber.js": "^9.1.2",
         "eslint": "^8.56.0",

+ 2 - 2
src/config/index.json

@@ -1,9 +1,9 @@
 {
     "version": "20230607160059",
     "target1": "http://127.0.0.1:8090",
-    "target": "http://192.168.0.125:8090",
+    "target2": "http://192.168.0.125:8090",
     "target3": "http://39.108.216.210:8090",
-    "target4": "http://192.168.0.109:8090",
+    "target": "http://192.168.0.109:8090",
     "smsPhone": "",
     "vite": {
         "port": 5180,

+ 10 - 1
src/views/tasks/message.vue

@@ -212,7 +212,16 @@ const batchReadApi = async (id) => {
 const delClick = () => {
     const rows = tableCheckedKeys.value
     if (rows.length <= 0) {
-        window.$message.warning('请先勾选要删除的数据')
+        window.$message.warning('请先勾选要删除的已读消息')
+        return
+    }
+    //判断是否满足条件
+    const result = rows.every(({ messageStatusName }) => {
+        console.log(messageStatusName)
+        return messageStatusName === '已读'
+    })
+    if (!result) {
+        window.$message.warning('只能删除已读的消息')
         return
     }
     HcDelMsg(async (resolve) => {

+ 92 - 1
yarn.lock

@@ -995,6 +995,17 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
+"@vue/compiler-core@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.4.31.tgz#b51a76f1b30e9b5eba0553264dff0f171aedb7c6"
+  integrity sha512-skOiodXWTV3DxfDhB4rOf3OGalpITLlgCeOwb+Y9GJpfQ8ErigdBUHomBzvG78JoVE8MJoQsb+qhZiHfKeNeEg==
+  dependencies:
+    "@babel/parser" "^7.24.7"
+    "@vue/shared" "3.4.31"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-dom@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.30.tgz#5af9a5f6f0752f7882d4eba0795e4d00525006dc"
@@ -1003,7 +1014,15 @@
     "@vue/compiler-core" "3.4.30"
     "@vue/shared" "3.4.30"
 
-"@vue/compiler-sfc@3.4.30", "@vue/compiler-sfc@^3.4.30":
+"@vue/compiler-dom@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.4.31.tgz#30961ca847f5d6ad18ffa26236c219f61b195f6b"
+  integrity sha512-wK424WMXsG1IGMyDGyLqB+TbmEBFM78hIsOJ9QwUVLGrcSk0ak6zYty7Pj8ftm7nEtdU/DGQxAXp0/lM/2cEpQ==
+  dependencies:
+    "@vue/compiler-core" "3.4.31"
+    "@vue/shared" "3.4.31"
+
+"@vue/compiler-sfc@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.30.tgz#6a3cc86c20349f8c1976c968a8c80dd7cfef2430"
   integrity sha512-8vElKklHn/UY8+FgUFlQrYAPbtiSB2zcgeRKW7HkpSRn/JjMRmZvuOtwDx036D1aqKNSTtXkWRfqx53Qb+HmMg==
@@ -1018,6 +1037,21 @@
     postcss "^8.4.38"
     source-map-js "^1.2.0"
 
+"@vue/compiler-sfc@3.4.31", "@vue/compiler-sfc@^3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.4.31.tgz#cc6bfccda17df8268cc5440842277f61623c591f"
+  integrity sha512-einJxqEw8IIJxzmnxmJBuK2usI+lJonl53foq+9etB2HAzlPjAS/wa7r0uUpXw5ByX3/0uswVSrjNb17vJm1kQ==
+  dependencies:
+    "@babel/parser" "^7.24.7"
+    "@vue/compiler-core" "3.4.31"
+    "@vue/compiler-dom" "3.4.31"
+    "@vue/compiler-ssr" "3.4.31"
+    "@vue/shared" "3.4.31"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.10"
+    postcss "^8.4.38"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-ssr@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.30.tgz#7938b51f17d62b883d2a61ae42ec4f8398115b1d"
@@ -1026,6 +1060,14 @@
     "@vue/compiler-dom" "3.4.30"
     "@vue/shared" "3.4.30"
 
+"@vue/compiler-ssr@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.4.31.tgz#f62ffecdf15bacb883d0099780cf9a1e3654bfc4"
+  integrity sha512-RtefmITAje3fJ8FSg1gwgDhdKhZVntIVbwupdyZDSifZTRMiWxWehAOTCc8/KZDnBOcYQ4/9VWxsTbd3wT0hAA==
+  dependencies:
+    "@vue/compiler-dom" "3.4.31"
+    "@vue/shared" "3.4.31"
+
 "@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.5.1":
   version "6.6.1"
   resolved "http://39.108.216.210:9000/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
@@ -1038,6 +1080,13 @@
   dependencies:
     "@vue/shared" "3.4.30"
 
+"@vue/reactivity@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.4.31.tgz#eda80e90c4f9d7659efe1f5ed99c2dfdc9e93d77"
+  integrity sha512-VGkTani8SOoVkZNds1PfJ/T1SlAIOf8E58PGAhIOUDYPC4GAmFA2u/E14TDAFcf3vVDKunc4QqCe/SHr8xC65Q==
+  dependencies:
+    "@vue/shared" "3.4.31"
+
 "@vue/runtime-core@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.30.tgz#6db949b273af0b988b4f13fecb034f9c9439c41e"
@@ -1046,6 +1095,14 @@
     "@vue/reactivity" "3.4.30"
     "@vue/shared" "3.4.30"
 
+"@vue/runtime-core@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.4.31.tgz#ad3a41ad76385c0429e3e4dbefb81918494e10cf"
+  integrity sha512-LDkztxeUPazxG/p8c5JDDKPfkCDBkkiNLVNf7XZIUnJ+66GVGkP+TIh34+8LtPisZ+HMWl2zqhIw0xN5MwU1cw==
+  dependencies:
+    "@vue/reactivity" "3.4.31"
+    "@vue/shared" "3.4.31"
+
 "@vue/runtime-dom@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.30.tgz#49f399adc300a000419cb57a20b4481c98f523a4"
@@ -1056,6 +1113,16 @@
     "@vue/shared" "3.4.30"
     csstype "^3.1.3"
 
+"@vue/runtime-dom@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.4.31.tgz#bae7ad844f944af33699c73581bc36125bab96ce"
+  integrity sha512-2Auws3mB7+lHhTFCg8E9ZWopA6Q6L455EcU7bzcQ4x6Dn4cCPuqj6S2oBZgN2a8vJRS/LSYYxwFFq2Hlx3Fsaw==
+  dependencies:
+    "@vue/reactivity" "3.4.31"
+    "@vue/runtime-core" "3.4.31"
+    "@vue/shared" "3.4.31"
+    csstype "^3.1.3"
+
 "@vue/server-renderer@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.30.tgz#41f117cec12b5fbb9d7c741f59e7a0b515e9b607"
@@ -1064,11 +1131,24 @@
     "@vue/compiler-ssr" "3.4.30"
     "@vue/shared" "3.4.30"
 
+"@vue/server-renderer@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.4.31.tgz#bbe990f793c36d62d05bdbbaf142511d53e159fd"
+  integrity sha512-D5BLbdvrlR9PE3by9GaUp1gQXlCNadIZytMIb8H2h3FMWJd4oUfkUTEH2wAr3qxoRz25uxbTcbqd3WKlm9EHQA==
+  dependencies:
+    "@vue/compiler-ssr" "3.4.31"
+    "@vue/shared" "3.4.31"
+
 "@vue/shared@3.4.30":
   version "3.4.30"
   resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.30.tgz#72acfe8df65139dcf298e965fb2ab1cff419e400"
   integrity sha512-CLg+f8RQCHQnKvuHY9adMsMaQOcqclh6Z5V9TaoMgy0ut0tz848joZ7/CYFFyF/yZ5i2yaw7Fn498C+CNZVHIg==
 
+"@vue/shared@3.4.31":
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.4.31.tgz#af9981f57def2c3f080c14bf219314fc0dc808a0"
+  integrity sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==
+
 "@vueuse/core@^9.1.0":
   version "9.13.0"
   resolved "http://39.108.216.210:9000/@vueuse/core/-/core-9.13.0.tgz#2f69e66d1905c1e4eebc249a01759cf88ea00cf4"
@@ -2961,6 +3041,17 @@ vue@3.4.30:
     "@vue/server-renderer" "3.4.30"
     "@vue/shared" "3.4.30"
 
+vue@3.4.31:
+  version "3.4.31"
+  resolved "http://39.108.216.210:9000/vue/-/vue-3.4.31.tgz#83a3c4dab8302b0e974b0d4b92a2f6a6378ae797"
+  integrity sha512-njqRrOy7W3YLAlVqSKpBebtZpDVg21FPoaq1I7f/+qqBThK9ChAIjkRWgeP6Eat+8C+iia4P3OYqpATP21BCoQ==
+  dependencies:
+    "@vue/compiler-dom" "3.4.31"
+    "@vue/compiler-sfc" "3.4.31"
+    "@vue/runtime-dom" "3.4.31"
+    "@vue/server-renderer" "3.4.31"
+    "@vue/shared" "3.4.31"
+
 vuedraggable@^4.1.0:
   version "4.1.0"
   resolved "http://39.108.216.210:9000/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"