Merge branch 'feature-patch' into ktyq-online-new

src/constant/instruments.ts

@@ -433,7 +433,7 @@ export let instruments: any = {}
 
 /** 获取分轨名称 */
 export const getInstrumentName = (name = '') => {
-	name = name.toLocaleLowerCase().replace(/[0-9\s]/g, '')
+	name = name.toLocaleLowerCase().replace(/ /g, '')
 	if (!name) return ''
 	// 全匹配声轨名称
 	for(let key in instruments){
@@ -445,7 +445,7 @@ export const getInstrumentName = (name = '') => {
 	// 用返回的code模糊匹配传入的xml声轨名称name
 	for(let key in instruments){
 	  const _key = key.toLocaleLowerCase().replace(/ /g, '')
-	  if (_key.includes(name)){
+	  if (name.includes(_key)){
 		return instruments[key]
 	  }
 	}

src/page-instrument/evaluat-model/evaluat-result/index.tsx

@@ -97,15 +97,17 @@ export default defineComponent({
 
     const isHuaWeiPad = navigator?.userAgent?.includes("UAWEIVRD-W09") ? true : false
     onMounted(() => {
-      if (!evaluatingData.isErrorState) {
-        handleAddRecord();
-      }
+      // if (!evaluatingData.isErrorState) {
+      //   console.log('添加评测记录','加载组建后提交',evaluatingData.resulstMode)
+      //   handleAddRecord();
+      // }
       // console.log('评测等级',evaluatingData.resultData.leve)
     });
 
     watch(
       () => evaluatingData.resulstMode,
       (val) => {
+        // console.log('添加评测记录','出现弹窗后提交','resulstMode',evaluatingData.resulstMode)
         // # 9402，评测异常操作：都改为不生成评测记录
         if (val) {
           setTimeout(() => {
@@ -114,6 +116,9 @@ export default defineComponent({
             }
           }, 0);
         }
+      },
+      {
+        immediate: true
       }
     );
     return () => (

src/page-instrument/evaluat-model/index.tsx

@@ -678,14 +678,18 @@ export default defineComponent({
         </Popup>
 
         {/* 评测作业，非完整评测不显示评测结果弹窗 */}
-        {evaluatingData.hideResultModal ? (
-          <EvaluatResult onClose={handleEvaluatResult} />
-        ) : (
-          <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatingData.resulstMode}>
-            <EvaluatResult onClose={handleEvaluatResult} />
-          </Popup>
-        )}
-
+        {
+          evaluatingData.resulstMode && 
+          <>
+            {evaluatingData.hideResultModal ? (
+              <EvaluatResult onClose={handleEvaluatResult} />
+            ) : (
+              <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatingData.resulstMode}>
+                <EvaluatResult onClose={handleEvaluatResult} />
+              </Popup>
+            )}          
+          </>
+        }
         <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatModel.evaluatUpdateAudio}>
           <EvaluatAudio onClose={hanldeUpdateVideoAndAudio} />
         </Popup>

vite.config.ts

@@ -76,8 +76,8 @@ export default defineConfig({
         // target: "https://kt.colexiu.com",
         // target: "https://test.lexiaoya.cn",
         // target: "https://kt.colexiu.com",
-        target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
-        // target: "https://test.kt.colexiu.com",
+        // target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
+        target: "https://test.kt.colexiu.com",
         // target: "https://mec.colexiu.com",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),