案件比相关修改

tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskAnalysisManagerImpl.java

@@ -1606,10 +1606,12 @@ public class TaskAnalysisManagerImpl implements ITaskAnalysisManager{
             BigDecimal c2 = new BigDecimal(e.get("c2").toString());
             String value = "";
             if(c2.compareTo(BigDecimal.ZERO) != 0){
-                if(e.get("type") == null || "1".equals(e.get("type").toString())){
-                    value = c1.divide(c2, 2, RoundingMode.HALF_UP).toPlainString() + "%";
+                if(e.get("color") == null || "1".equals(e.get("color").toString())){
+                    value = c1.divide(c2, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).toPlainString() + "%";
+                    e.put("valueType", "满足率");
                 } else{
                     value = "1:" + c1.divide(c2, 1, RoundingMode.HALF_DOWN).toPlainString();
+                    e.put("valueType", "比值");
                 }
             }
             e.put("value", value);

tip-front/src/main/webapp/WEB-INF/pages/apps/task/analysis/performance.html

@@ -261,30 +261,8 @@
                         <tr>
                             <th>序号</th>
                             <th>类型名称</th>
-                            <th>办件量</th>
-                            <th>满足率</th>
-                            <th>案件比</th>
-                            <!--<th>
-                                <span class="pj-sort-box" data-order="scope0">
-                                    <span>总得分</span>
-                                    <span class="pj-sort-up"></span>
-                                    <span class="pj-sort-down"></span>
-                                </span>
-                            </th>
-                            <th>
-                                <span class="pj-sort-box" data-order="scope1">
-                                    <span>基础分</span>
-                                    <span class="pj-sort-up"></span>
-                                    <span class="pj-sort-down"></span>
-                                </span>
-                            </th>
-                            <th>
-                                <span class="pj-sort-box" data-order="scope2">
-                                    <span>评价得分</span>
-                                    <span class="pj-sort-up"></span>
-                                    <span class="pj-sort-down"></span>
-                                </span>
-                            </th>-->
+                            <th>类型单位</th>
+                            <th>值</th>
                         </tr>
                         </thead>
                         <tbody id="byManagerTrs">
@@ -344,12 +322,8 @@
     <tr>
         <td>{{index+1}}</td>
         <td>{{obj.name}}</td>
-        <td>{{obj.c}}</td>
-        <td>{{obj.reachPer}}</td>
-        <td>{{obj.caseProportion}}</td>
-        <!--<td>{{obj.scope0}}</td>
-        <td>{{obj.scope1}}</td>
-        <td>{{obj.scope2}}</td>-->
+        <td>{{obj.valueType}}</td>
+        <td>{{obj.value}}</td>
     </tr>
     {{/each}}
     {{/if}}

tip-front/src/main/webapp/WEB-INF/pages/apps/task/type/settingModal.html

@@ -66,9 +66,10 @@
         .pj-body-item-title span{
             color: red;
         }
-        .pj-body-item input{
+        .pj-body-item input, .pj-body-item select{
             width: 220px;
             padding-left: 5px;
+            font-size: 14px;
         }
         ::-webkit-scrollbar,
         div::-webkit-scrollbar {
@@ -100,6 +101,13 @@
         <div class="pj-body-item-title">评价得分：</div>
         <input type="number" v-model="formData.evalScore">
     </div>
+    <div class="pj-body-item">
+        <div class="pj-body-item-title">指标类型：</div>
+        <select  v-model="formData.color">
+            <option value="1">数值</option>
+            <option value="2">比例</option>
+        </select>
+    </div>
 </div>
 </body>
 <script type="text/javascript" th:src="@{/common/jquery/jquery.min.js}" src="../../../../../common/jquery/jquery.min.js"></script>
@@ -116,8 +124,9 @@
         value: '',
         key: '',
         sort: '',
-        baseScore: 0,
-        evalScore: 0
+        baseScore: null,
+        evalScore: null,
+        color: "1"
     };
   var vm = new Vue({
         el: '#pjModal',

tip-front/src/main/webapp/WEB-INF/pages/apps/task/type/typesSettings.html

@@ -97,6 +97,7 @@
 								<th>排序号</th>
 								<th>基础分</th>
 								<th>评价得分</th>
+								<th>指标类型</th>
 								<th>创建时间</th>
 								<th>更新时间</th>
 							</tr>
@@ -115,6 +116,7 @@
 								<td>{{item.sort}}</td>
 								<td>{{item.baseScore}}</td>
 								<td>{{item.evalScore}}</td>
+								<td>{{item.color === '2' ? '比例' : '数值'}}</td>
 								<td>{{dateFormat(item.createDate)}}</td>
 								<td>{{dateFormat(item.updateDate)}}</td>
 							</tr>
@@ -186,10 +188,10 @@
 						max: false,
 						min: false,
 						width: "360px",
-						height: "240px",
+						height: "265px",
 						content:'url:' + TC.config.baseUrl + '/task/settingModal',
 						lock: true,
-						data: item ? JSON.parse(JSON.stringify(item)) : {},
+						data: item ? JSON.parse(JSON.stringify(item)) : null,
 						button : [
 							{
 								"name":"关闭",

tip-front/src/main/webapp/tc_suite/minto/task/showTaskDetail_anchor.jsp

@@ -1096,32 +1096,31 @@
                                             <c:forEach items="${taskTypeSettingMap.taskTypeSettingList}" var="sign" varStatus="s">
                                                 <tr class="sign-unit">
                                                     <td class="fixedTd">
-                                                            ${sign.typeName}
-                                                    </td>
-                                                    <td class="fixedTd">
-                                                        <select <c:if test="${3==tstate}">disabled="false"</c:if> class="typeStateSelect" name="typeStateSelect">
-                                                            <c:if test="${sign.typeState == null}"><option value="">请选择</option></c:if>
-                                                            <option  data-id="${sign.id}" value="0" <c:if test="${0==sign.typeState}">selected="selected"</c:if> >未满足</option>
-                                                            <option  data-id="${sign.id}" value="1" <c:if test="${1==sign.typeState}">selected="selected"</c:if> >已满足</option>
-                                                        </select>
+                                                         ${sign.typeName}
                                                     </td>
+
+                                                    <c:if test="${sign.typeColor == '2'}">
+                                                        <td class="fixedTd">
+                                                            1:<input style="width:60px;" <c:if test="${3==tstate}">disabled="false"</c:if> type="text" class="mt-input" name="typeStateInput" value="${sign.typeState}">
+                                                            <c:if test="${3!=tstate}"><button class="ajb mt-btn" data-id="${sign.id}">确认</button> </c:if>
+                                                        </td>
+                                                    </c:if>
+
+                                                    <c:if test="${sign.typeColor != '2'}">
+                                                        <td class="fixedTd" <c:if test="${3==tstate}">disabled="false"</c:if>>
+                                                            <select <c:if test="${3==tstate}">disabled="false"</c:if> class="typeStateSelect" name="typeStateSelect">
+                                                                <c:if test="${sign.typeState == null}"><option value="">请选择</option></c:if>
+                                                                <option  data-id="${sign.id}" value="0" <c:if test="${0==sign.typeState}">selected="selected"</c:if> >未满足</option>
+                                                                <option  data-id="${sign.id}" value="1" <c:if test="${1==sign.typeState}">selected="selected"</c:if> >已满足</option>
+                                                            </select>
+                                                        </td>
+                                                    </c:if>
+
                                                     <td class="fixedTd" style="white-space: nowrap">
                                                         <fmt:formatDate type="time" value="${sign.updateTime}" pattern="yyyy-MM-dd HH:mm"/>
                                                     </td>
                                                 </tr>
                                             </c:forEach>
-                                            <tr class="sign-unit">
-                                                <td class="fixedTd">
-                                                        案件比
-                                                </td>
-                                                <td class="fixedTd">
-                                                        1:<input style="width:60px;" <c:if test="${3==tstate}">disabled="false"</c:if> type="text" class="mt-input" id="typeStateInput" name="typeStateInput" value="${taskTypeSettingMap.caseProportion.typeState}">
-                                                        <c:if test="${3!=tstate}"><button class="ajb mt-btn">确认</button> </c:if>
-                                                </td>
-                                                <td class="fixedTd" style="white-space: nowrap">
-                                                    <fmt:formatDate type="time" value="${taskTypeSettingMap.caseProportion.updateTime}" pattern="yyyy-MM-dd HH:mm"/>
-                                                </td>
-                                            </tr>
                                             </tbody>
                                         </table>
                                     </div>
@@ -6063,15 +6062,14 @@
     })
 
     $('.ajb').click(function() {
-        var value = $('#typeStateInput').val()
-        var z_reg = /^\+?[1-9][0-9]*$/
+        var value = $(this).prev().val();
+        var z_reg = /^\+?[1-9][0-9]*$/;
         if (!z_reg.test(value)) {
             $.alert("请输入正整数！");
             return
         }
-
-        var id = $('body').attr('data-id')
-        callAjaxRequest("taskListWebService","saveCaseProportion",id,value,{
+        var id = $(this).attr('data-id')
+        callAjaxRequest("taskListWebService","updateTaskTypeSetting",id, value,{
             success:function(result){
                 $.ok("修改成功！",function(){
                     window.location.reload();