常规提交

src/components/assessment/evaluationStartFrom.vue

@@ -177,7 +177,7 @@
                                     </el-select>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="目标值">
+                            <el-table-column label="值">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" :disabled="!scope.row.updateMark" />
                                 </template>

src/components/assessment/evaluationYearFrom.vue

@@ -184,7 +184,7 @@
                                     <el-input v-model="scope.row.optionName" disabled />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="计划值">
+                            <el-table-column label="值">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" :disabled="scope.row.showInput || !scope.row.updateMark" />
                                 </template>

src/components/assessment/monthQuarterFrom.vue

@@ -184,7 +184,7 @@
                                     <el-input v-model="scope.row.optionName" disabled />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="计划值">
+                            <el-table-column label="值">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue" :disabled="!scope.row.updateMark" />
                                 </template>

src/components/gatewayPage.vue

@@ -488,10 +488,12 @@ export default {
         }
     }
     .gateway_bot{
-        padding: 15px 0 16px 26px;
+        padding: 10px 0 16px 26px;
         .gateway_bot_left{
+            width: 355px;
             background: #fff;
-            margin-right: 30px;
+            margin-right: calc(100% - 380px);
+            // margin-right: 30px;
             border-radius: 10px;
             padding-left: 25px;
             padding-bottom: 10px;
@@ -569,8 +571,11 @@ export default {
             }
         }
         .gateway_bot_center{
+            width: 740px;
+            // width: 720px; // 应用商店
             background: #fff;
-            margin-right: 30px;
+            // margin-right: 30px;
+            margin-right: calc(100% - 790px);
             border-radius: 10px;
             padding: 0 25px;
             padding-bottom: 10px;
@@ -597,8 +602,10 @@ export default {
             }
         }
         .gateway_bot_right{
+            width: 380px;
             background: #fff;
-            margin-right: 30px;
+            // margin-right: 30px;
+            margin-right: calc(100% - 380px);
             border-radius: 10px;
             padding-bottom: 10px;
             border: 1px solid #D6DBEA;

src/components/knowledgePage/scoringRulesDetailPage.vue

@@ -407,10 +407,11 @@ export default {
                 ruleId: that.rowevalradio.id,
                 regularExpression: encodeURI(document.getElementById("representation").value),
                 range: encodeURI(document.getElementById("range").value),
-                ruleDescription: that.itemForm.desc
+                ruleDescription: that.itemForm.desc,
+                childCode: that.multipleSelection[0].childCode
             }
             if (that.isSave) {
-                params.id = this.evalradio.id
+                params.id = that.evalradio.id
             }
             apiGetintervalscoringsaveOrUpdate(params).then(datas =>{
                 if (!that.isSave) {

src/components/taskCenter/taskCenterEvlFrom.vue

@@ -183,7 +183,7 @@
                                     <el-input v-model="scope.row.optionName" disabled />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="目标值">
+                            <el-table-column label="值">
                                 <template #default="scope">
                                     <el-input v-model="scope.row.nonQuantifiedValue"
                                      :disabled="(taskDefKey === 'nddwkplc' && scope.row.showInput) || !scope.row.updateMark" />

src/utils/baseUrl.js

@@ -17,8 +17,8 @@ switch (process.env.NODE_ENV) {
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/" 
-        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }