页面修改

src/views/Home/homePanelsLayoutPage/item_xunchaxunjian.js

@@ -37,7 +37,7 @@ const Page = ({mySetTms}) => {
 
     const columns2 = [
         { title: '上报时间', key: 'finishTime', dataIndex: 'finishTime',align: "center", ellipsis: true },
-        { title: '巡检问题描述', key: 'itemDesc', dataIndex: 'itemDesc',align: "center" },
+        { title: '巡检问题描述', key: 'problemDesc', dataIndex: 'problemDesc',align: "center" },
     ];
 
     useEffect(()=>{

src/views/gxsl/gstjfx/tjOption.js

@@ -4,11 +4,11 @@ let color = ["#73a0fa", "#52c1f5"];
 let echartData = [
   {
     name: "生活供水",
-    value: obj?.shgs
+    value: parseFloat(obj?.shgs?.toFixed(2))
   },
   {
     name: "生态供水",
-    value: obj?.stgs,
+    value: parseFloat(obj?.stgs?.toFixed(2)),
   },
 ];
 

src/views/gxsl/gstjfx/toolbar1.js

@@ -7,7 +7,8 @@ const ToolBar = ({ setSearchVal, exportFile, role }) => {
   const exportBtn = role?.rule?.find(item => item.menuName == "导出");
   const [form] = Form.useForm();
   const onFinish = (values) => {
-    setSearchVal({...values,year: String(values.year)});
+    // setSearchVal({...values,year: String(values.year)});
+    setSearchVal({...values,year: moment(values.year).format("YYYY")});
   }
   
   useEffect(() => {

src/views/rcgl/jdkh/khrwgl/PfDetail.js

@@ -373,6 +373,18 @@ const EditableRow = ({ index, ...props }) => {
                 rectifyStatus:0
             }))
         }
+        if(tableData.length>0){
+          let flag = true //fasle有位评分的
+          params.ratings?.map((item)=>{
+            if(item.assessScore==null){
+              flag = false
+            }
+          })
+          if(!flag){
+            message.error('请输入全部考核评分')
+            return
+          }
+        }
         try {
             const res = await httppost2(apiurl.rcgl.jdkh.khrwgl.confirmpf, params)
             if (res.code == 200) { 

src/views/rcgl/jdkh/khzbgl/form.js

@@ -206,6 +206,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
     values.standardScore = standardScore1;
     if (mode === 'edit') {
       values.id = record.id;
+      values.status = record.status;
       onEdit(apiurl.rcgl.jdkh.khzbgl.edit,values)
     }
     if (mode === 'save') {

src/views/rcgl/xcxj/xjrw/index.js

@@ -65,7 +65,7 @@ const Page = () => {
     {title: '开始日期', key: 'startDate', dataIndex: 'startDate', width: 200},
     {title: '结束日期', key: 'endDate', dataIndex: 'endDate', width: 200},
     {title: '问题数量', key: 'problemNum', dataIndex: 'problemNum', width: 100,align: 'center'},
-    { title: '待处理', key: 'handleNum	', dataIndex: 'handleNum	', width: 100,align: 'center'},
+    { title: '待处理', key: 'handleNum', dataIndex: 'handleNum', width: 100,align: 'center'},
     { title: '创建时间', key: 'createTime', dataIndex: 'createTime', width: 200 },
     { title: '创建人', key: 'createUserName', dataIndex: 'createUserName', width: 150 },
     

src/views/rcgl/xcxj/xjwtcl/toolbar.js

@@ -5,7 +5,7 @@ import moment from 'moment';
 import NormalSelect from '../../../../components/Form/NormalSelect';
 const { RangePicker } = DatePicker;
 const ToolBar = ({ setSearchVal, onSave, storeData, role }) => {
-  const searchBtn = role?.rule?.find(item => item.menuName == "查询");
+  const searchBtn = role?.rule?.find(item => item.menuName == "查询")||true;
   const [form] = Form.useForm();
 
   const onFinish = (values) => {

src/views/rcgl/xcxj/xjxpz/form.js

@@ -18,6 +18,7 @@ const ModalForm = ({ mode, record, onEdit, onSave, onSimilarSave }) => {
     values.pointId = record.code;
     if (mode === 'edit') {
       values.id = record.id;
+      values.status = record.status;
       onEdit(apiurl.rcgl.xcxj.xjxpz.edit,values)
     }
     if (mode === 'save') {

src/views/sz/pxjlgl/options.js

@@ -105,7 +105,7 @@ export default function options(data={},teamName) {
                 }
              },
            {
-              name: teamName===1?'实际期人次':'实际期数',
+              name: teamName===1?'实际人次':'实际期数',
               type: 'bar',
               barWidth: 25,
               data: data?.list?.map(item =>item.num1),