更新依赖和socket

package.json

@@ -21,8 +21,8 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.11",
         "echarts": "^5.5.1",
-        "element-plus": "2.7.6",
-        "hc-vue3-ui": "^4.0.9",
+        "element-plus": "^2.7.7",
+        "hc-vue3-ui": "^4.1.0",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.0",
         "js-md5": "^0.8.3",
@@ -44,7 +44,7 @@
         "bignumber.js": "^9.1.2",
         "eslint": "^8.56.0",
         "eslint-plugin-vue": "^9.22.0",
-        "sass": "^1.77.7",
+        "sass": "^1.77.8",
         "unocss": "0.58.2",
         "unocss-preset-extra": "^0.5.3",
         "unocss-preset-scrollbar": "^0.3.1",

public/plugins/element-plus/theme-chalk/src/drawer.scss

@@ -45,7 +45,7 @@ $directions: rtl, ltr, ttb, btt;
     margin: 0;
     flex: 1;
     line-height: inherit;
-    font-size: 1rem;
+    font-size: 16px;
   }
 
   @include e(footer) {

public/plugins/element-plus/theme-chalk/src/form.scss

@@ -58,24 +58,6 @@ $form-item-label-top-margin-bottom: map.merge(
 @include b(form) {
   @include set-component-css-var('form', $form);
 
-  @include m(label-left) {
-    .#{$namespace}-form-item__label {
-      justify-content: flex-start;
-    }
-  }
-  @include m(label-top) {
-    .#{$namespace}-form-item {
-      display: block;
-
-      .#{$namespace}-form-item__label {
-        display: block;
-        height: auto;
-        text-align: left;
-        margin-bottom: #{map.get($form-item-label-top-margin-bottom, 'default')};
-        line-height: #{map.get($form-item-label-top-line-height, 'default')};
-      }
-    }
-  }
   @include m(inline) {
     .#{$namespace}-form-item {
       display: inline-flex;
@@ -92,19 +74,6 @@ $form-item-label-top-margin-bottom: map.merge(
       }
     }
   }
-
-  @each $size in (large, default, small) {
-    @include m($size) {
-      &.#{$namespace}-form--label-top {
-        .#{$namespace}-form-item {
-          .#{$namespace}-form-item__label {
-            margin-bottom: #{map.get($form-item-label-top-margin-bottom, $size)};
-            line-height: #{map.get($form-item-label-top-line-height, $size)};
-          }
-        }
-      }
-    }
-  }
 }
 
 @include b(form-item) {
@@ -131,15 +100,35 @@ $form-item-label-top-margin-bottom: map.merge(
         height: #{map.get($form-item-line-height, $size)};
         line-height: #{map.get($form-item-line-height, $size)};
       }
+
       @include e(content) {
         line-height: #{map.get($form-item-line-height, $size)};
       }
+
       @include e(error) {
         padding-top: #{map.get($form-item-error-padding-top, $size)};
       }
     }
   }
 
+  @include m(label-left) {
+    .#{$namespace}-form-item__label {
+      justify-content: flex-start;
+    }
+  }
+
+  @include m(label-top) {
+    display: block;
+
+    .#{$namespace}-form-item__label {
+      display: block;
+      height: auto;
+      text-align: left;
+      margin-bottom: #{map.get($form-item-label-top-margin-bottom, 'default')};
+      line-height: #{map.get($form-item-label-top-line-height, 'default')};
+    }
+  }
+
   @include e(label-wrap) {
     display: flex;
   }
@@ -159,6 +148,7 @@ $form-item-label-top-margin-bottom: map.merge(
     padding: 0 12px 0 0;
     box-sizing: border-box;
   }
+
   @include e(content) {
     display: flex;
     flex-wrap: wrap;
@@ -173,6 +163,7 @@ $form-item-label-top-margin-bottom: map.merge(
       vertical-align: top;
     }
   }
+
   @include e(error) {
     color: getCssVar('color-danger');
     font-size: 12px;
@@ -202,6 +193,7 @@ $form-item-label-top-margin-bottom: map.merge(
           margin-right: 4px;
         }
       }
+
       &.asterisk-right {
         > .#{$namespace}-form-item__label:after,
         > .#{$namespace}-form-item__label-wrap
@@ -232,6 +224,7 @@ $form-item-label-top-margin-bottom: map.merge(
         box-shadow: 0 0 0 1px transparent inset;
       }
     }
+
     .#{$namespace}-input__validateIcon {
       color: getCssVar('color-danger');
     }

public/plugins/element-plus/theme-chalk/src/select.scss

@@ -137,6 +137,10 @@
       cursor: pointer;
       border-color: transparent;
 
+      &.#{$namespace}-tag--plain {
+        border-color: getCssVar('tag', 'border-color');
+      }
+
       .#{$namespace}-tag__content {
         min-width: 0;
       }

public/plugins/element-plus/theme-chalk/src/upload.scss

@@ -393,7 +393,7 @@
       }
 
       span + span {
-        margin-left: 1rem;
+        margin-left: 16px;
       }
 
       .#{bem('upload-list', 'item-delete')} {

src/config/index.js

@@ -21,7 +21,9 @@ export default {
     ports: ['7777'],
     //其它地址
     ossUrl: 'https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com', //oss地址
-    socket: 'ws://192.168.0.125:9527/websocket', //测试线上
+    //线上还没有，先关掉，防止控制他一直连接失败
+    socket: 'ws://192.168.0.125:9527/websocket',
+
     //这里不再支持配置请求地址，请在 src/config/index.json 文件中配置。
     //相关参数，可查阅 src/config/index.md 文件说明
 }

src/plugins/HcSocket.js

@@ -6,7 +6,7 @@ class HcSocket {
 
     constructor(data, change) {
         this.limit = 30
-        this.interval = 1000
+        this.interval = 10000
         this.param = getObjValue(data)
         this.onChange = change
         this.socket = null
@@ -24,7 +24,7 @@ class HcSocket {
         }
 
         //拼接URL并登录socket
-        const url = `${socketUrl}/${clientId}/${projectId}/${contractId}/${userId}`
+        const url = `${socketUrl}/blade-${clientId}/${projectId}/${contractId}/${userId}`
         this.socket = new WebSocket(url)
 
         this.socket.onopen = ()=> {
@@ -37,7 +37,6 @@ class HcSocket {
         }
 
         this.socket.onmessage = ({ data })=> {
-            console.log(data)
             try {
                 const parsedData = JSON.parse(data)
                 if (typeof this.onChange === 'function') {

src/views/debit-pay/material/components/material/dataModal.vue

@@ -198,6 +198,10 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
+    meterPeriodId: {
+        type: [String, Number],
+        default: '',
+    },
 })
 
 //事件
@@ -216,8 +220,10 @@ const isShow = defineModel('modelValue', {
 
 //监听
 const dataId = ref(props.ids)
-watch(() => props.ids, (id) => {
+const dataPid = ref(props.meterPeriodId)
+watch(() => [props.ids, props.meterPeriodId], ([id, pid]) => {
     dataId.value = id
+    dataPid.value = pid
 }, { deep: true })
 
 //监听
@@ -271,6 +277,7 @@ const detailsModalShow = () => {
     if (!isNullES(dataId.value)) {
         getDetailData()
     } else {
+        formModel.value.contractPeriodId = dataPid.value
         isAdjustDate.value = true
     }
 }

src/views/debit-pay/material/components/order/dataModal.vue

@@ -137,7 +137,10 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
-
+    meterPeriodId: {
+        type: [String, Number],
+        default: '',
+    },
 })
 //事件
 const emit = defineEmits(['close'])
@@ -160,21 +163,17 @@ const hProps = ref({
     name: 'fileName',
 })
 //监听
-watch(() => [
-    props.ids,
-    props.infoData,
-
-], ([Id, info]) => {
+const dataPid = ref(props.meterPeriodId)
+watch(() => [props.ids, props.infoData, props.meterPeriodId], ([Id, info, pid]) => {
     ids.value = Id
+    dataPid.value = pid
     infoData.value = info
-
-
-    if (Id.length > 0) {
+    if (!isNullES(Id)) {
         baseForm.value = info
-         fileName.value = info?.fileList
+        fileName.value = info?.fileList
         modalTitle.value = '材料计量单编辑'
     } else {
-        baseForm.value = { fileList:[] }
+        baseForm.value = { fileList:[], meterPeriodId: pid }
         fileName.value = []
         modalTitle.value = '材料计量单新增'
     }
@@ -195,6 +194,7 @@ const detailsModalShow = () => {
             minSize: [170, 500],
         })
     })
+    baseForm.value.meterPeriodId = dataPid.value
     getKey1Data()
     getTreeData()
 }
@@ -205,14 +205,7 @@ const getKey1Data = async ()=>{
        contractId:contractId.value,
        type:1,
     })
-    if (!error && code === 200) {
-        key1Data.value = getArrValue(data)
-        if (key1Data.value.length > 0) {
-            baseForm.value.meterPeriodId = key1Data.value[key1Data.value.length - 1].id
-        }
-    } else {
-        key1Data.value = []
-    }
+    key1Data.value = getArrValue(data)
 }
 
 //数据格式

src/views/debit-pay/material/material.vue

@@ -39,7 +39,7 @@
             <hc-pages :pages="searchForm" @change="pageChange" />
         </template>
         <!-- 新增/编辑 -->
-        <HcdataModal v-model="isFormModal" :ids="rowId" @finish="dataModalFinish" />
+        <HcdataModal v-model="isFormModal" :meter-period-id="searchForm.contractPeriodId" :ids="rowId" @finish="dataModalFinish" />
     </hc-card>
 </template>
 
@@ -49,6 +49,7 @@ import { useAppStore } from '~src/store'
 import { HcDelMsg } from 'hc-vue3-ui'
 import { getArrValue } from 'js-fast-way'
 import mainApi from '~api/debit-pay/material/material'
+import HcDataModal from '~src/views/debit-pay/material/components/order/dataModal.vue'
 import HcdataModal from './components/material/dataModal.vue'
 
 //初始化

src/views/debit-pay/material/order.vue

@@ -105,7 +105,7 @@
             </div>
         </div>
         <!-- 新增/修改 -->
-        <HcDataModal v-model="isDataModal" :info-data="infoData" :ids="editId" @close="finishData" />
+        <HcDataModal v-model="isDataModal" :info-data="infoData" :meter-period-id="searchForm.meterPeriodId" :ids="editId" @close="finishData" />
 
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" :info="reportInfo" @finish="reportFinish" />

yarn.lock

@@ -1533,10 +1533,10 @@ electron-to-chromium@^1.4.668:
   resolved "http://39.108.216.210:9000/electron-to-chromium/-/electron-to-chromium-1.4.744.tgz#d19cdfdbd81bd800b71773702bcbaa129a3b2e8f"
   integrity sha512-nAGcF0yeKKfrP13LMFr5U1eghfFSvFLg302VUFzWlcjPOnUYd52yU5x6PBYrujhNbc4jYmZFrGZFK+xasaEzVA==
 
-element-plus@2.7.6:
-  version "2.7.6"
-  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.7.6.tgz#09b2c9c1de46dcc6778d37a29d9c0948ce40d635"
-  integrity sha512-36sw1K23hYjgeooR10U6CiCaCp2wvOqwoFurADZVlekeQ9v5U1FhJCFGEXO6i/kZBBMwsE1c9fxjLs9LENw2Rg==
+element-plus@^2.7.7:
+  version "2.7.7"
+  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.7.7.tgz#317a4b826d577f4572ca040f2568eb751edd891d"
+  integrity sha512-7ucUiDAxevyBE8JbXBTe9ofHhS047VmWMLoksE45zZ08XSnhnyG7WUuk3gmDbAklfVMHedb9sEV3OovPUWt+Sw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"
@@ -1955,10 +1955,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.0.9:
-  version "4.0.9"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.0.9.tgz#97a895af78d27f16c3bb922c03210d21fadd0dcb"
-  integrity sha512-drOX5USm6Xph+878qe1Tzi9Rgyl1XcKYNcZxsQNBZ0pr+WfeLJkRjM5W+gMtx++N7YxJ9NYMrX30u6ycGqDAXA==
+hc-vue3-ui@^4.1.0:
+  version "4.1.0"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.1.0.tgz#90d71a49762fd6ccd9834a66ae51e27b4513978b"
+  integrity sha512-b9kaDU2BnBIUs9yzQG4EuQyfh22hcobArodBTnEhK5mkUl1eD86jfd13aseaZbI7r3+bqRW1CsFm7cHJMJ6xsw==
   dependencies:
     axios "^1.7.2"
     dayjs "^1.11.11"
@@ -2617,10 +2617,10 @@ safe-buffer@~5.2.0:
   resolved "http://39.108.216.210:9000/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-sass@^1.77.7:
-  version "1.77.7"
-  resolved "http://39.108.216.210:9000/sass/-/sass-1.77.7.tgz#ef3520edc8f59da089f25891d8a6bebf93668ee0"
-  integrity sha512-9ywH75cO+rLjbrZ6en3Gp8qAMwPGBapFtlsMJoDTkcMU/bSe5a6cjKVUn5Jr4Gzg5GbP3HE8cm+02pLCgcoMow==
+sass@^1.77.8:
+  version "1.77.8"
+  resolved "http://39.108.216.210:9000/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd"
+  integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"