设备模块调整、隐患模块调整

src/widgets/EquipmentNormalManagement/Save2File.ts

@@ -41,7 +41,7 @@ function save2CSV(data: any, fileName?: string) {
     var result: string = "";
     var name = fileName;
     // name += '-' + getDataTime();
-    result += "台卡编号,财务编号,自编号,设备名称,制造单位,出厂日期,型号及规格,总重,原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
+    result += "台卡编号,财务编号,自编号,设备名称,制造单位,出厂日期,型号及规格,总重(kg),原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
 
     $.each(data, function (i, item) {
         let cardNumber = item.cardNumber ? item.cardNumber : " ";

src/widgets/EquipmentNormalManagement/Widget.html

@@ -112,10 +112,10 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class=" control-label" style="margin-left:20px">总重</label>
+                    <label class=" control-label" style="margin-left:20px">总重(kg)</label>
                     <div style="width:calc(100% - 40px);margin-left:20px">
                         <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight"
-                            data-bv-trigger="blur" placeholder="总重">
+                            data-bv-trigger="blur" placeholder="总重(kg)">
                     </div>
                 </div>
                 <div class="form-group">
@@ -377,7 +377,7 @@
                 <tr>
                     <td rowspan="2">型号<br>及<br>规格</td>
                     <td colspan="4" rowspan="2"><%=typeSpecification%></td>
-                    <td>总重<br>(kg)</td>
+                    <td>总重(kg)<br>(kg)</td>
                     <td><%=totalWeight%></td>
                 </tr>
                 <tr>

src/widgets/EquipmentNormalManagementType/Widget.ts

@@ -195,7 +195,7 @@ class EquipmentNormalManagementType extends BaseWidget {
             url: this.config.getHiddenDangerDeviceList,
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["巡检类型名称", "备注"],
+            displayTitle: ["设备类型名称", "备注"],
             displayField: ["name", "note"],
             beforeTrClickEvent: undefined,
             afterTrClickEvent: function () {

src/widgets/EquipmentSpecialManagement/Save2File.ts

@@ -41,7 +41,7 @@ function save2CSV(data: any, fileName?: string) {
     var result: string = "";
     var name = fileName;
     // name += '-' + getDataTime();
-    result += "台卡编号,财务编号,自编号,设备类型,设备名称,制造单位,出厂日期,型号及规格,总重,原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
+    result += "台卡编号,财务编号,自编号,设备类型,设备名称,制造单位,出厂日期,型号及规格,总重(kg),原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
 
     $.each(data, function (i, item) {
         let cardNumber = item.cardNumber ? item.cardNumber : " ";

src/widgets/EquipmentSpecialManagement/Widget.html

@@ -102,9 +102,9 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class=" control-label" style="margin-left:20px">总重</label>
+                    <label class=" control-label" style="margin-left:20px">总重(kg)</label>
                     <div style="width:calc(100% - 40px);margin-left:20px">
-                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重">
+                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重(kg)">
                     </div>
                 </div>
                 <div class="form-group">
@@ -349,7 +349,7 @@
                 <tr>
                     <td rowspan="2">型号<br>及<br>规格</td>
                     <td colspan="4" rowspan="2"><%=typeSpecification%></td>
-                    <td>总重<br>(kg)</td>
+                    <td>总重(kg)<br>(kg)</td>
                     <td><%=totalWeight%></td>
                 </tr>
                 <tr>

src/widgets/EquipmentSpecialManagementType/Widget.ts

@@ -195,7 +195,7 @@ class EquipmentSpecialManagementType extends BaseWidget {
             url: this.config.getHiddenDangerDeviceList,
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["巡检类型名称", "备注"],
+            displayTitle: ["设备类型名称", "备注"],
             displayField: ["name", "note"],
             beforeTrClickEvent: undefined,
             afterTrClickEvent: function () {

src/widgets/FixedAssetsManager/Save2File.ts

@@ -41,7 +41,7 @@ function save2CSV(data: any, fileName?: string) {
     var result: string = "";
     var name = fileName;
     // name += '-' + getDataTime();
-    result += "台卡编号,财务编号,自编号,设备类型,设备名称,制造单位,出厂日期,型号及规格,总重,原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
+    result += "台卡编号,财务编号,自编号,设备类型,设备名称,制造单位,出厂日期,型号及规格,总重(kg),原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
 
     $.each(data, function (i, item) {
         let cardNumber = item.cardNumber ? item.cardNumber : " ";

src/widgets/FixedAssetsManager/Widget.html

@@ -92,9 +92,9 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class=" control-label" style="margin-left:20px">总重</label>
+                    <label class=" control-label" style="margin-left:20px">总重(kg)</label>
                     <div style="width:calc(100% - 40px);margin-left:20px">
-                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重">
+                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重(kg)">
                     </div>
                 </div>
                 <div class="form-group">
@@ -339,7 +339,7 @@
                 <tr>
                     <td rowspan="2">型号<br>及<br>规格</td>
                     <td colspan="4" rowspan="2"><%=typeSpecification%></td>
-                    <td>总重<br>(kg)</td>
+                    <td>总重(kg)<br>(kg)</td>
                     <td><%=totalWeight%></td>
                 </tr>
                 <tr>

src/widgets/HiddenCoordinate/Widget.ts

@@ -285,13 +285,13 @@ class HiddenCoordinate extends BaseWidget {
             url: that.config.troubleInfo,
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["隐患名称", "所属单位", "隐患地址", "上报人", "详情"],
+            displayTitle: ["隐患名称", "所属单位", "隐患地址", "上报人", "备注"],
             displayField: ["troubleName", "unitName", "address", "reportUserName", "troubleInfo"],
             extentDisplayTitle: ['操作'],
             // testData:this.config.dataInfo,
             extentDisplayContent: [{
                 field: "infoWrite",
-                fieldContent: "<a class='infoWrite'>继续处理</a>"
+                fieldContent: "<a class='infoWrite'>协调处理</a>"
             }],
             beforeTrClickEvent: undefined,
             afterTrClickEvent: function () {

src/widgets/HiddenTroubleAssign/Widget.ts

@@ -280,11 +280,11 @@ class HiddenTroubleAssign extends BaseWidget {
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
             displayTitle: ["隐患名称", "所属单位", "隐患地址", "上报人", "详情"],
             displayField: ["troubleName", "unitName", "address", "reportUserName", "troubleInfo"],
-            extentDisplayTitle: ['处理'],
+            extentDisplayTitle: ['派工'],
             // testData:this.config.dataInfo,
             extentDisplayContent: [{
                 field: "infoWrite",
-                fieldContent: "<a class='infoWrite opreationName'>处理</a>"
+                fieldContent: "<a class='infoWrite opreationName'>派工</a>"
             }],
             beforeTrClickEvent: undefined,
             afterTrClickEvent: function () {

src/widgets/KeyEquipment copy/Widget.html

@@ -115,9 +115,9 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class=" control-label" style="margin-left:20px">总重</label>
+                    <label class=" control-label" style="margin-left:20px">总重(kg)</label>
                     <div style="width:calc(100% - 40px);margin-left:20px">
-                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重">
+                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重(kg)">
                     </div>
                 </div>
                 <div class="form-group">
@@ -362,7 +362,7 @@
                 <tr>
                     <td rowspan="2">型号<br>及<br>规格</td>
                     <td colspan="4" rowspan="2"><%=typeSpecification%></td>
-                    <td>总重<br>(kg)</td>
+                    <td>总重(kg)<br>(kg)</td>
                     <td><%=totalWeight%></td>
                 </tr>
                 <tr>

src/widgets/KeyEquipment/Save2File.ts

@@ -41,7 +41,7 @@ function save2CSV(data: any, fileName?: string) {
     var result: string = "";
     var name = fileName;
     // name += '-' + getDataTime();
-    result += "台卡编号,财务编号,自编号,设备类型,设备名称,制造单位,出厂日期,型号及规格,总重,原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
+    result += "台卡编号,财务编号,自编号,设备类型,设备名称,制造单位,出厂日期,型号及规格,总重(kg),原值(元),项目1,性能参数,项目2,性能参数,项目3,性能参数,项目4,性能参数,项目5,性能参数5,备注,装箱单,总装图,合格证与等级,易损件图,说明书本,说明书页,其他资料,安装单位,安装地点,设备状况,安装日期,责任人,建卡日期,启用日期,来源与转移,备注,更新日期";
 
     $.each(data, function (i, item) {
         let cardNumber = item.cardNumber ? item.cardNumber : " ";

src/widgets/KeyEquipment/Widget.html

@@ -102,9 +102,9 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class=" control-label" style="margin-left:20px">总重</label>
+                    <label class=" control-label" style="margin-left:20px">总重(kg)</label>
                     <div style="width:calc(100% - 40px);margin-left:20px">
-                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重">
+                        <input type="number" autocomplete="off" class="form-control totalWeight" name="totalWeight" data-bv-trigger="blur" placeholder="总重(kg)">
                     </div>
                 </div>
                 <div class="form-group">
@@ -349,7 +349,7 @@
                 <tr>
                     <td rowspan="2">型号<br>及<br>规格</td>
                     <td colspan="4" rowspan="2"><%=typeSpecification%></td>
-                    <td>总重<br>(kg)</td>
+                    <td>总重(kg)<br>(kg)</td>
                     <td><%=totalWeight%></td>
                 </tr>
                 <tr>

src/widgets/KeyEquipmentType/Widget.ts

@@ -195,7 +195,7 @@ class KeyEquipmentType extends BaseWidget {
             url: this.config.getHiddenDangerDeviceList,
             isCheck: false,
             searchInfo: that.searchInfo,//条件在不断变化，故需要有全局的条件监听
-            displayTitle: ["巡检类型名称", "备注"],
+            displayTitle: ["设备类型名称", "备注"],
             displayField: ["name", "note"],
             beforeTrClickEvent: undefined,
             afterTrClickEvent: function () {

src/widgets/MissionSchedule/Widget.html

@@ -31,11 +31,11 @@
                         <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>删除
                         </button>
                 </div>
-                <div class="form-group">
+                <!-- <div class="form-group">
                     <button title="转移计划" id="btn_transplans" type="button" class="btn btn-default btn-danger btn_transplans" data-toggle="modal">
                         <span class="glyphicon glyphicon-share-alt" aria-hidden="true"></span>转移
                         </button>
-                </div>
+                </div> -->
             </div>
         </div>
     </div>

src/widgets/PlanSearch/Widget.html

@@ -8,9 +8,9 @@
                     <option  value='2'>正在执行 </option>
                     <option value='3'>已完成 </option>
                     <option value='1'>未开始 </option>
-                    <option value='5'>申请转移(任务未开始) </option>
+                    <!-- <option value='5'>申请转移(任务未开始) </option>
                     <option value='6'>申请转移(任务正在执行) </option>
-                    <option value='7'>计划已转移 </option>
+                    <option value='7'>计划已转移 </option> -->
                     <option value='4'>超时未完成 </option>
                 </select>
             </div>

src/widgets/SiteDispatchSearch/Widget.ts

@@ -100,7 +100,7 @@ class SiteDispatchSearch extends BaseWidget {
             startTime: startTime!=""?(startTime+ timeStr):"",
             endTime:endTime!=""?(endTime+timeStr):"",
             "orders[0].asc":false,
-            "orders[0].column":"creat_time"
+            "orders[0].column":"create_time"
         } 
     }