Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

api/app/lib/controllers/overview/building.js

@@ -36,6 +36,10 @@ async function roadState(ctx) {
         const projectRoadRes = await models.Project.findAll({
             type: 'road',
         })
+        //在建工程
+        const buildingCount = await models.Project.count({
+            where: { done: true }
+        })
         const bridgeRes = await models.Bridge.findAll({})
 
         let constructionYear = []
@@ -45,8 +49,8 @@ async function roadState(ctx) {
         constructionYear.reverse()
 
         const roadState = {
-            //总数
-            projectAll: projectRoadRes.length,
+            //在建总数
+            buildingCount: buildingCount,
             // 在建数量
             buildingRoad: 0,
             // 已建数量

weapp/src/packages/components/inputPickers/index.jsx

@@ -12,11 +12,11 @@ export default function InputPicker(props) {
 
   useEffect(() => {
     setCurSelector(selector)
-  }, [])
+  }, [selector])
 
-  useEffect(()=>{
+  useEffect(() => {
     handleInput({ detail: { value: value } })
-  },[value])
+  }, [value])
 
   function handleInput({ detail: { value: v } }) {
     onInput(v)
@@ -34,7 +34,7 @@ export default function InputPicker(props) {
   return (
     <View className='input-picker'>
       <View className='input-box'>
-        <View className='title'>{title}</View>
+        <View className='title'>&nbsp;&nbsp;{title}</View>
         <Input
           className='input'
           type='text'

weapp/src/packages/patrol/index.jsx

@@ -163,21 +163,19 @@ const Index = () => {
         isHighAccuracy: true,
         highAccuracyExpireTime: 1000 * 6,
         success: function (res) {
-          console.log(res);
           setLongitude(res.longitude)
           setLatitude(res.latitude)
           Taro.request({
             url: `https://apis.map.qq.com/ws/geocoder/v1/?location=${res.latitude},${res.longitude}&key=${key}`,
             success: function (res) {
               // 根据自己项目需求获取res内容
-              console.log('地址信息:', res);
               let addresscity = ''
               addresscity =
                 res.data.result.address_component.province
                 + res.data.result.address_component.city
                 + res.data.result.address_component.district
                 + res.data.result.address_component.street_number
-                // + res.data.result.address_component.street
+              // + res.data.result.address_component.street
               // addresscity = res.data.result.formatted_addresses.standard_address
               let street = res.data.result.address_component.street
               setRoad(street)
@@ -217,7 +215,9 @@ const Index = () => {
           let projectList = []
           if (data.length) {
             data.forEach(e => {
-              projectList.push(e.entryName)
+              if (e.done == false) {
+                projectList.push(e.entryName)
+              }
             })
           }
           setProjdetList(projectList)
@@ -466,7 +466,6 @@ const Index = () => {
         default:
           break;
       }
-      console.log(files, '==============');
       for (i; i < files.length; i++) {
         const tempFilePaths = files[i].url
         let token = getState('token') || Taro.getStorageSync('token')
@@ -595,8 +594,6 @@ const Index = () => {
       }
     })
   }
-  console.log(video, 'video');
-  console.log(scenePic, 'tupia');
   return (
     <View className='patrol'>
       {/* {

web/client/src/sections/organization/containers/user.js

@@ -25,7 +25,7 @@ const UserManage = (props) => {
     const [depModalRecord, setDepModalRecord] = useState();
     const [selectedTree, setSelectedTree] = useState();
     const [depCrumbs, setDepCrumbs] = useState([]);
-    const [depUserCopy, setDepUserCopy] = useState([])//用于存放除了自己的管理的数组，即自己不能调整自己是否为管理员
+    const [depUserCopy, setDepUserCopy] = useState([])
     const [uid, setuid] = useState()
     const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'USERMANAGE')?.isshow === "true" ? true : '')//控制操作(新增删除等操作，对应权限的'不可编辑')是否可操作
     const [depMessagedata, setdepMessagedata] = useState(depMessage)
@@ -274,9 +274,9 @@ const UserManage = (props) => {
                             setDepModalVisible(true)
                             setDepModalType('edit')
                         }} />
-                        <Popconfirm title='是否确认删除?' onConfirm={() => { delDepartment(id) }}>
+                        {user?.username === 'SuperAdmin' ? <Popconfirm title='是否确认删除?' onConfirm={() => { delDepartment(id) }} >
                             <DeleteOutlined style={{ marginLeft: 5 }} />
-                        </Popconfirm>
+                        </Popconfirm> : ''}
                     </> : null
                 }
             </div>

web/client/src/sections/quanju/containers/footer/build/index.js

@@ -97,7 +97,7 @@ const Build = (props) => {
     })
     //console.log('onlineproject', onlineproject)
     let sunonlineproject = onlineproject?.reduce((x, y) => x + y.total, 0)
-    let projectAll = buildingnumber?.projectAll
+    let buildingCount = buildingnumber?.buildingCount
     //console.log('projectAll', projectAll)
     //let projectAll=
     let safetyData = alldengji?.filter(item => item.name === '一级公路' || item.name === '二级公路' || item.name === '三级公路' || item.name === '四级公路' || item.name === '等外公路')
@@ -164,7 +164,7 @@ const Build = (props) => {
                             </div> */}
                             <img src='/assets/images/quanju/yuanhuan.webp' className='build-left-top-center' />
                             <div className='build-left-top-item'>
-                                <div>{projectAll || 0}</div>
+                                <div>{buildingCount || 0}</div>
                                 <div>
                                     {/* <i>&#9658;</i> */}
                                     {/* <span /> */}